[Libreoffice-commits] .: jurt/CustomTarget_jnilib.mk jurt/Module_jurt.mk jurt/Package_jnilib.mk

[Matus Kukan]

 jurt/CustomTarget_jnilib.mk |   38 ++++++++++++++++++++++++++++++++++++++
 jurt/Module_jurt.mk         |    7 +++++++
 jurt/Package_jnilib.mk      |   32 ++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+)

New commits:
commit 12b3707ed2ccd77a8fd8b8f341ea035c22d87f40
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Apr 6 13:05:53 2012 +0200

    ops, this should not be deleted

diff --git a/jurt/CustomTarget_jnilib.mk b/jurt/CustomTarget_jnilib.mk
new file mode 100644
index 0000000..71d90f6
--- /dev/null
+++ b/jurt/CustomTarget_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_CustomTarget_CustomTarget,jurt/util,new_style))
+
+JUJL := $(call gb_CustomTarget_get_workdir,jurt/util)
+
+$(call gb_CustomTarget_get_target,jurt/util) : $(JUJL)/libjpipe.jnilib
+
+$(JUJL)/libjpipe.jnilib : $(call gb_Library_get_target,jpipe) | $(JUJL)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MCB,1)
+	cd $(dir $@) && $(SOLARENV)/bin/macosx-create-bundle $<
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk
index 0501603..2026de2 100644
--- a/jurt/Module_jurt.mk
+++ b/jurt/Module_jurt.mk
@@ -35,6 +35,13 @@ $(eval $(call gb_Module_add_targets,jurt,\
     Zip_jurt \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,jurt,\
+    CustomTarget_jnilib \
+    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..a728e71
--- /dev/null
+++ b/jurt/Package_jnilib.mk
@@ -0,0 +1,32 @@
+# -*- 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))))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: