From 4641fd9aecc73b3cbdcb83d67f423c8d06f456fd Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Thu, 17 Oct 2013 01:18:07 +0200 Subject: 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 Tested-by: Björn Michaelsen --- 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 +++++++++++++++++++++++++ 7 files changed, 137 insertions(+) create mode 100644 external/beanshell/ExternalPackage_beanshell.mk create mode 100644 external/beanshell/ExternalProject_beanshell.mk create mode 100644 external/beanshell/Makefile create mode 100644 external/beanshell/Module_beanshell.mk create mode 100644 external/beanshell/README create mode 100644 external/beanshell/UnpackedTarball_beanshell.mk create mode 100644 external/beanshell/bsh-2.0b1-src.patch (limited to 'external/beanshell') diff --git a/external/beanshell/ExternalPackage_beanshell.mk b/external/beanshell/ExternalPackage_beanshell.mk new file mode 100644 index 000000000000..1346b889cbd0 --- /dev/null +++ b/external/beanshell/ExternalPackage_beanshell.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,beanshell,beanshell)) + +$(eval $(call gb_ExternalPackage_use_external_project,beanshell,beanshell)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,beanshell,bin/bsh.jar,dist/bsh-2.0b1.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/beanshell/ExternalProject_beanshell.mk b/external/beanshell/ExternalProject_beanshell.mk new file mode 100644 index 000000000000..889b79b153d2 --- /dev/null +++ b/external/beanshell/ExternalProject_beanshell.mk @@ -0,0 +1,30 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,beanshell)) + +$(eval $(call gb_ExternalProject_register_targets,beanshell,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,beanshell,build) : + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + $(if $(debug),-Dbuild.debug="on") \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/beanshell/Makefile b/external/beanshell/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/external/beanshell/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/external/beanshell/Module_beanshell.mk b/external/beanshell/Module_beanshell.mk new file mode 100644 index 000000000000..14432fd2aa86 --- /dev/null +++ b/external/beanshell/Module_beanshell.mk @@ -0,0 +1,18 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,beanshell)) + +$(eval $(call gb_Module_add_targets,beanshell,\ + ExternalPackage_beanshell \ + ExternalProject_beanshell \ + UnpackedTarball_beanshell \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/beanshell/README b/external/beanshell/README new file mode 100644 index 000000000000..0b03fd35ad58 --- /dev/null +++ b/external/beanshell/README @@ -0,0 +1,4 @@ +Java interpreter from [http://www.beanshell.org/] with some patches. + +So you can write java in command shell; interactive java good for prototyping/macros. + diff --git a/external/beanshell/UnpackedTarball_beanshell.mk b/external/beanshell/UnpackedTarball_beanshell.mk new file mode 100644 index 000000000000..828e4bd2fed9 --- /dev/null +++ b/external/beanshell/UnpackedTarball_beanshell.mk @@ -0,0 +1,18 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,beanshell)) + +$(eval $(call gb_UnpackedTarball_set_tarball,beanshell,$(BSH_TARBALL),,beanshell)) + +$(eval $(call gb_UnpackedTarball_add_patches,beanshell,\ + external/beanshell/bsh-2.0b1-src.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/beanshell/bsh-2.0b1-src.patch b/external/beanshell/bsh-2.0b1-src.patch new file mode 100644 index 000000000000..a1358d391168 --- /dev/null +++ b/external/beanshell/bsh-2.0b1-src.patch @@ -0,0 +1,44 @@ +--- misc/BeanShell/build.xml Fri Dec 19 17:14:27 2003 ++++ misc/build/BeanShell/build.xml Fri Mar 28 15:55:04 2008 +@@ -17,7 +17,7 @@ + up the build dir! It has to be done manually the first time (or put + in the jar file). There must be a way to fix this... + --> +- ++ + + + +@@ -71,6 +71,9 @@ + value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/> + --> + ++ ++ + ++ ++ + + +