install cpp docs using filelist

Change-Id: I93176653935b6ccfd4181e6086444fbe7475f2b0
Reviewed-on: https://gerrit.libreoffice.org/3775Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

odk/CustomTarget_check.mk

@@ -28,7 +28,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\
 
 $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(SRCDIR)/odk/util/check.pl \
-		$(if $(DOXYGEN),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp)) \
+		$(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_cpp_docs)) \
 		$(call gb_Package_get_target,odk_bin) \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \
 		$(call gb_Package_get_target,odk_config) \

odk/CustomTarget_doxygen.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/cpp))
+$(eval $(call gb_CustomTarget_CustomTarget,odk/docs/cpp))
 
 CPPDOCREFNAME := "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference"
 
@@ -29,17 +29,17 @@ DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(SRCDIR)/include/sal/log-area
 	$(addprefix $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,$(odk_INCDIRLIST) $(odk_INCFILELIST))
 DOXY_INPUT := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(DOXY_INPUT)),$(DOXY_INPUT))
 DOXY_WORKDIR := $(if $(filter WNT,$(OS)),\
-	$(shell cygpath -u $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/ref),\
-	$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/ref)
+	$(shell cygpath -u $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref),\
+	$(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref)
 DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(OUTDIR)/inc),$(OUTDIR)/inc)
 
 
-$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon/docs/cpp,\
+$(eval $(call gb_CustomTarget_register_targets,odk/docs/cpp,\
 	Doxyfile \
 	doxygen.log \
 ))
 
-$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile : $(SRCDIR)/odk/pack/gendocu/Doxyfile
+$(call gb_CustomTarget_get_workdir,odk/docs/cpp)/Doxyfile : $(SRCDIR)/odk/pack/gendocu/Doxyfile
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
 	sed -e 's!^INPUT = %$$!INPUT = $(DOXY_INPUT)!' \
 		-e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(DOXY_WORKDIR)!' \
@@ -49,8 +49,8 @@ $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile : $(SRCDIR)/
 		-e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(DOXY_STRIP_PATH)!' \
 		$< > $@
 
-$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/doxygen.log : \
-		$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile \
+$(call gb_CustomTarget_get_workdir,odk/docs/cpp)/doxygen.log : \
+		$(call gb_CustomTarget_get_workdir,odk/docs/cpp)/Doxyfile \
 		$(SRCDIR)/include/sal/log-areas.dox \
 		$(SRCDIR)/odk/pack/gendocu/main.dox \
 		$(call gb_PackageSet_get_target,odk_headers)

odk/Zip_cppdocs.mk → odk/GeneratedPackage_cpp_docs.mk

@@ -7,14 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,cppdocs,$(call gb_CustomTarget_get_workdir,odk/odkcommon)))
+$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_cpp_docs,$(call gb_CustomTarget_get_workdir,odk/docs/cpp)))
 
-$(eval $(call gb_Zip_add_files,cppdocs,\
-	docs/cpp/ref \
-))
+$(eval $(call gb_GeneratedPackage_use_customtarget,odk_cpp_docs,odk/docs/cpp))
 
-$(eval $(call gb_Zip_add_commandoptions,cppdocs,-r))
-
-$(call gb_Zip_get_target,cppdocs) : $(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp)
+$(eval $(call gb_GeneratedPackage_add_dir,odk_cpp_docs,$(gb_Package_SDKDIRNAME)/docs/cpp/ref,ref))
 
 # vim: set noet sw=4 ts=4:

odk/Module_odk.mk

@@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(filter WNT,$(OS)),Package_cli) \
 	$(if $(DOXYGEN),\
 		CustomTarget_doxygen \
-		Zip_cppdocs \
+		GeneratedPackage_cpp_docs \
 	) \
 	CustomTarget_html \
 	CustomTarget_settings \

scp2/source/sdkoo/sdkoo.scp

@@ -227,9 +227,9 @@ End
 #if defined(DOXYGEN)
 File gid_File_Zip_cppdocs
     TXT_FILE_BODY;
-    Dir = gid_Dir_Basis_Sdk;
-    Name = "cppdocs.zip";
-    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+    Dir = FILELIST_SDK_DIR;
+    Name = "odk_cpp_docs.filelist";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 #endif