mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

install SDK headers from filelists

Browse Source 
... which allows us to drop gb_ZipPackage.

Change-Id: Ib19f774c63d9b83ec07e99f963533eee431cc53a
This commit is contained in:
David Tardon
2013-04-12 12:08:03 +02:00
parent ea09e0352a
commit d3e93f256e
17 changed files with 52 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cppu/CustomTarget_cppu_allheaders.mk
View File

@@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,cppu/allheaders) : \
# updated whenever a new public header is added # updated whenever a new public header is added
$(cppu_allheaders_DIR)/cppu_allheaders.hxx : \ $(cppu_allheaders_DIR)/cppu_allheaders.hxx : \
$(SRCDIR)/cppu/CustomTarget_cppu_allheaders.mk \ $(SRCDIR)/cppu/CustomTarget_cppu_allheaders.mk \
$(SRCDIR)/cppu/ZipPackage_cppu_odk_headers.mk \ $(SRCDIR)/cppu/Package_cppu_odk_headers.mk \
| $(cppu_allheaders_DIR)/.dir | $(cppu_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
printf '// Generated list of all cppu/ includes\n' > $@ printf '// Generated list of all cppu/ includes\n' > $@

2
cppu/Module_cppu.mk
View File

@@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,cppu,\
Library_log_uno \ Library_log_uno \
Library_purpenvhelper \ Library_purpenvhelper \
Library_unsafe_uno \ Library_unsafe_uno \
ZipPackage_cppu_odk_headers \ Package_cppu_odk_headers \
)) ))
$(eval $(call gb_Module_add_check_targets,cppu,\ $(eval $(call gb_Module_add_check_targets,cppu,\

14
cppu/ZipPackage_cppu_odk_headers.mk → cppu/Package_cppu_odk_headers.mk
View File

@@ -25,9 +25,11 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above. # 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.h \
com/sun/star/uno/Any.hxx \ com/sun/star/uno/Any.hxx \
com/sun/star/uno/genfunc.h \ 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 \ 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/cppudllapi.h \
cppu/EnvDcp.hxx \ cppu/EnvDcp.hxx \
cppu/Enterable.hxx \ cppu/Enterable.hxx \
@@ -50,19 +52,19 @@ $(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/cppu,include/cppu,\
cppu/unotype.hxx \ 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/Environment.hxx \
cppu/helper/purpenv/Mapping.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/typeclass.h \
typelib/typedescription.h \ typelib/typedescription.h \
typelib/typedescription.hxx \ typelib/typedescription.hxx \
typelib/uik.h \ 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/any2.h \
uno/current_context.h \ uno/current_context.h \
uno/current_context.hxx \ uno/current_context.hxx \

2
cppuhelper/CustomTarget_cppuhelper_allheaders.mk
View File

@@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,cppuhelper/allheaders) : \
# updated whenever a new public header is added # updated whenever a new public header is added
$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx : \ $(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx : \
$(SRCDIR)/cppuhelper/CustomTarget_cppuhelper_allheaders.mk \ $(SRCDIR)/cppuhelper/CustomTarget_cppuhelper_allheaders.mk \
$(SRCDIR)/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk \ $(SRCDIR)/cppuhelper/Package_cppuhelper_odk_headers.mk \
| $(cppuhelper_allheaders_DIR)/.dir | $(cppuhelper_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
printf '// Generated list of all cppuhelper/ includes\n' > $@ printf '// Generated list of all cppuhelper/ includes\n' > $@

2
cppuhelper/Module_cppuhelper.mk
View File

@@ -31,9 +31,9 @@ $(eval $(call gb_Module_add_targets,cppuhelper,\
CustomTarget_cppuhelper_allheaders \ CustomTarget_cppuhelper_allheaders \
InternalUnoApi_cppuhelper \ InternalUnoApi_cppuhelper \
Library_cppuhelper \ Library_cppuhelper \
Package_cppuhelper_odk_headers \
Package_unorc \ Package_unorc \
StaticLibrary_findsofficepath \ StaticLibrary_findsofficepath \
ZipPackage_cppuhelper_odk_headers \
)) ))
$(eval $(call gb_Module_add_check_targets,cppuhelper,\ $(eval $(call gb_Module_add_check_targets,cppuhelper,\

6
cppuhelper/ZipPackage_cppuhelper_odk_headers.mk → cppuhelper/Package_cppuhelper_odk_headers.mk
View File

@@ -25,9 +25,11 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above. # 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/cppuhelperdllapi.h \
cppuhelper/access_control.hxx \ cppuhelper/access_control.hxx \
cppuhelper/basemutex.hxx \ cppuhelper/basemutex.hxx \

2
sal/CustomTarget_sal_allheaders.mk
View File

@@ -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 # 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 \ $(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 \ $(SRCDIR)/sal/Package_inc.mk \
| $(sal_allheaders_DIR)/.dir | $(sal_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)

4
sal/Module_sal.mk
View File

@@ -41,8 +41,8 @@ $(eval $(call gb_Module_add_targets,sal,\
Library_uwinapi) \ Library_uwinapi) \
Package_inc \ Package_inc \
StaticLibrary_salcpprt \ StaticLibrary_salcpprt \
ZipPackage_sal_generated \ Package_sal_generated \
ZipPackage_sal_odk_headers \ Package_sal_odk_headers \
)) ))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))

6
sal/ZipPackage_sal_generated.mk → sal/Package_sal_generated.mk
View File

@@ -25,8 +25,10 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above. # 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: # vim: set noet sw=4 ts=4:

14
sal/ZipPackage_sal_odk_headers.mk → sal/Package_sal_odk_headers.mk
View File

@@ -7,9 +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_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/alloca.h \
sal/ByteBufferWrapper.hxx \ sal/ByteBufferWrapper.hxx \
sal/config.h \ sal/config.h \
@@ -21,11 +23,11 @@ $(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/sal,include/sal,\
sal/types.h \ 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 \ 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/allocator.hxx \
rtl/alloc.h \ rtl/alloc.h \
rtl/bootstrap.h \ rtl/bootstrap.h \
@@ -65,7 +67,7 @@ $(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/rtl,include/rtl,\
rtl/uuid.h \ 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.h \
osl/conditn.hxx \ osl/conditn.hxx \
osl/diagnose.h \ osl/diagnose.h \
@@ -100,7 +102,7 @@ $(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/osl,include/osl,\
osl/util.h \ 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 \ systools/win32/snprintf.h \
)) ))

2
salhelper/CustomTarget_salhelper_allheaders.mk
View File

@@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,salhelper/allheaders) : \
# updated whenever a new public header is added # updated whenever a new public header is added
$(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \ $(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \
$(SRCDIR)/salhelper/CustomTarget_salhelper_allheaders.mk \ $(SRCDIR)/salhelper/CustomTarget_salhelper_allheaders.mk \
$(SRCDIR)/salhelper/ZipPackage_salhelper_odk_headers.mk \ $(SRCDIR)/salhelper/Package_salhelper_odk_headers.mk \
| $(salhelper_allheaders_DIR)/.dir | $(salhelper_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
printf '// Generated list of all salhelper/ includes\n' > $@ printf '// Generated list of all salhelper/ includes\n' > $@

2
salhelper/Module_salhelper.mk
View File

@@ -30,7 +30,7 @@ $(eval $(call gb_Module_Module,salhelper))
$(eval $(call gb_Module_add_targets,salhelper,\ $(eval $(call gb_Module_add_targets,salhelper,\
CustomTarget_salhelper_allheaders \ CustomTarget_salhelper_allheaders \
Library_salhelper \ Library_salhelper \
ZipPackage_salhelper_odk_headers \ Package_salhelper_odk_headers \
)) ))
$(eval $(call gb_Module_add_check_targets,salhelper,\ $(eval $(call gb_Module_add_check_targets,salhelper,\

6
salhelper/ZipPackage_salhelper_odk_headers.mk → salhelper/Package_salhelper_odk_headers.mk
View File

@@ -25,9 +25,11 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above. # 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 \ salhelperdllapi.h \
condition.hxx \ condition.hxx \
dynload.hxx \ dynload.hxx \

30
scp2/source/sdkoo/sdkoo.scp
View File

@@ -147,37 +147,37 @@ End
File gid_File_Zip_Odkheaders_sal_generated File gid_File_Zip_Odkheaders_sal_generated
TXT_FILE_BODY; TXT_FILE_BODY;
Dir = gid_Dir_Basis_Sdk; Dir = FILELIST_SDK_DIR;
Name = "sal_generated.zip"; Name = "sal_generated.filelist";
Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End End
File gid_File_Zip_Odkheaders_sal File gid_File_Zip_Odkheaders_sal
TXT_FILE_BODY; TXT_FILE_BODY;
Dir = gid_Dir_Basis_Sdk; Dir = FILELIST_SDK_DIR;
Name = "sal_odk_headers.zip"; Name = "sal_odk_headers.filelist";
Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End End
File gid_File_Zip_Odkheaders_salhelper File gid_File_Zip_Odkheaders_salhelper
TXT_FILE_BODY; TXT_FILE_BODY;
Dir = gid_Dir_Basis_Sdk; Dir = FILELIST_SDK_DIR;
Name = "salhelper_odk_headers.zip"; Name = "salhelper_odk_headers.filelist";
Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End End
File gid_File_Zip_Odkheaders_cppu File gid_File_Zip_Odkheaders_cppu
TXT_FILE_BODY; TXT_FILE_BODY;
Dir = gid_Dir_Basis_Sdk; Dir = FILELIST_SDK_DIR;
Name = "cppu_odk_headers.zip"; Name = "cppu_odk_headers.filelist";
Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End End
File gid_File_Zip_Odkheaders_cppuhelper File gid_File_Zip_Odkheaders_cppuhelper
TXT_FILE_BODY; TXT_FILE_BODY;
Dir = gid_Dir_Basis_Sdk; Dir = FILELIST_SDK_DIR;
Name = "cppuhelper_odk_headers.zip"; Name = "cppuhelper_odk_headers.filelist";
Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End End
#if (!defined(WNT) && !defined( MACOSX) ) #if (!defined(WNT) && !defined( MACOSX) )

1
solenv/gbuild/TargetLocations.mk
View File

@@ -235,7 +235,6 @@ gb_XcuMergeTarget_get_target = $(WORKDIR)/XcuMergeTarget/$(1)
gb_XcuResTarget_get_target = $(WORKDIR)/XcuResTarget/$(1) gb_XcuResTarget_get_target = $(WORKDIR)/XcuResTarget/$(1)
gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip
gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done
gb_ZipPackage_get_target = $(WORKDIR)/ZipPackage/$(1)
gb_Library__get_final_target = $(WORKDIR)/Dummy/$(1) gb_Library__get_final_target = $(WORKDIR)/Dummy/$(1)

47
solenv/gbuild/ZipPackage.mk
View File

@@ -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:

1
solenv/gbuild/gbuild.mk
View File

@@ -331,7 +331,6 @@ include $(foreach class, \
CliNativeLibrary \ CliNativeLibrary \
CliUnoApi \ CliUnoApi \
Zip \ Zip \
ZipPackage \
AllLangPackage \ AllLangPackage \
Configuration \ Configuration \
HelpTarget \ HelpTarget \