diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-04 13:57:06 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-04 14:42:19 +0000 |
| commit | ffa50f643c9bed8a6c5970ba72712a1d68d186a6 (patch) | |
| tree | 86add7fa9070b52db39b5c66ab700e0805361206 /odk | |
| parent | 0fd330ec4db4c75e08976a72f1c846b1bcf68594 (diff) | |
install cpp docs using filelist
Change-Id: I93176653935b6ccfd4181e6086444fbe7475f2b0
Reviewed-on: https://gerrit.libreoffice.org/3775
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_check.mk | 2 | ||||
| -rw-r--r-- | odk/CustomTarget_doxygen.mk | 14 | ||||
| -rw-r--r-- | odk/GeneratedPackage_cpp_docs.mk (renamed from odk/Zip_cppdocs.mk) | 10 | ||||
| -rw-r--r-- | odk/Module_odk.mk | 2 |
4 files changed, 12 insertions, 16 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 66605250932a..74415a2bbf73 100644 --- a/odk/CustomTarget_check.mk +++ b/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) \ diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index bddb0f358c1f..65581932fcfa 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/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) diff --git a/odk/Zip_cppdocs.mk b/odk/GeneratedPackage_cpp_docs.mk index 1f86757f9471..313980f8355d 100644 --- a/odk/Zip_cppdocs.mk +++ b/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: diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index aab05397fc62..f7cc7771d570 100644 --- a/odk/Module_odk.mk +++ b/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 \ |