diff options
17 files changed, 52 insertions, 91 deletions
diff --git a/cppu/CustomTarget_cppu_allheaders.mk b/cppu/CustomTarget_cppu_allheaders.mk index 6d5ebeba49f2..f7573f7e7c38 100644 --- a/cppu/CustomTarget_cppu_allheaders.mk +++ b/cppu/CustomTarget_cppu_allheaders.mk @@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,cppu/allheaders) : \ # updated whenever a new public header is added $(cppu_allheaders_DIR)/cppu_allheaders.hxx : \ $(SRCDIR)/cppu/CustomTarget_cppu_allheaders.mk \ - $(SRCDIR)/cppu/ZipPackage_cppu_odk_headers.mk \ + $(SRCDIR)/cppu/Package_cppu_odk_headers.mk \ | $(cppu_allheaders_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) printf '// Generated list of all cppu/ includes\n' > $@ diff --git a/cppu/Module_cppu.mk b/cppu/Module_cppu.mk index 6a5bf3276ee8..c957320361a8 100644 --- a/cppu/Module_cppu.mk +++ b/cppu/Module_cppu.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,cppu,\ Library_log_uno \ Library_purpenvhelper \ Library_unsafe_uno \ - ZipPackage_cppu_odk_headers \ + Package_cppu_odk_headers \ )) $(eval $(call gb_Module_add_check_targets,cppu,\ diff --git a/cppu/ZipPackage_cppu_odk_headers.mk b/cppu/Package_cppu_odk_headers.mk index 0b7c9dca7ece..3b203fc29769 100644 --- a/cppu/ZipPackage_cppu_odk_headers.mk +++ b/cppu/Package_cppu_odk_headers.mk @@ -25,9 +25,11 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_ZipPackage_ZipPackage,cppu_odk_headers,$(SRCDIR)/cppu/inc)) +$(eval $(call gb_Package_Package,cppu_odk_headers,$(SRCDIR)/cppu/inc)) -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/com/sun/star/uno,include/com/sun/star/uno,\ +$(eval $(call gb_Package_set_outdir,cppu_odk_headers,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/com/sun/star/uno,\ com/sun/star/uno/Any.h \ com/sun/star/uno/Any.hxx \ com/sun/star/uno/genfunc.h \ @@ -40,7 +42,7 @@ $(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/com/sun/star/uno,incl com/sun/star/uno/Type.hxx \ )) -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/cppu,include/cppu,\ +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppu,\ cppu/cppudllapi.h \ cppu/EnvDcp.hxx \ cppu/Enterable.hxx \ @@ -50,19 +52,19 @@ $(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/cppu,include/cppu,\ cppu/unotype.hxx \ )) -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/cppu/helper/purpenv/,include/cppu/helper/purpenv/,\ +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppu/helper/purpenv/,\ cppu/helper/purpenv/Environment.hxx \ cppu/helper/purpenv/Mapping.hxx \ )) -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/typelib,include/typelib,\ +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/typelib,\ typelib/typeclass.h \ typelib/typedescription.h \ typelib/typedescription.hxx \ typelib/uik.h \ )) -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/uno,include/uno,\ +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/uno,\ uno/any2.h \ uno/current_context.h \ uno/current_context.hxx \ diff --git a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk index e5f90817f556..a6d83d4069c7 100644 --- a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk +++ b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk @@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,cppuhelper/allheaders) : \ # updated whenever a new public header is added $(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx : \ $(SRCDIR)/cppuhelper/CustomTarget_cppuhelper_allheaders.mk \ - $(SRCDIR)/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk \ + $(SRCDIR)/cppuhelper/Package_cppuhelper_odk_headers.mk \ | $(cppuhelper_allheaders_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) printf '// Generated list of all cppuhelper/ includes\n' > $@ diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk index 2a917fe140f4..96fd971b01f8 100644 --- a/cppuhelper/Module_cppuhelper.mk +++ b/cppuhelper/Module_cppuhelper.mk @@ -31,9 +31,9 @@ $(eval $(call gb_Module_add_targets,cppuhelper,\ CustomTarget_cppuhelper_allheaders \ InternalUnoApi_cppuhelper \ Library_cppuhelper \ + Package_cppuhelper_odk_headers \ Package_unorc \ StaticLibrary_findsofficepath \ - ZipPackage_cppuhelper_odk_headers \ )) $(eval $(call gb_Module_add_check_targets,cppuhelper,\ diff --git a/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk b/cppuhelper/Package_cppuhelper_odk_headers.mk index 2a95b6b4428d..93fac81c36eb 100644 --- a/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk +++ b/cppuhelper/Package_cppuhelper_odk_headers.mk @@ -25,9 +25,11 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_ZipPackage_ZipPackage,cppuhelper_odk_headers,$(SRCDIR)/cppuhelper/inc)) +$(eval $(call gb_Package_Package,cppuhelper_odk_headers,$(SRCDIR)/cppuhelper/inc)) -$(eval $(call gb_ZipPackage_add_files,cppuhelper_odk_headers,inc/cppuhelper,include/cppuhelper,\ +$(eval $(call gb_Package_set_outdir,cppuhelper_odk_headers,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,cppuhelper_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppuhelper,\ cppuhelper/cppuhelperdllapi.h \ cppuhelper/access_control.hxx \ cppuhelper/basemutex.hxx \ diff --git a/sal/CustomTarget_sal_allheaders.mk b/sal/CustomTarget_sal_allheaders.mk index 337456844d5e..3beeb299093a 100644 --- a/sal/CustomTarget_sal_allheaders.mk +++ b/sal/CustomTarget_sal_allheaders.mk @@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,sal/allheaders) : \ # dependency on Package_inc.mk should ensure this is updated whenever a new public header is added $(sal_allheaders_DIR)/sal_allheaders.hxx : $(SRCDIR)/sal/CustomTarget_sal_allheaders.mk \ - $(SRCDIR)/sal/ZipPackage_sal_odk_headers.mk \ + $(SRCDIR)/sal/Package_sal_odk_headers.mk \ $(SRCDIR)/sal/Package_inc.mk \ | $(sal_allheaders_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index b5c84b1e0270..59a40a73cffc 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -41,8 +41,8 @@ $(eval $(call gb_Module_add_targets,sal,\ Library_uwinapi) \ Package_inc \ StaticLibrary_salcpprt \ - ZipPackage_sal_generated \ - ZipPackage_sal_odk_headers \ + Package_sal_generated \ + Package_sal_odk_headers \ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) diff --git a/sal/ZipPackage_sal_generated.mk b/sal/Package_sal_generated.mk index 0cd7442f445e..86578dac954f 100644 --- a/sal/ZipPackage_sal_generated.mk +++ b/sal/Package_sal_generated.mk @@ -25,8 +25,10 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_ZipPackage_ZipPackage,sal_generated,$(BUILDDIR)/config_$(gb_Side))) +$(eval $(call gb_Package_Package,sal_generated,$(BUILDDIR)/config_$(gb_Side))) -$(eval $(call gb_ZipPackage_add_file,sal_generated,inc/sal/typesizes.h,include/sal/typesizes.h,config_typesizes.h)) +$(eval $(call gb_Package_set_outdir,sal_generated,$(INSTDIR))) + +$(eval $(call gb_Package_add_file,sal_generated,$(gb_Package_SDKDIRNAME)/include/sal/typesizes.h,config_typesizes.h)) # vim: set noet sw=4 ts=4: diff --git a/sal/ZipPackage_sal_odk_headers.mk b/sal/Package_sal_odk_headers.mk index 696bc60c899a..613eebc9866e 100644 --- a/sal/ZipPackage_sal_odk_headers.mk +++ b/sal/Package_sal_odk_headers.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ZipPackage_ZipPackage,sal_odk_headers,$(SRCDIR)/sal/inc)) +$(eval $(call gb_Package_Package,sal_odk_headers,$(SRCDIR)/sal/inc)) -$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/sal,include/sal,\ +$(eval $(call gb_Package_set_outdir,sal_odk_headers,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/sal,\ sal/alloca.h \ sal/ByteBufferWrapper.hxx \ sal/config.h \ @@ -21,11 +23,11 @@ $(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/sal,include/sal,\ sal/types.h \ )) -$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/sal/detail,include/sal/detail,\ +$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/sal/detail,\ sal/detail/log.h \ )) -$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/rtl,include/rtl,\ +$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/rtl,\ rtl/allocator.hxx \ rtl/alloc.h \ rtl/bootstrap.h \ @@ -65,7 +67,7 @@ $(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/rtl,include/rtl,\ rtl/uuid.h \ )) -$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/osl,include/osl,\ +$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/osl,\ osl/conditn.h \ osl/conditn.hxx \ osl/diagnose.h \ @@ -100,7 +102,7 @@ $(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/osl,include/osl,\ osl/util.h \ )) -$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/systools/win32,include/systools/win32,\ +$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/systools/win32,\ systools/win32/snprintf.h \ )) diff --git a/salhelper/CustomTarget_salhelper_allheaders.mk b/salhelper/CustomTarget_salhelper_allheaders.mk index 60498aab3da0..fd2e8d076904 100644 --- a/salhelper/CustomTarget_salhelper_allheaders.mk +++ b/salhelper/CustomTarget_salhelper_allheaders.mk @@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,salhelper/allheaders) : \ # updated whenever a new public header is added $(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \ $(SRCDIR)/salhelper/CustomTarget_salhelper_allheaders.mk \ - $(SRCDIR)/salhelper/ZipPackage_salhelper_odk_headers.mk \ + $(SRCDIR)/salhelper/Package_salhelper_odk_headers.mk \ | $(salhelper_allheaders_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) printf '// Generated list of all salhelper/ includes\n' > $@ diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk index 31f3f22feff2..7ba68a90c4fa 100644 --- a/salhelper/Module_salhelper.mk +++ b/salhelper/Module_salhelper.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Module_Module,salhelper)) $(eval $(call gb_Module_add_targets,salhelper,\ CustomTarget_salhelper_allheaders \ Library_salhelper \ - ZipPackage_salhelper_odk_headers \ + Package_salhelper_odk_headers \ )) $(eval $(call gb_Module_add_check_targets,salhelper,\ diff --git a/salhelper/ZipPackage_salhelper_odk_headers.mk b/salhelper/Package_salhelper_odk_headers.mk index 8de4d5ffc1a7..89ae6148a477 100644 --- a/salhelper/ZipPackage_salhelper_odk_headers.mk +++ b/salhelper/Package_salhelper_odk_headers.mk @@ -25,9 +25,11 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_ZipPackage_ZipPackage,salhelper_odk_headers,$(SRCDIR)/salhelper/inc/salhelper)) +$(eval $(call gb_Package_Package,salhelper_odk_headers,$(SRCDIR)/salhelper/inc/salhelper)) -$(eval $(call gb_ZipPackage_add_files,salhelper_odk_headers,inc/salhelper,include/salhelper,\ +$(eval $(call gb_Package_set_outdir,salhelper_odk_headers,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,salhelper_odk_headers,$(gb_Package_SDKDIRNAME)/include/salhelper,\ salhelperdllapi.h \ condition.hxx \ dynload.hxx \ diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index ff64264f4dac..b1eb1dd35f54 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -147,37 +147,37 @@ 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); + Dir = FILELIST_SDK_DIR; + Name = "sal_generated.filelist"; + Styles = (FILELIST,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); + Dir = FILELIST_SDK_DIR; + Name = "sal_odk_headers.filelist"; + Styles = (FILELIST,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); + Dir = FILELIST_SDK_DIR; + Name = "salhelper_odk_headers.filelist"; + Styles = (FILELIST,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); + Dir = FILELIST_SDK_DIR; + Name = "cppu_odk_headers.filelist"; + Styles = (FILELIST,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); + Dir = FILELIST_SDK_DIR; + Name = "cppuhelper_odk_headers.filelist"; + Styles = (FILELIST,USE_INTERNAL_RIGHTS); End #if (!defined(WNT) && !defined( MACOSX) ) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index d87287803e64..f56d9b24f4e1 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -235,7 +235,6 @@ gb_XcuMergeTarget_get_target = $(WORKDIR)/XcuMergeTarget/$(1) gb_XcuResTarget_get_target = $(WORKDIR)/XcuResTarget/$(1) gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done -gb_ZipPackage_get_target = $(WORKDIR)/ZipPackage/$(1) gb_Library__get_final_target = $(WORKDIR)/Dummy/$(1) diff --git a/solenv/gbuild/ZipPackage.mk b/solenv/gbuild/ZipPackage.mk deleted file mode 100644 index 612486c25e0e..000000000000 --- a/solenv/gbuild/ZipPackage.mk +++ /dev/null @@ -1,47 +0,0 @@ -# -*- 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/. -# - -# ZipPackage class -# this is a bit of a hack, hopefully needed only temporarily because -# scp2 can easily deal with zip files but not so easily with 100s of -# individual files; ideally the Package itself should be sufficient. - -define gb_ZipPackage_ZipPackage -$(call gb_Package_Package,$(1),$(2)) -$(call gb_Zip_Zip_internal,$(1),$(WORKDIR)/Zip/$(1)) -$(call gb_Package_get_target,$(1)) : $(call gb_Zip_get_final_target,$(1)) -$(call gb_Package_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(1)) -$(call gb_ZipPackage_get_target,$(1)) : $(call gb_Package_get_target,$(1)) -$(call gb_Helper_make_userfriendly_targets,$(1),ZipPackage) - -endef - -# sadly Package delivers to inc/ but ODK path is include/ so need to -# copy files twice -# $(1) package -# $(2) dir in package -# $(3) dir in zip -# $(4) file list -define gb_ZipPackage_add_files -$(call gb_Package_add_files,$(1),$(2),$(4)) -$(foreach file,$(4),$(call gb_Zip_add_file,$(1),$(3)/$(notdir $(file)),$(gb_Package_SOURCEDIR_$(1))/$(file))) - -endef - -# $(1) package -# $(2) file in package -# $(3) file in zip -# $(4) file source -define gb_ZipPackage_add_file -$(call gb_Package_add_file,$(1),$(2),$(4)) -$(call gb_Zip_add_file,$(1),$(3),$(gb_Package_SOURCEDIR_$(1))/$(4)) - -endef - -# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 3853618fc119..87a5c6570fb5 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -331,7 +331,6 @@ include $(foreach class, \ CliNativeLibrary \ CliUnoApi \ Zip \ - ZipPackage \ AllLangPackage \ Configuration \ HelpTarget \ |