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

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)

javaunohelper/Zip_juh.mk

-# -*- 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@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:

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)

jurt/Zip_jurt.mk

-# -*- 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@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:

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:

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

ridljar/Zip_ridl.mk

-# -*- 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@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:

ridljar/Zip_unoloader.mk

-# -*- 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@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: