RepositoryModule_host.mk | 1
beanshell/ExternalPackage_beanshell.mk | 16 --------
beanshell/ExternalProject_beanshell.mk | 30 ----------------
beanshell/Makefile | 7 ---
beanshell/Module_beanshell.mk | 22 ------------
beanshell/README | 4 --
beanshell/UnpackedTarball_beanshell.mk | 18 ---------
beanshell/bsh-2.0b1-src.patch | 44 ------------------------
external/Module_external.mk | 1
external/beanshell/ExternalPackage_beanshell.mk | 16 ++++++++
external/beanshell/ExternalProject_beanshell.mk | 30 ++++++++++++++++
external/beanshell/Makefile | 7 +++
external/beanshell/Module_beanshell.mk | 18 +++++++++
external/beanshell/README | 4 ++
external/beanshell/UnpackedTarball_beanshell.mk | 18 +++++++++
external/beanshell/bsh-2.0b1-src.patch | 44 ++++++++++++++++++++++++
16 files changed, 138 insertions(+), 142 deletions(-)
New commits:
commit 4641fd9aecc73b3cbdcb83d67f423c8d06f456fd
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Thu Oct 17 01:18:07 2013 +0200
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.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index dccdb4d..1cd280f 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 627b424..18becdf 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
similarity index 100%
rename from beanshell/ExternalPackage_beanshell.mk
rename to external/beanshell/ExternalPackage_beanshell.mk
diff --git a/beanshell/ExternalProject_beanshell.mk
b/external/beanshell/ExternalProject_beanshell.mk
similarity index 100%
rename from beanshell/ExternalProject_beanshell.mk
rename to external/beanshell/ExternalProject_beanshell.mk
diff --git a/beanshell/Makefile b/external/beanshell/Makefile
similarity index 100%
rename from beanshell/Makefile
rename to external/beanshell/Makefile
diff --git a/beanshell/Module_beanshell.mk
b/external/beanshell/Module_beanshell.mk
similarity index 87%
rename from beanshell/Module_beanshell.mk
rename to external/beanshell/Module_beanshell.mk
index e5f0409..14432fd 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
similarity index 100%
rename from beanshell/README
rename to external/beanshell/README
diff --git a/beanshell/UnpackedTarball_beanshell.mk
b/external/beanshell/UnpackedTarball_beanshell.mk
similarity index 92%
rename from beanshell/UnpackedTarball_beanshell.mk
rename to external/beanshell/UnpackedTarball_beanshell.mk
index b22cbce..828e4bd 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
similarity index 100%
rename from beanshell/bsh-2.0b1-src.patch
rename to external/beanshell/bsh-2.0b1-src.patch
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
