[Libreoffice-commits] .: Branch 'feature/gbuild_java' - 3 commits - jurt/Module_jurt.mk jurt/Package_jnilib.mk jurt/util Repository.mk

[David Tardon]

 Repository.mk          |    4 ++--
 jurt/Module_jurt.mk    |    6 ++++++
 jurt/Package_jnilib.mk |   38 ++++++++++++++++++++++++++++++++++++++
 jurt/util/Makefile     |   38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 84 insertions(+), 2 deletions(-)

New commits:
commit 0b8934ceb38a5ba7d33906697412e31b76c5a12a
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Dec 27 11:17:57 2011 +0100

    build jnilib on MacOS X

diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk
index d56de79..50339cd 100644
--- a/jurt/Module_jurt.mk
+++ b/jurt/Module_jurt.mk
@@ -35,6 +35,12 @@ $(eval $(call gb_Module_add_targets,jurt,\
     Zip_jurt \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,jurt,\
+    Package_jnilib \
+))
+endif
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,jurt,\
     Library_jpipx \
diff --git a/jurt/Package_jnilib.mk b/jurt/Package_jnilib.mk
new file mode 100644
index 0000000..4ff0c66
--- /dev/null
+++ b/jurt/Package_jnilib.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,jurt_jnilib,$(WORKDIR)/CustomTarget/jurt/util))
+
+$(eval $(call gb_Package_add_file,lib/$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe)),,$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe))))
+
+$(eval $(call gb_Package_add_customtarget,jurt_jnilib,jurt/util))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,jurt/util,\
+    $(call gb_Library_get_target,jpipe) \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jurt/util/Makefile b/jurt/util/Makefile
new file mode 100644
index 0000000..3230b22
--- /dev/null
+++ b/jurt/util/Makefile
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+gb_PARTIALBUID := T
+include $(GBUILDDIR)/gbuild.mk
+
+libjpipe.jnilib :
+	$(SOLARENV)/bin/macosx-create-bundle $(call gb_Library_get_target,jpipe)
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : libjpipe.jnilib
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
commit 1e4961b82554bcac4e7103345354ed8fb7782472
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Dec 27 10:12:52 2011 +0100

    move jvmfwk to the right layer

diff --git a/Repository.mk b/Repository.mk
index 58d9000..bde8a3c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -271,6 +271,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
     jpipe \
     juh \
     juhx \
+    jvmfwk \
     sal_textenc \
     sunjavaplugin \
 	xmlreader \
@@ -399,7 +400,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
 
 $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
     cppu \
-    jvmfwk \
     sal \
 ))
 
commit d4f2289394b04c8cd103350d0481598a303e2b3f
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Dec 27 10:05:41 2011 +0100

    move jvmaccess to the right layer

diff --git a/Repository.mk b/Repository.mk
index b6bde2f..58d9000 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -346,12 +346,12 @@ $(eval $(call gb_Helper_register_libraries,RTLIBS, \
     comphelper \
     i18nisolang1 \
     i18nutil \
-    jvmaccess \
     ucbhelper \
 ))
 
 $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
     cppuhelper \
+    jvmaccess \
 	purpenvhelper \
     salhelper \
 ))