odk: stop packaging autodoc generated documentation

Change-Id: I9d1e232f2fea779f111067b588bbb36411039de2

odk/CustomTarget_autodoc.mk

-# -*- 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_CustomTarget_CustomTarget,odk/docs/common/ref))
-
-$(eval $(call gb_CustomTarget_register_targets,odk/docs/common/ref,\
-	autodoc_log.txt \
-))
-
-$(call gb_CustomTarget_get_workdir,odk/docs/common/ref)/%.html : $(call gb_CustomTarget_get_workdir,odk/docs/common/ref)/autodoc_log.txt
-	touch $@
-
-$(call gb_CustomTarget_get_workdir,odk/docs/common/ref)/autodoc_log.txt : \
-		$(SRCDIR)/odk/pack/copying/idl_chapter_refs.txt \
-		$(SRCDIR)/odk/docs/common/ref/idl.css \
-		$(call gb_Executable_get_runtime_dependencies,autodoc)
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AUD,1)
-	$(call gb_Executable_get_command,autodoc) \
-		-html $(dir $@) \
-		-dvgroot "http://wiki.services.openoffice.org/wiki" \
-		-name "LibreOffice $(PRODUCTVERSION) API" \
-		-lg idl \
-		-dvgfile $< \
-		-t $(SRCDIR)/udkapi $(SRCDIR)/offapi \
-		> $@
-
-
-# vim: set noet sw=4 ts=4:

odk/CustomTarget_check.mk

@@ -10,7 +10,6 @@
 $(eval $(call gb_CustomTarget_CustomTarget,odk/check))
 
 $(eval $(call gb_CustomTarget_register_targets,odk/check,\
-	autodoc \
 	checkbin \
 ))
 
@@ -44,8 +43,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
 		$(call gb_Package_get_target,odk_uno_loader_classes) \
-		$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) \
-		$(call gb_PackageSet_get_target,odk_autodoc)
+		$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg))
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
 	$(call gb_Helper_print_on_error,\
 		$(PERL) $< \
@@ -54,20 +52,4 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		,$@.log \
 	)
 
-.PHONY : $(call gb_CustomTarget_get_workdir,odk/check)/autodoc
-$(call gb_CustomTarget_get_workdir,odk/check)/autodoc : $(call gb_PackageSet_get_target,odk_autodoc)
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
-	( \
-		c=0 && \
-		for m in `find $(call gb_CustomTarget_get_workdir,odk/docs/common/ref) -name module-ix.html`; do \
-			m=`echo $$m | sed -e s@$(call gb_CustomTarget_get_workdir,odk/docs/common/ref)/@@` && \
-			mm=$(INSTDIR)/$(gb_Package_SDKDIRNAME)/docs/common/ref/$${m} && \
-			if [ ! -e $${mm} ]; then \
-				c=`expr $$c + 1`; \
-				echo "autodoc check: $${mm} not found. Please update odk/Package_autodoc.mk ."; \
-			fi \
-		done && \
-		if [ $${c} -gt 0 ]; then exit 1; fi \
-	)
-
 # vim: set noet sw=4 ts=4:

odk/Module_odk.mk

@@ -17,9 +17,7 @@ $(eval $(call gb_Module_add_targets,odk,\
 	) \
 	CustomTarget_html \
 	CustomTarget_settings \
-	CustomTarget_autodoc \
 	Executable_unoapploader \
-	Package_autodoc \
 	Package_bin \
 	Package_config \
 	Package_docs \
@@ -30,7 +28,6 @@ $(eval $(call gb_Module_add_targets,odk,\
 	Package_odk_headers_generated \
 	Package_settings \
 	Package_settings_generated \
-	PackageSet_autodoc \
 	PackageSet_odk_headers \
 ))
 

odk/PackageSet_autodoc.mk

-# -*- 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_PackageSet_PackageSet,odk_autodoc))
-
-$(eval $(call gb_PackageSet_add_packages,odk_autodoc,\
-	odk_autodoc \
-	offapi_doc \
-	udkapi_doc \
-))
-
-# vim: set noet sw=4 ts=4:

odk/Package_autodoc.mk

-# -*- 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_autodoc,$(call gb_CustomTarget_get_workdir,odk/docs/common/ref)))
-
-$(eval $(call gb_Package_set_outdir,odk_autodoc,$(INSTDIR)))
-
-# indices
-$(eval $(call gb_Package_add_files_with_dir,odk_autodoc,$(gb_Package_SDKDIRNAME)/docs/common/ref,\
-	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-22.html \
-	index-files/index-23.html \
-	index-files/index-24.html \
-	index-files/index-25.html \
-	index-files/index-26.html \
-	index-files/index-27.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 \
-))
-
-# module lists
-$(eval $(call gb_Package_add_files_with_dir,odk_autodoc,$(gb_Package_SDKDIRNAME)/docs/common/ref,\
-	module-ix.html \
-	$(addsuffix /module-ix.html,\
-		com \
-		com/sun \
-		com/sun/star \
-		com/sun/star/accessibility \
-		com/sun/star/animations \
-		com/sun/star/auth \
-		com/sun/star/awt \
-		com/sun/star/awt/grid \
-		com/sun/star/awt/tab \
-		com/sun/star/awt/tree \
-		com/sun/star/beans \
-		com/sun/star/bridge \
-		com/sun/star/bridge/oleautomation \
-		com/sun/star/chart \
-		com/sun/star/chart2 \
-		com/sun/star/chart2/data \
-		com/sun/star/configuration \
-		com/sun/star/configuration/backend \
-		com/sun/star/configuration/backend/xml \
-		com/sun/star/configuration/bootstrap \
-		com/sun/star/connection \
-		com/sun/star/container \
-		com/sun/star/cui \
-		com/sun/star/datatransfer \
-		com/sun/star/datatransfer/clipboard \
-		com/sun/star/datatransfer/dnd \
-		com/sun/star/deployment \
-		com/sun/star/deployment/test \
-		com/sun/star/deployment/ui \
-		com/sun/star/document \
-		com/sun/star/drawing \
-		com/sun/star/drawing/framework \
-		com/sun/star/embed \
-		com/sun/star/form \
-		com/sun/star/form/binding \
-		com/sun/star/form/component \
-		com/sun/star/form/control \
-		com/sun/star/form/inspection \
-		com/sun/star/form/runtime \
-		com/sun/star/form/submission \
-		com/sun/star/form/validation \
-		com/sun/star/formula \
-		com/sun/star/frame \
-		com/sun/star/frame/status \
-		com/sun/star/gallery \
-		com/sun/star/geometry \
-		com/sun/star/graphic \
-		com/sun/star/i18n \
-		com/sun/star/image \
-		com/sun/star/inspection \
-		com/sun/star/io \
-		com/sun/star/java \
-		com/sun/star/lang \
-		com/sun/star/ldap \
-		com/sun/star/linguistic2 \
-		com/sun/star/loader \
-		com/sun/star/logging \
-		com/sun/star/mail \
-		com/sun/star/media \
-		com/sun/star/mozilla \
-		com/sun/star/office \
-		com/sun/star/packages \
-		com/sun/star/packages/manifest \
-		com/sun/star/packages/zip \
-		com/sun/star/plugin \
-		com/sun/star/presentation \
-		com/sun/star/presentation/textfield \
-		com/sun/star/qa \
-		com/sun/star/rdf \
-		com/sun/star/reflection \
-		com/sun/star/registry \
-		com/sun/star/rendering \
-		com/sun/star/report \
-		com/sun/star/report/inspection \
-		com/sun/star/report/meta \
-		com/sun/star/resource \
-		com/sun/star/scanner \
-		com/sun/star/script \
-		com/sun/star/script/browse \
-		com/sun/star/script/provider \
-		com/sun/star/script/vba \
-		com/sun/star/sdb \
-		com/sun/star/sdb/application \
-		com/sun/star/sdb/tools \
-		com/sun/star/sdbc \
-		com/sun/star/sdbcx \
-		com/sun/star/security \
-		com/sun/star/setup \
-		com/sun/star/sheet \
-		com/sun/star/smarttags \
-		com/sun/star/style \
-		com/sun/star/svg \
-		com/sun/star/system \
-		com/sun/star/table \
-		com/sun/star/task \
-		com/sun/star/text \
-		com/sun/star/text/fieldmaster \
-		com/sun/star/text/textfield \
-		com/sun/star/text/textfield/docinfo \
-		com/sun/star/ucb \
-		com/sun/star/ui \
-		com/sun/star/ui/dialogs \
-		com/sun/star/uno \
-		com/sun/star/uri \
-		com/sun/star/util \
-		com/sun/star/view \
-		com/sun/star/xforms \
-		com/sun/star/xml \
-		com/sun/star/xml/crypto \
-		com/sun/star/xml/crypto/sax \
-		com/sun/star/xml/csax \
-		com/sun/star/xml/dom \
-		com/sun/star/xml/dom/events \
-		com/sun/star/xml/dom/views \
-		com/sun/star/xml/input \
-		com/sun/star/xml/sax \
-		com/sun/star/xml/wrapper \
-		com/sun/star/xml/xpath \
-		com/sun/star/xml/xslt \
-		com/sun/star/xsd \
-		org \
-		org/freedesktop \
-		org/freedesktop/PackageKit \
-	) \
-))
-
-# vim: set noet sw=4 ts=4:

odk/util/check.pl

@@ -222,17 +222,17 @@ if (-d "$SdkDir") {
     #check idl docu, it is only a first and simple check
     # improvement required
     print "check idl docu: ";
-    if (check_dir("docs/common/ref")) {
-    if (!check_file("docs/common/ref/module-ix.html")) {
-        print "\nERROR: \"docs/common/ref/module-ix.html\" is missing\n";
+    if (check_dir("docs/idl/ref")) {
+    if (!check_file("docs/idl/ref/index.html")) {
+        print "\nERROR: \"docs/idl/ref/index.html\" is missing\n";
         $return++;
     }
-    if (!check_dir("docs/common/ref/index-files")) {
-        print "\nERROR: \"docs/common/ref/index-files\" is missing\n";
+    if (!check_file("docs/idl/ref/classes.html")) {
+        print "\nERROR: \"docs/idl/ref/classes.html\" is missing\n";
         $return++;
     }
-    if (!check_file("docs/common/ref/index-files/index-10.html")) {
-        print "\nERROR: \"docs/common/ref/index-files/index-10.html\" is missing\n";
+    if (!check_file("docs/idl/ref/namespaces.html")) {
+        print "\nERROR: \"docs/idl/ref/namespaces.html\" is missing\n";
         $return++;
     }
 
@@ -349,9 +349,10 @@ if (-d "$SdkDir") {
     if ($OperatingSystem ne "windows") {
     foreach $i (@idl_dirlist)
     {
-        if (!check_dir("docs/common/ref/com/sun/star/$i")) {
+        $i =~ s/\//_1_1/g;
+        if (!check_file("docs/idl/ref/com_1_1sun_1_1star_1_1$i.html")) {
         $return++;
-        print "\nERROR: \"docs/common/ref/com/sun/star/$i\" is missing\n";
+        print "\nERROR: \"docs/idl/ref/com_1_1sun_1_1star_1_1$i.html\" is missing\n";
         } else {
         print "+";
         }

scp2/source/sdkoo/module_sdkoo.scp

@@ -25,7 +25,6 @@ Module gid_Module_Optional_Sdkoo
     ParentID = gid_Module_Optional;
     Default = NO;
     Files = (
-        gid_File_Package_odk_autodoc,
         gid_File_Package_odk_bin,
         gid_File_Package_odk_cli,
         gid_File_Package_odk_config,

scp2/source/sdkoo/sdkoo.scp

@@ -107,13 +107,6 @@ File gid_File_Txt_Readme
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_File_Package_odk_autodoc
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_autodoc.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
 File gid_File_Package_odk_bin
     TXT_FILE_BODY;
     Dir = FILELIST_SDK_DIR;