[PATCH] install javadoc files using filelist

"David Tardon (via Code Review)" <gerrit -AT- gerrit.libreoffice.org>
Tue, 23 Apr 2013 18:34:54 +0000
Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3588

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/3588/1

install javadoc files using filelist

Change-Id: I434508057dbfab9410d8f7fc3844c45cd4201b11
---
M odk/CustomTarget_check.mk
M odk/CustomTarget_javadoc.mk
M odk/CustomTarget_odkcommon.mk
M odk/Module_odk.mk
A odk/Package_javadoc.mk
M scp2/source/sdkoo/module_sdkoo.scp
M scp2/source/sdkoo/sdkoo.scp
7 files changed, 175 insertions(+), 8 deletions(-)



diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 85113b3..77bbb0f 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -36,6 +36,7 @@
                ) \
                $(call gb_Package_get_target,odk_docs) \
                $(call gb_Package_get_target,odk_html) \
+               $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_javadoc)) \
                $(call gb_Package_get_target,odk_lib) \
                $(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \
                $(call gb_Package_get_target,odk_settings) \
diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index 3f88d12..93527a9 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -7,10 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/java/ref))
-
-odkcommon_ZIPLIST += docs/java/ref
-odkcommon_ZIPDEPS += $(odk_WORKDIR)/docs/java/ref/index.html
+$(eval $(call gb_CustomTarget_CustomTarget,odk/docs/java/ref))
 
 odk_JAVAPACKAGES := com.sun.star.comp.helper \
        com.sun.star.lib.uno.helper \
@@ -18,9 +15,20 @@
        com.sun.star.uno \
        $(SRCDIR)/jurt/com/sun/star/lib/util/UrlToFileMapper.java
 
-$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/docs/java/ref,index.html))
+$(eval $(call gb_CustomTarget_register_targets,odk/docs/java/ref,\
+       javadoc_log.txt \
+))
 
-$(odk_WORKDIR)/docs/java/ref/index.html: $(call gb_Jar_get_outdir_target,ridl)
+$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/package-list : $(call 
gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt
+       touch $@
+
+$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/%.css \
+$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/%.gif \
+$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/%.html : \
+               $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt
+       touch $@
+
+$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : $(call 
gb_Jar_get_outdir_target,ridl)
        $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1)
        $(JAVADOC) -J-Xmx120m -use -splitindex \
                -windowtitle "Java UNO Runtime Reference" \
@@ -33,6 +41,6 @@
                -linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/pack/gendocu/java \
                $(odk_JAVAPACKAGES) \
                $(if $(JAVADOCISGJDOC),,-notimestamp) \
-               > $(odk_WORKDIR)/javadoc_log.txt
+               > $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
index 6b500e8..a5ab770 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -15,7 +15,6 @@
 
 $(call gb_CustomTarget_get_target,odk/odkcommon): \
        $(if $(DOXYGEN),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp/ref)) \
-       $(if $(SOLAR_JAVA),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/java/ref)) \
        $(call gb_CustomTarget_get_target,odk/odkcommon/docs/common/ref) \
        $(call gb_CustomTarget_get_target,odk/odkcommon/classes) \
        $(call gb_CustomTarget_get_target,odk/odkcommon/idl) \
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 6e78471..c0358df 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -50,6 +50,7 @@
        CustomTarget_classes \
        CustomTarget_javadoc \
        $(if $(filter WNT,$(OS)),Library_unowinreg) \
+       Package_javadoc \
        Package_unowinreg \
        Zip_uno_loader_classes \
 ))
diff --git a/odk/Package_javadoc.mk b/odk/Package_javadoc.mk
new file mode 100644
index 0000000..7b1007c
--- /dev/null
+++ b/odk/Package_javadoc.mk
@@ -0,0 +1,148 @@
+# -*- 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,odk_javadoc,$(call 
gb_CustomTarget_get_workdir,odk/docs/java/ref)))
+
+$(eval $(call gb_Package_set_outdir,odk_javadoc,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files_with_dir,odk_javadoc,$(gb_Package_SDKDIRNAME)/docs/java/ref,\
+       allclasses-frame.html \
+       allclasses-noframe.html \
+       com/sun/star/comp/helper/Bootstrap.html \
+       com/sun/star/comp/helper/BootstrapException.html \
+       com/sun/star/comp/helper/ComponentContext.html \
+       com/sun/star/comp/helper/ComponentContextEntry.html \
+       com/sun/star/comp/helper/SharedLibraryLoader.html \
+       com/sun/star/comp/helper/UnoInfo.html \
+       com/sun/star/comp/helper/class-use/Bootstrap.html \
+       com/sun/star/comp/helper/class-use/BootstrapException.html \
+       com/sun/star/comp/helper/class-use/ComponentContext.html \
+       com/sun/star/comp/helper/class-use/ComponentContextEntry.html \
+       com/sun/star/comp/helper/class-use/SharedLibraryLoader.html \
+       com/sun/star/comp/helper/class-use/UnoInfo.html \
+       com/sun/star/comp/helper/package-frame.html \
+       com/sun/star/comp/helper/package-summary.html \
+       com/sun/star/comp/helper/package-tree.html \
+       com/sun/star/comp/helper/package-use.html \
+       com/sun/star/lib/uno/helper/ComponentBase.html \
+       com/sun/star/lib/uno/helper/Factory.html \
+       com/sun/star/lib/uno/helper/InterfaceContainer.html \
+       com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.html \
+       com/sun/star/lib/uno/helper/PropertySet.html \
+       com/sun/star/lib/uno/helper/PropertySetMixin.BoundListeners.html \
+       com/sun/star/lib/uno/helper/PropertySetMixin.html \
+       com/sun/star/lib/uno/helper/UnoUrl.html \
+       com/sun/star/lib/uno/helper/WeakAdapter.html \
+       com/sun/star/lib/uno/helper/WeakBase.html \
+       com/sun/star/lib/uno/helper/class-use/ComponentBase.html \
+       com/sun/star/lib/uno/helper/class-use/Factory.html \
+       com/sun/star/lib/uno/helper/class-use/InterfaceContainer.html \
+       com/sun/star/lib/uno/helper/class-use/MultiTypeInterfaceContainer.html \
+       com/sun/star/lib/uno/helper/class-use/PropertySet.html \
+       com/sun/star/lib/uno/helper/class-use/PropertySetMixin.BoundListeners.html \
+       com/sun/star/lib/uno/helper/class-use/PropertySetMixin.html \
+       com/sun/star/lib/uno/helper/class-use/UnoUrl.html \
+       com/sun/star/lib/uno/helper/class-use/WeakAdapter.html \
+       com/sun/star/lib/uno/helper/class-use/WeakBase.html \
+       com/sun/star/lib/uno/helper/package-frame.html \
+       com/sun/star/lib/uno/helper/package-summary.html \
+       com/sun/star/lib/uno/helper/package-tree.html \
+       com/sun/star/lib/uno/helper/package-use.html \
+       com/sun/star/lib/unoloader/UnoClassLoader.html \
+       com/sun/star/lib/unoloader/UnoLoader.html \
+       com/sun/star/lib/unoloader/class-use/UnoClassLoader.html \
+       com/sun/star/lib/unoloader/class-use/UnoLoader.html \
+       com/sun/star/lib/unoloader/package-frame.html \
+       com/sun/star/lib/unoloader/package-summary.html \
+       com/sun/star/lib/unoloader/package-tree.html \
+       com/sun/star/lib/unoloader/package-use.html \
+       com/sun/star/lib/util/UrlToFileMapper.html \
+       com/sun/star/lib/util/class-use/UrlToFileMapper.html \
+       com/sun/star/lib/util/package-frame.html \
+       com/sun/star/lib/util/package-summary.html \
+       com/sun/star/lib/util/package-tree.html \
+       com/sun/star/lib/util/package-use.html \
+       com/sun/star/uno/Any.html \
+       com/sun/star/uno/AnyConverter.html \
+       com/sun/star/uno/Ascii.html \
+       com/sun/star/uno/AsciiString.html \
+       com/sun/star/uno/Enum.html \
+       com/sun/star/uno/IBridge.html \
+       com/sun/star/uno/IEnvironment.html \
+       com/sun/star/uno/IFieldDescription.html \
+       com/sun/star/uno/IMapping.html \
+       com/sun/star/uno/IMemberDescription.html \
+       com/sun/star/uno/IMethodDescription.html \
+       com/sun/star/uno/IQueryInterface.html \
+       com/sun/star/uno/ITypeDescription.html \
+       com/sun/star/uno/MappingException.html \
+       com/sun/star/uno/Type.html \
+       com/sun/star/uno/Union.html \
+       com/sun/star/uno/UnoRuntime.html \
+       com/sun/star/uno/WeakReference.html \
+       com/sun/star/uno/class-use/Any.html \
+       com/sun/star/uno/class-use/AnyConverter.html \
+       com/sun/star/uno/class-use/Ascii.html \
+       com/sun/star/uno/class-use/AsciiString.html \
+       com/sun/star/uno/class-use/Enum.html \
+       com/sun/star/uno/class-use/IBridge.html \
+       com/sun/star/uno/class-use/IEnvironment.html \
+       com/sun/star/uno/class-use/IFieldDescription.html \
+       com/sun/star/uno/class-use/IMapping.html \
+       com/sun/star/uno/class-use/IMemberDescription.html \
+       com/sun/star/uno/class-use/IMethodDescription.html \
+       com/sun/star/uno/class-use/IQueryInterface.html \
+       com/sun/star/uno/class-use/ITypeDescription.html \
+       com/sun/star/uno/class-use/MappingException.html \
+       com/sun/star/uno/class-use/Type.html \
+       com/sun/star/uno/class-use/Union.html \
+       com/sun/star/uno/class-use/UnoRuntime.html \
+       com/sun/star/uno/class-use/WeakReference.html \
+       com/sun/star/uno/package-frame.html \
+       com/sun/star/uno/package-summary.html \
+       com/sun/star/uno/package-tree.html \
+       com/sun/star/uno/package-use.html \
+       constant-values.html \
+       deprecated-list.html \
+       help-doc.html \
+       index-files/index-1.html \
+       index-files/index-10.html \
+       index-files/index-11.html \
+       index-files/index-12.html \
+       index-files/index-13.html \
+       index-files/index-14.html \
+       index-files/index-15.html \
+       index-files/index-16.html \
+       index-files/index-17.html \
+       index-files/index-18.html \
+       index-files/index-19.html \
+       index-files/index-2.html \
+       index-files/index-20.html \
+       index-files/index-21.html \
+       index-files/index-3.html \
+       index-files/index-4.html \
+       index-files/index-5.html \
+       index-files/index-6.html \
+       index-files/index-7.html \
+       index-files/index-8.html \
+       index-files/index-9.html \
+       index.html \
+       overview-frame.html \
+       overview-summary.html \
+       overview-tree.html \
+       package-list \
+       resources/background.gif \
+       resources/tab.gif \
+       resources/titlebar.gif \
+       resources/titlebar_end.gif \
+       serialized-form.html \
+       stylesheet.css \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp
index 2c965ea..6257992 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -41,6 +41,7 @@
         gid_File_Package_odk_config_notwin,
         gid_File_Package_odk_docs,
         gid_File_Package_odk_html,
+        gid_File_Package_odk_javadoc,
         gid_File_Package_odk_lib,
         gid_File_Package_odk_macosx,
         gid_File_Package_odk_settings,
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 69b6fd8..2308255 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -169,6 +169,15 @@
     Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 
+#if defined(SOLAR_JAVA)
+File gid_File_Package_odk_javadoc
+    TXT_FILE_BODY;
+    Dir = FILELIST_SDK_DIR;
+    Name = "odk_javadoc.filelist";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
+End
+#endif
+
 File gid_File_Package_odk_lib
     TXT_FILE_BODY;
     Dir = FILELIST_SDK_DIR;

-- 
To view, visit https://gerrit.libreoffice.org/3588
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I434508057dbfab9410d8f7fc3844c45cd4201b11
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon <dtardon@redhat.com>
Context

[PATCH] install javadoc files using filelist · David Tardon (via Code Review)
- [PATCH] install javadoc files using filelist · David Tardon (via Code Review)
- [PATCH] install javadoc files using filelist · David Tardon (via Code Review)
- [PUSHED] install javadoc files using filelist · David Tardon (via Code Review)
Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.