Makefile.top | 2 +-
Module_tail_build.mk | 1 +
beanshell/ExternalProject_beanshell.mk | 33 +++++++++++++++++++++++++++++++++
beanshell/Makefile | 7 +++++++
beanshell/Module_beanshell.mk | 22 ++++++++++++++++++++++
beanshell/Package_beanshell.mk | 16 ++++++++++++++++
beanshell/UnpackedTarball_beanshell.mk | 18 ++++++++++++++++++
beanshell/prj/build.lst | 5 ++---
config_host.mk.in | 1 +
configure.in | 2 ++
tail_build/prj/build.lst | 2 +-
11 files changed, 104 insertions(+), 5 deletions(-)
New commits:
commit 02e400865cb9a51b623a3d866d3236f0d6c899ca
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Tue Oct 2 09:31:35 2012 +0200
gbuildification of beanshell
Change-Id: I1b71796ca95500efeffe5e01dba3e73711f920e7
Reviewed-on: https://gerrit.libreoffice.org/745
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/Makefile.top b/Makefile.top
index e188cdc..de91f56 100644
--- a/Makefile.top
+++ b/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\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index a0c958b..86a9c11 100644
--- a/Module_tail_build.mk
+++ b/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 \
diff --git a/beanshell/ExternalProject_beanshell.mk
b/beanshell/ExternalProject_beanshell.mk
new file mode 100644
index 0000000..b1bfa9f
--- /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 0000000..ccb1c85
--- /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 0000000..e739b36
--- /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 0000000..983c1fc
--- /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 0000000..6e798ae
--- /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 2a1401b..8d2fb8c 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 e69de29..0000000
diff --git a/config_host.mk.in b/config_host.mk.in
index 51990d9..d6f5f16 100644
--- a/config_host.mk.in
+++ b/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@
diff --git a/configure.in b/configure.in
index 4c44b7d..93b828d 100644
--- a/configure.in
+++ b/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])
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 4129e20..15d2e0e 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
