gbuildification of beanshell

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

7 files changed, 98 insertions, 3 deletions

diff --git a/beanshell/ExternalProject_beanshell.mk b/beanshell/ExternalProject_beanshell.mk
new file mode 100644
index 000000000000..b1bfa9f5faff
--- /dev/null
+++ b/beanshell/ExternalProject_beanshell.mk
@@ -0,0 +1,33 @@
+# -*- 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:
diff --git a/beanshell/Makefile b/beanshell/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/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/beanshell/Module_beanshell.mk b/beanshell/Module_beanshell.mk
new file mode 100644
index 000000000000..e739b3698ef6
--- /dev/null
+++ b/beanshell/Module_beanshell.mk
@@ -0,0 +1,22 @@
+# -*- 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:
diff --git a/beanshell/Package_beanshell.mk b/beanshell/Package_beanshell.mk
new file mode 100644
index 000000000000..983c1fc77f93
--- /dev/null
+++ b/beanshell/Package_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_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:
diff --git a/beanshell/UnpackedTarball_beanshell.mk b/beanshell/UnpackedTarball_beanshell.mk
new file mode 100644
index 000000000000..6e798ae01929
--- /dev/null
+++ b/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)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,beanshell,\
+	beanshell/bsh-2.0b1-src.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/beanshell/prj/build.lst b/beanshell/prj/build.lst
index 2a1401b3fbeb..8d2fb8c7a59b 100644
--- a/beanshell/prj/build.lst
+++ b/beanshell/prj/build.lst
@@ -1,3 +1,2 @@
-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
diff --git a/beanshell/prj/dmake b/beanshell/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/beanshell/prj/dmake
+++ /dev/null