From 4641fd9aecc73b3cbdcb83d67f423c8d06f456fd Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Thu, 17 Oct 2013 01:18:07 +0200
Subject: [PATCH] fdo#70393: move beanshell to a subdir of external
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
RepositoryModule_host.mk | 1 -
external/Module_external.mk | 1 +
.../beanshell}/ExternalPackage_beanshell.mk | 0
.../beanshell}/ExternalProject_beanshell.mk | 0
{beanshell => external/beanshell}/Makefile | 0
{beanshell => external/beanshell}/Module_beanshell.mk | 4 ----
{beanshell => external/beanshell}/README | 0
.../beanshell}/UnpackedTarball_beanshell.mk | 2 +-
{beanshell => external/beanshell}/bsh-2.0b1-src.patch | 0
9 files changed, 2 insertions(+), 6 deletions(-)
rename {beanshell => external/beanshell}/ExternalPackage_beanshell.mk (100%)
rename {beanshell => external/beanshell}/ExternalProject_beanshell.mk (100%)
rename {beanshell => external/beanshell}/Makefile (100%)
rename {beanshell => external/beanshell}/Module_beanshell.mk (87%)
rename {beanshell => external/beanshell}/README (100%)
rename {beanshell => external/beanshell}/UnpackedTarball_beanshell.mk (92%)
rename {beanshell => external/beanshell}/bsh-2.0b1-src.patch (100%)
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
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 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
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 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
similarity index 100%
rename from beanshell/bsh-2.0b1-src.patch
rename to external/beanshell/bsh-2.0b1-src.patch
--
2.18.1