diff options
| -rw-r--r-- | odk/CustomTarget_doxygen.mk | 13 | ||||
| -rw-r--r-- | odk/CustomTarget_include.mk | 27 | ||||
| -rw-r--r-- | scp2/source/sdkoo/module_sdkoo.scp | 9 | ||||
| -rw-r--r-- | scp2/source/sdkoo/sdkoo.scp | 49 |
4 files changed, 70 insertions, 28 deletions
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index cde87c4baa55..2a18fbf90e80 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -13,6 +13,19 @@ odkcommon_ZIPLIST += docs/cpp/ref CPPDOCREFNAME := "UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) C/C++ API Reference" +odk_INCDIRLIST := sal salhelper rtl osl store typelib uno cppu cppuhelper \ + registry $(if $(filter WNT,$(OS)),systools) +odk_INCFILELIST := com/sun/star/uno/Any.h \ + com/sun/star/uno/Any.hxx \ + com/sun/star/uno/genfunc.h \ + com/sun/star/uno/genfunc.hxx \ + com/sun/star/uno/Reference.h \ + com/sun/star/uno/Reference.hxx \ + com/sun/star/uno/Sequence.h \ + com/sun/star/uno/Sequence.hxx \ + com/sun/star/uno/Type.h \ + com/sun/star/uno/Type.hxx + # Cygwin Doxygen needs unix paths DOXY_INPUT := $(docu_SRCDIR)/main.dox $(addprefix $(OUTDIR)/inc/,$(odk_INCDIRLIST) $(odk_INCFILELIST)) DOXY_INPUT := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(DOXY_INPUT)),$(DOXY_INPUT)) diff --git a/odk/CustomTarget_include.mk b/odk/CustomTarget_include.mk index 8d1ee5aa0f90..c8a12c33a83d 100644 --- a/odk/CustomTarget_include.mk +++ b/odk/CustomTarget_include.mk @@ -11,33 +11,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/include)) include $(SRCDIR)/solenv/inc/udkversion.mk -odk_INCDIRLIST := sal salhelper rtl osl store typelib uno cppu cppuhelper \ - registry $(if $(filter WNT,$(OS)),systools) -odk_INCFILELIST := com/sun/star/uno/Any.h \ - com/sun/star/uno/Any.hxx \ - com/sun/star/uno/genfunc.h \ - com/sun/star/uno/genfunc.hxx \ - com/sun/star/uno/Reference.h \ - com/sun/star/uno/Reference.hxx \ - com/sun/star/uno/Sequence.h \ - com/sun/star/uno/Sequence.hxx \ - com/sun/star/uno/Type.h \ - com/sun/star/uno/Type.hxx -odk_INCLIST := $(subst $(OUTDIR)/inc/,,$(shell find \ - $(foreach dir,$(odk_INCDIRLIST),$(OUTDIR)/inc/$(dir)) -type f)) \ - $(odk_INCFILELIST) - -define odk_inc -odkcommon_ZIPLIST += include/$(1) -$(call gb_CustomTarget_get_target,odk/odkcommon/include): $(odk_WORKDIR)/include/$(1) -$(odk_WORKDIR)/include/$(1): $(OUTDIR)/inc/$(1) - mkdir -p $$(dir $$@) - $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1) - cp $$< $$@ -endef - -$(foreach inc,$(odk_INCLIST),$(eval $(call odk_inc,$(inc)))) - odkcommon_ZIPLIST += include/udkversion.mk $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/include,include/udkversion.mk)) $(odk_WORKDIR)/include/udkversion.mk: diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp index b24bd7aafd50..732388c86739 100644 --- a/scp2/source/sdkoo/module_sdkoo.scp +++ b/scp2/source/sdkoo/module_sdkoo.scp @@ -33,5 +33,12 @@ Module gid_Module_Optional_Sdkoo Sortkey = "630"; ParentID = gid_Module_Optional; Default = NO; - Files = (gid_File_Zip_Odkexamples, gid_File_Zip_Odkcommon); + Files = (gid_File_Zip_Odkexamples, gid_File_Zip_Odkcommon, + gid_File_Zip_Odkheaders_sal_generated, + gid_File_Zip_Odkheaders_sal, + gid_File_Zip_Odkheaders_salhelper, + gid_File_Zip_Odkheaders_cppu, + gid_File_Zip_Odkheaders_cppuhelper, + gid_File_Zip_Odkheaders_store, + gid_File_Zip_Odkheaders_registry); End diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index 88eb508a5f43..02dc53672cd7 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -131,6 +131,55 @@ File gid_File_Zip_Odkcommon Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); End +File gid_File_Zip_Odkheaders_sal_generated + TXT_FILE_BODY; + Dir = gid_Dir_Basis_Sdk; + Name = "sal_generated.zip"; + Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); +End + +File gid_File_Zip_Odkheaders_sal + TXT_FILE_BODY; + Dir = gid_Dir_Basis_Sdk; + Name = "sal_odk_headers.zip"; + Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); +End + +File gid_File_Zip_Odkheaders_salhelper + TXT_FILE_BODY; + Dir = gid_Dir_Basis_Sdk; + Name = "salhelper_odk_headers.zip"; + Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); +End + +File gid_File_Zip_Odkheaders_cppu + TXT_FILE_BODY; + Dir = gid_Dir_Basis_Sdk; + Name = "cppu_odk_headers.zip"; + Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); +End + +File gid_File_Zip_Odkheaders_cppuhelper + TXT_FILE_BODY; + Dir = gid_Dir_Basis_Sdk; + Name = "cppuhelper_odk_headers.zip"; + Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); +End + +File gid_File_Zip_Odkheaders_store + TXT_FILE_BODY; + Dir = gid_Dir_Basis_Sdk; + Name = "store_odk_headers.zip"; + Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); +End + +File gid_File_Zip_Odkheaders_registry + TXT_FILE_BODY; + Dir = gid_Dir_Basis_Sdk; + Name = "registry_odk_headers.zip"; + Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); +End + #if (!defined(WNT) && !defined( MACOSX) ) Directory gid_Dir_Lib_Sdk Styles = (CREATE); |