diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-17 01:18:07 +0200 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2013-10-17 10:42:45 +0000 |
| commit | 4641fd9aecc73b3cbdcb83d67f423c8d06f456fd (patch) | |
| tree | a6aea3eaae4a3773ad889f44610c2e5d83c371ab | |
| parent | 174e24ffff2f76da94df3bdefa5416c5f2256b78 (diff) | |
fdo#70393: move beanshell to a subdir of external
Change-Id: I7e8324fd366a25db59becedfb3f00a10723f45be
Reviewed-on: https://gerrit.libreoffice.org/6283
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/beanshell/ExternalPackage_beanshell.mk (renamed from beanshell/ExternalPackage_beanshell.mk) | 0 | ||||
| -rw-r--r-- | external/beanshell/ExternalProject_beanshell.mk (renamed from beanshell/ExternalProject_beanshell.mk) | 0 | ||||
| -rw-r--r-- | external/beanshell/Makefile (renamed from beanshell/Makefile) | 0 | ||||
| -rw-r--r-- | external/beanshell/Module_beanshell.mk (renamed from beanshell/Module_beanshell.mk) | 4 | ||||
| -rw-r--r-- | external/beanshell/README (renamed from beanshell/README) | 0 | ||||
| -rw-r--r-- | external/beanshell/UnpackedTarball_beanshell.mk (renamed from beanshell/UnpackedTarball_beanshell.mk) | 2 | ||||
| -rw-r--r-- | external/beanshell/bsh-2.0b1-src.patch (renamed from beanshell/bsh-2.0b1-src.patch) | 0 |
9 files changed, 2 insertions, 6 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index dccdb4d0c87d..1cd280f59bef 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -22,7 +22,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ basegfx \ basic \ bean \ - $(call gb_Helper_optional,BSH,beanshell) \ binaryurp \ bridges \ $(call gb_Helper_optional,CAIRO,cairo) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 627b4243cefe..18becdfbed67 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -21,6 +21,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,AFMS,afms) \ $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ $(call gb_Helper_optional,BOOST,boost) \ + $(call gb_Helper_optional,BSH,beanshell) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,LIBPNG,libpng) \ )) diff --git a/beanshell/ExternalPackage_beanshell.mk b/external/beanshell/ExternalPackage_beanshell.mk index 1346b889cbd0..1346b889cbd0 100644 --- a/beanshell/ExternalPackage_beanshell.mk +++ b/external/beanshell/ExternalPackage_beanshell.mk diff --git a/beanshell/ExternalProject_beanshell.mk b/external/beanshell/ExternalProject_beanshell.mk index 889b79b153d2..889b79b153d2 100644 --- a/beanshell/ExternalProject_beanshell.mk +++ b/external/beanshell/ExternalProject_beanshell.mk diff --git a/beanshell/Makefile b/external/beanshell/Makefile index ccb1c85a04da..ccb1c85a04da 100644 --- a/beanshell/Makefile +++ b/external/beanshell/Makefile diff --git a/beanshell/Module_beanshell.mk b/external/beanshell/Module_beanshell.mk index e5f04092c659..14432fd2aa86 100644 --- a/beanshell/Module_beanshell.mk +++ b/external/beanshell/Module_beanshell.mk @@ -9,14 +9,10 @@ $(eval $(call gb_Module_Module,beanshell)) -ifneq ($(ENABLE_JAVA),) -ifneq ($(filter BSH,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,beanshell,\ ExternalPackage_beanshell \ ExternalProject_beanshell \ UnpackedTarball_beanshell \ )) -endif -endif # vim: set noet sw=4 ts=4: diff --git a/beanshell/README b/external/beanshell/README index 0b03fd35ad58..0b03fd35ad58 100644 --- a/beanshell/README +++ b/external/beanshell/README diff --git a/beanshell/UnpackedTarball_beanshell.mk b/external/beanshell/UnpackedTarball_beanshell.mk index b22cbcef101f..828e4bd2fed9 100644 --- a/beanshell/UnpackedTarball_beanshell.mk +++ b/external/beanshell/UnpackedTarball_beanshell.mk @@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,beanshell)) $(eval $(call gb_UnpackedTarball_set_tarball,beanshell,$(BSH_TARBALL),,beanshell)) $(eval $(call gb_UnpackedTarball_add_patches,beanshell,\ - beanshell/bsh-2.0b1-src.patch \ + external/beanshell/bsh-2.0b1-src.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/beanshell/bsh-2.0b1-src.patch b/external/beanshell/bsh-2.0b1-src.patch index a1358d391168..a1358d391168 100644 --- a/beanshell/bsh-2.0b1-src.patch +++ b/external/beanshell/bsh-2.0b1-src.patch |