Kaydet (Commit) 4146cef5 authored tarafından Michael Stahl's avatar Michael Stahl

odk: package doxygen IDL docs

Change-Id: I1613ce8cf9b8248bb5d5e546df7310154e11b830
üst baa69ccc
...@@ -28,7 +28,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\ ...@@ -28,7 +28,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\
$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(SRCDIR)/odk/util/check.pl \ $(SRCDIR)/odk/util/check.pl \
$(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_docs)) \ $(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_doxygen)) \
$(call gb_Package_get_target,odk_bin) \ $(call gb_Package_get_target,odk_bin) \
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \
$(call gb_Package_get_target,odk_config) \ $(call gb_Package_get_target,odk_config) \
......
...@@ -7,10 +7,11 @@ ...@@ -7,10 +7,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_docs,$(call gb_CustomTarget_get_workdir,odk/docs))) $(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_doxygen,$(call gb_CustomTarget_get_workdir,odk/docs)))
$(eval $(call gb_GeneratedPackage_use_customtarget,odk_docs,odk/docs)) $(eval $(call gb_GeneratedPackage_use_customtarget,odk_doxygen,odk/docs))
$(eval $(call gb_GeneratedPackage_add_dir,odk_docs,$(gb_Package_SDKDIRNAME)/docs/cpp/ref,cpp/ref)) $(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(gb_Package_SDKDIRNAME)/docs/cpp/ref,cpp/ref))
$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(gb_Package_SDKDIRNAME)/docs/idl/ref,idl/ref))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,odk,\ ...@@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,odk,\
$(if $(filter WNT,$(OS)),Package_cli) \ $(if $(filter WNT,$(OS)),Package_cli) \
$(if $(DOXYGEN),\ $(if $(DOXYGEN),\
CustomTarget_doxygen \ CustomTarget_doxygen \
GeneratedPackage_cpp_docs \ GeneratedPackage_odk_doxygen \
) \ ) \
CustomTarget_html \ CustomTarget_html \
CustomTarget_settings \ CustomTarget_settings \
......
...@@ -39,7 +39,7 @@ Module gid_Module_Optional_Sdkoo ...@@ -39,7 +39,7 @@ Module gid_Module_Optional_Sdkoo
gid_File_Package_odk_settings, gid_File_Package_odk_settings,
gid_File_Package_odk_settings_generated, gid_File_Package_odk_settings_generated,
gid_File_Package_odk_unowinreg, gid_File_Package_odk_unowinreg,
gid_File_Zip_cppdocs, gid_File_Zip_doxygen,
gid_File_Zip_Odkexamples, gid_File_Zip_Odkexamples,
gid_File_Zip_OdkIdl_udkapi, gid_File_Zip_OdkIdl_udkapi,
gid_File_Zip_OdkIdl_offapi, gid_File_Zip_OdkIdl_offapi,
......
...@@ -216,10 +216,10 @@ End ...@@ -216,10 +216,10 @@ End
#endif #endif
#if defined(DOXYGEN) #if defined(DOXYGEN)
File gid_File_Zip_cppdocs File gid_File_Zip_doxygen
TXT_FILE_BODY; TXT_FILE_BODY;
Dir = FILELIST_SDK_DIR; Dir = FILELIST_SDK_DIR;
Name = "odk_cpp_docs.filelist"; Name = "odk_doxygen.filelist";
Styles = (FILELIST,USE_INTERNAL_RIGHTS); Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End End
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment