gbuildification of beanshell

Change-Id: I1b71796ca95500efeffe5e01dba3e73711f920e7
Reviewed-on: https://gerrit.libreoffice.org/745Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

Makefile.top

@@ -44,6 +44,7 @@ basebmp\
 basegfx\
 basic\
 bean\
+beanshell\
 binaryurp\
 bluez_bluetooth\
 boost\
@@ -196,7 +197,6 @@ xmlsecurity\
 xsltml\
 
 dmake_modules:=\
-beanshell\
 berkeleydb\
 binfilter \
 cairo\

Module_tail_build.mk

@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	basegfx \
 	basic \
 	bean \
+	$(call gb_Helper_optional,BSH,beanshell) \
 	binaryurp \
 	$(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \
 	bridges \

beanshell/ExternalProject_beanshell.mk

+# -*- 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_use_unpacked,beanshell,beanshell))
+
+$(eval $(call gb_ExternalProject_register_targets,beanshell,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,beanshell,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,beanshell)" && \
+	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-libreoffice" \
+		$(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") && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:

beanshell/Makefile

+# -*- 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:

beanshell/Module_beanshell.mk

+# -*- 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))
+
+ifneq ($(SOLAR_JAVA),)
+ifneq ($(filter BSH,$(BUILD_TYPE)),)
+$(eval $(call gb_Module_add_targets,beanshell,\
+	ExternalProject_beanshell \
+	Package_beanshell \
+	UnpackedTarball_beanshell \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:

beanshell/Package_beanshell.mk

+# -*- 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_Package_Package,beanshell_inc,$(call gb_UnpackedTarball_get_dir,beanshell)))
+
+$(eval $(call gb_Package_use_external_project,beanshell_inc,beanshell))
+
+$(eval $(call gb_Package_add_file,beanshell_inc,bin/bsh.jar,dist/bsh-2.0b1.jar))
+
+# vim: set noet sw=4 ts=4:

beanshell/UnpackedTarball_beanshell.mk

+# -*- 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)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,beanshell,\
+	beanshell/bsh-2.0b1-src.patch \
+))
+
+# vim: set noet sw=4 ts=4:

beanshell/prj/build.lst

-be	beanshell	:	solenv NULL
-be	beanshell							usr1		-	all	be_mkout				NULL
-be	beanshell							nmake		-	all	be_beanshell		NULL
+be	beanshell       :	solenv NULL
+be	beanshell\prj		nmake		-	all	be_beanshell		NULL

config_host.mk.in

@@ -36,6 +36,7 @@ export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
 export BOOST_LDFLAGS=@BOOST_LDFLAGS@
 export BOOST_TARBALL=@BOOST_TARBALL@
 export BSH_JAR=@BSH_JAR@
+export BSH_TARBALL=@BSH_TARBALL@
 export BUILD_DMAKE=@BUILD_DMAKE@
 export BUILD_EPM=@BUILD_EPM@
 export BUILD_MOZAB=@BUILD_MOZAB@

configure.in

@@ -10056,6 +10056,7 @@ if test "x$enable_ext_scripting_beanshell" = "xyes" -a "x$enable_extension_integ
    else
        AC_MSG_RESULT([internal])
        SYSTEM_BSH=NO
+       BSH_TARBALL="ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz"
        BUILD_TYPE="$BUILD_TYPE BSH"
    fi
 else
@@ -10066,6 +10067,7 @@ fi
 AC_SUBST(ENABLE_SCRIPTING_BEANSHELL)
 AC_SUBST(SYSTEM_BSH)
 AC_SUBST(BSH_JAR)
+AC_SUBST(BSH_TARBALL)
 
 # scripting provider for JavaScript extension?
 AC_MSG_CHECKING([whether to build extension for support of scripts in JavaScript])

tail_build/prj/build.lst

-tb      tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL
+tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL