[Libreoffice-commits] core.git: 4 commits - javaunohelper/Module_javaunohelper.mk javaunohelper/Zip_juh.mk jurt/Module_jurt.mk jurt/Zip_jurt.mk mysqlc/Library_mysqlc.mk odk/CustomTarget_javadoc.mk ridljar/Module_ridljar.mk ridljar/Zip_ridl.mk ridljar/Zip_unoloader.mk solenv/gbuild

Michael Stahl mstahl at redhat.com
Tue Feb 26 06:48:45 PST 2013 

 javaunohelper/Module_javaunohelper.mk |    1 
 javaunohelper/Zip_juh.mk              |   56 ---------------------
 jurt/Module_jurt.mk                   |    1 
 jurt/Zip_jurt.mk                      |   87 ----------------------------------
 mysqlc/Library_mysqlc.mk              |    2 
 odk/CustomTarget_javadoc.mk           |   24 +--------
 ridljar/Module_ridljar.mk             |    2 
 ridljar/Zip_ridl.mk                   |   59 -----------------------
 ridljar/Zip_unoloader.mk              |   35 -------------
 solenv/gbuild/JavaClassSet.mk         |    9 ++-
 solenv/gbuild/Zip.mk                  |    2 
 11 files changed, 15 insertions(+), 263 deletions(-)

New commits:
commit c81e40d02610b665a9edcc73b57ac7e783913988
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Feb 26 15:19:47 2013 +0100

    gbuild: Zip/Jar targets: depend on makefile to rebuild on removal
    
    Change-Id: I0b79b6c9018e4513b9f0b16be3e57f620d12ea23

diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index fab3ae4..2a81a87 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -68,9 +68,14 @@ $(call gb_JavaClassSet_get_clean_target,%) :
 $(call gb_JavaClassSet_get_preparation_target,%) :
 	mkdir -p $(dir $@) && touch $@
 
+# depend on makefile to enforce a rebuild if files are removed from the classset
 define gb_JavaClassSet_JavaClassSet
-$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet_get_preparation_target,$(1))
-$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := $(call gb_JavaClassSet_get_preparation_target,$(1))
+$(call gb_JavaClassSet_get_target,$(1)) : \
+	$(lastword $(MAKEFILE_LIST)) \
+	$(call gb_JavaClassSet_get_preparation_target,$(1))
+$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := \
+	$(lastword $(MAKEFILE_LIST)) \
+	$(call gb_JavaClassSet_get_preparation_target,$(1))
 
 endef
 
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index 89ca8a6..2685ce3 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -89,8 +89,10 @@ $(call gb_Zip_get_outdir_target,$(1)) : $(call gb_Zip_get_target,$(1)) \
 
 endef
 
+# depend on makefile to enforce a rebuild if files are removed from the zip
 define gb_Zip_Zip
 $(call gb_Zip_Zip_internal,$(1),$(2))
+$(call gb_Zip_get_target,$(1)) : $(lastword $(MAKEFILE_LIST))
 
 $(eval $(call gb_Module_register_target,$(call gb_Zip_get_final_target,$(1)),$(call gb_Zip_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Zip)
commit 34faec549ef33f77c4f866a4094d9fcf447025ee
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Feb 26 15:11:45 2013 +0100

    mysqlc: disable fast strings to remove dependency on LIBO_UDK_4.1
    
    Change-Id: I0891f1e45f02b2d031903d85ad3ebe3df561529d

diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index ffa194f..d97328a 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_Library_Library,mysqlc))
 
 $(eval $(call gb_Library_set_warnings_not_errors,mysqlc))
 
+$(eval $(call gb_Library_add_cxxflags,mysqlc,-DRTL_DISABLE_FAST_STRING))
+
 $(eval $(call gb_Library_use_externals,mysqlc,\
 	boost_headers \
 	mysql \
commit dfdfd9e260c1b38f09f4a12d04d23a8fd2d2c7a3
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Feb 26 14:40:27 2013 +0100

    odk: remove pointless variable
    
    Change-Id: I07406ca6e00f2000045de09a1be45b5fa4a694cb

diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index 133e9a2..deddbb9 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -11,8 +11,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/java/ref))
 
 odkcommon_ZIPLIST += docs/java/ref
 
-JAVADOCREFNAME := "UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) Java API Reference"
-
 odk_JAVAPACKAGES := com.sun.star.comp.helper \
 	com.sun.star.lib.uno.helper \
 	com.sun.star.lib.unoloader \
@@ -25,7 +23,8 @@ $(odk_WORKDIR)/docs/java/ref/index.html: $(call gb_Jar_get_target,ridl)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1)
 	$(JAVADOC) -J-Xmx120m -use -splitindex \
 		-windowtitle "Java UNO Runtime Reference" \
-		-header $(JAVADOCREFNAME) -d $(dir $@) \
+		-header "UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) Java API Reference"\
+		-d $(dir $@) \
 		-sourcepath $(SRCDIR)/ridljar/source/unoloader:$(SRCDIR)/ridljar:$(SRCDIR)/jurt:$(SRCDIR)/javaunohelper \
 		-classpath $(OUTDIR)/bin/ridl.jar \
 		-linkoffline ../../common/reg ./uno \
commit 43dd869ec9777bd9e8f79b12b8037aab28cd0716
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Feb 26 13:29:11 2013 +0100

    odk: remove temporary Zip file gratuitous complexity
    
    4 zip files containing ridl, unoloader, jurt and juh source files are
    created and copied to solver and unzipped again in odk when odk could
    simply run javadoc over the source files directly.
    
    Change-Id: I8d2d7c794988eab2e8a3c6005cc8a849a1232f64

diff --git a/javaunohelper/Module_javaunohelper.mk b/javaunohelper/Module_javaunohelper.mk
index 8479109..0a4fb6b 100644
--- a/javaunohelper/Module_javaunohelper.mk
+++ b/javaunohelper/Module_javaunohelper.mk
@@ -32,7 +32,6 @@ ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,javaunohelper,\
     Library_juh \
     Jar_juh \
-    Zip_juh \
 ))
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
diff --git a/javaunohelper/Zip_juh.mk b/javaunohelper/Zip_juh.mk
deleted file mode 100644
index 496ddd7..0000000
--- a/javaunohelper/Zip_juh.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- 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_Zip_Zip,juh_src,$(SRCDIR)/javaunohelper))
-
-$(eval $(call gb_Zip_add_files,juh_src,\
-    com/sun/star/comp/JavaUNOHelperServices.java \
-    com/sun/star/comp/helper/Bootstrap.java \
-    com/sun/star/comp/helper/BootstrapException.java \
-    com/sun/star/comp/helper/ComponentContext.java \
-    com/sun/star/comp/helper/ComponentContextEntry.java \
-    com/sun/star/comp/helper/SharedLibraryLoader.java \
-    com/sun/star/comp/helper/UnoInfo.java \
-    com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java \
-    com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java \
-    com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java \
-    com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java \
-    com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java \
-    com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java \
-    com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java \
-    com/sun/star/lib/uno/helper/ComponentBase.java \
-    com/sun/star/lib/uno/helper/Factory.java \
-    com/sun/star/lib/uno/helper/InterfaceContainer.java \
-    com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java \
-    com/sun/star/lib/uno/helper/PropertySet.java \
-    com/sun/star/lib/uno/helper/PropertySetMixin.java \
-    com/sun/star/lib/uno/helper/UnoUrl.java \
-    com/sun/star/lib/uno/helper/WeakAdapter.java \
-    com/sun/star/lib/uno/helper/WeakBase.java \
-))
-
-# vim:set noet sw=4 ts=4:
diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk
index 20cc85c..e9a6293 100644
--- a/jurt/Module_jurt.mk
+++ b/jurt/Module_jurt.mk
@@ -32,7 +32,6 @@ ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,jurt,\
     Jar_jurt \
     Library_jpipe \
-    Zip_jurt \
 ))
 
 ifeq ($(OS),MACOSX)
diff --git a/jurt/Zip_jurt.mk b/jurt/Zip_jurt.mk
deleted file mode 100644
index a32fff7..0000000
--- a/jurt/Zip_jurt.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- 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_Zip_Zip,jurt_src,$(SRCDIR)/jurt))
-
-$(eval $(call gb_Zip_add_files,jurt_src,\
-    com/sun/star/comp/bridgefactory/BridgeFactory.java \
-    com/sun/star/comp/connections/Acceptor.java \
-    com/sun/star/comp/connections/Connector.java \
-    com/sun/star/comp/connections/ConstantInstanceProvider.java \
-    com/sun/star/comp/connections/Implementation.java \
-    com/sun/star/comp/connections/PipedConnection.java \
-    com/sun/star/comp/loader/FactoryHelper.java \
-    com/sun/star/comp/loader/JavaLoader.java \
-    com/sun/star/comp/loader/JavaLoaderFactory.java \
-    com/sun/star/comp/loader/RegistrationClassFinder.java \
-    com/sun/star/comp/servicemanager/ServiceManager.java \
-    com/sun/star/comp/urlresolver/UrlResolver.java \
-    com/sun/star/lib/connections/pipe/PipeConnection.java \
-    com/sun/star/lib/connections/pipe/pipeAcceptor.java \
-    com/sun/star/lib/connections/pipe/pipeConnector.java \
-    com/sun/star/lib/connections/socket/ConnectionDescriptor.java \
-    com/sun/star/lib/connections/socket/SocketConnection.java \
-    com/sun/star/lib/connections/socket/socketAcceptor.java \
-    com/sun/star/lib/connections/socket/socketConnector.java \
-    com/sun/star/lib/uno/Proxy.java \
-    com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java \
-    com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java \
-    com/sun/star/lib/uno/bridges/java_remote/RequestHandler.java \
-    com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java \
-    com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java \
-    com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java \
-    com/sun/star/lib/uno/environments/java/java_environment.java \
-    com/sun/star/lib/uno/environments/remote/IProtocol.java \
-    com/sun/star/lib/uno/environments/remote/IReceiver.java \
-    com/sun/star/lib/uno/environments/remote/IThreadPool.java \
-    com/sun/star/lib/uno/environments/remote/JavaThreadPool.java \
-    com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java \
-    com/sun/star/lib/uno/environments/remote/Job.java \
-    com/sun/star/lib/uno/environments/remote/JobQueue.java \
-    com/sun/star/lib/uno/environments/remote/Message.java \
-    com/sun/star/lib/uno/environments/remote/NativeThreadPool.java \
-    com/sun/star/lib/uno/environments/remote/ThreadId.java \
-    com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java \
-    com/sun/star/lib/uno/environments/remote/remote_environment.java \
-    com/sun/star/lib/uno/protocols/urp/Cache.java \
-    com/sun/star/lib/uno/protocols/urp/Marshal.java \
-    com/sun/star/lib/uno/protocols/urp/PendingRequests.java \
-    com/sun/star/lib/uno/protocols/urp/Unmarshal.java \
-    com/sun/star/lib/uno/protocols/urp/UrpMessage.java \
-    com/sun/star/lib/uno/protocols/urp/urp.java \
-    com/sun/star/lib/util/AsynchronousFinalizer.java \
-    com/sun/star/lib/util/NativeLibraryLoader.java \
-    com/sun/star/lib/util/StringHelper.java \
-    com/sun/star/lib/util/UrlToFileMapper.java \
-    com/sun/star/uno/AnyConverter.java \
-    com/sun/star/uno/Ascii.java \
-    com/sun/star/uno/AsciiString.java \
-    com/sun/star/uno/MappingException.java \
-    com/sun/star/uno/WeakReference.java \
-))
-
-# vim:set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index e6ff1ca..133e9a2 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -17,7 +17,7 @@ odk_JAVAPACKAGES := com.sun.star.comp.helper \
 	com.sun.star.lib.uno.helper \
 	com.sun.star.lib.unoloader \
 	com.sun.star.uno \
-	$(odk_WORKDIR)/java_src/com/sun/star/lib/util/UrlToFileMapper.java
+	$(SRCDIR)/jurt/com/sun/star/lib/util/UrlToFileMapper.java
 
 $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/docs/java/ref,index.html))
 
@@ -26,7 +26,7 @@ $(odk_WORKDIR)/docs/java/ref/index.html: $(call gb_Jar_get_target,ridl)
 	$(JAVADOC) -J-Xmx120m -use -splitindex \
 		-windowtitle "Java UNO Runtime Reference" \
 		-header $(JAVADOCREFNAME) -d $(dir $@) \
-		-sourcepath $(odk_WORKDIR)/java_src \
+		-sourcepath $(SRCDIR)/ridljar/source/unoloader:$(SRCDIR)/ridljar:$(SRCDIR)/jurt:$(SRCDIR)/javaunohelper \
 		-classpath $(OUTDIR)/bin/ridl.jar \
 		-linkoffline ../../common/reg ./uno \
 		-linkoffline http://java.sun.com/j2se/1.5/docs/api ./java \
@@ -34,19 +34,4 @@ $(odk_WORKDIR)/docs/java/ref/index.html: $(call gb_Jar_get_target,ridl)
 		$(if $(JAVADOCISGJDOC),,-notimestamp) \
 		> $(odk_WORKDIR)/javadoc_log.txt
 
-odk_JAVASRCLIST := juh_src \
-	jurt_src \
-	ridl_src \
-	unoloader_src
-
-define odk_jsrc
-$(odk_WORKDIR)/docs/java/ref/index.html: $(odk_WORKDIR)/java_src/$(1).done
-$(odk_WORKDIR)/java_src/$(1).done: $(call gb_Zip_get_target,$(1))
-	$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,UNZ,1)
-	unzip -quo $$< -d $$(dir $$@)
-	touch $$@
-endef
-
-$(foreach src,$(odk_JAVASRCLIST),$(eval $(call odk_jsrc,$(src))))
-
 # vim: set noet sw=4 ts=4:
diff --git a/ridljar/Module_ridljar.mk b/ridljar/Module_ridljar.mk
index 4a697e2..39de000 100644
--- a/ridljar/Module_ridljar.mk
+++ b/ridljar/Module_ridljar.mk
@@ -32,8 +32,6 @@ $(eval $(call gb_Module_add_targets,ridljar,\
     CustomTarget_javamaker \
     Jar_ridl \
     Jar_unoloader \
-    Zip_ridl \
-    Zip_unoloader \
 ))
 
 # unfortunately, these tests depend on qadevOOo, which depends on
diff --git a/ridljar/Zip_ridl.mk b/ridljar/Zip_ridl.mk
deleted file mode 100644
index ca85eb9..0000000
--- a/ridljar/Zip_ridl.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- 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_Zip_Zip,ridl_src,$(SRCDIR)/ridljar))
-
-$(eval $(call gb_Zip_add_files,ridl_src,\
-    com/sun/star/lib/uno/typedesc/FieldDescription.java \
-    com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java \
-    com/sun/star/lib/uno/typedesc/MethodDescription.java \
-    com/sun/star/lib/uno/typedesc/TypeDescription.java \
-    com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java \
-    com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java \
-    com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java \
-    com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java \
-    com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java \
-    com/sun/star/lib/uno/typeinfo/TypeInfo.java \
-    com/sun/star/lib/util/DisposeListener.java \
-    com/sun/star/lib/util/DisposeNotifier.java \
-    com/sun/star/lib/util/WeakMap.java \
-    com/sun/star/uno/Any.java \
-    com/sun/star/uno/Enum.java \
-    com/sun/star/uno/IBridge.java \
-    com/sun/star/uno/IEnvironment.java \
-    com/sun/star/uno/IFieldDescription.java \
-    com/sun/star/uno/IMapping.java \
-    com/sun/star/uno/IMemberDescription.java \
-    com/sun/star/uno/IMethodDescription.java \
-    com/sun/star/uno/IQueryInterface.java \
-    com/sun/star/uno/ITypeDescription.java \
-    com/sun/star/uno/Type.java \
-    com/sun/star/uno/Union.java \
-    com/sun/star/uno/UnoRuntime.java \
-))
-
-# vim:set noet sw=4 ts=4:
diff --git a/ridljar/Zip_unoloader.mk b/ridljar/Zip_unoloader.mk
deleted file mode 100644
index 211eb09..0000000
--- a/ridljar/Zip_unoloader.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- 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_Zip_Zip,unoloader_src,$(SRCDIR)/ridljar/source/unoloader))
-
-$(eval $(call gb_Zip_add_files,unoloader_src,\
-    com/sun/star/lib/unoloader/UnoLoader.java \
-    com/sun/star/lib/unoloader/UnoClassLoader.java \
-))
-
-# vim:set noet sw=4 ts=4:

More information about the Libreoffice-commits mailing list