Makefile.in | 2 Repository.mk | 41 ++++++--------- cli_ure/Library_cli_uno.mk | 2 jvmfwk/Module_jvmfwk.mk | 2 scp2/AutoInstall.mk | 24 ++++++++ scp2/AutoInstallLibs.mk | 24 -------- scp2/Module_scp2.mk | 2 scp2/inc/macros.inc | 8 ++ scp2/source/base/module_base.scp | 4 - scp2/source/gnome/module_gnome.scp | 4 - scp2/source/graphicfilter/module_graphicfilter.scp | 4 - scp2/source/impress/module_impress.scp | 4 - scp2/source/kde/module_kde.scp | 4 - scp2/source/math/module_math.scp | 4 - scp2/source/onlineupdate/module_onlineupdate.scp | 4 - scp2/source/ooo/module_hidden_ooo.scp | 4 - scp2/source/ooo/ure.scp | 35 +----------- scp2/source/tde/module_tde.scp | 4 - scp2/source/writer/module_writer.scp | 4 - solenv/gbuild/AllLangResTarget.mk | 16 +---- solenv/gbuild/AutoInstall.mk | 55 ++++++++++++++++++++ solenv/gbuild/AutoInstallLibs.mk | 51 ------------------ solenv/gbuild/CliNativeLibrary.mk | 2 solenv/gbuild/Helper.mk | 11 ++-- solenv/gbuild/InstallModuleTarget.mk | 2 solenv/gbuild/Library.mk | 1 solenv/gbuild/LinkTarget.mk | 57 ++++++--------------- solenv/gbuild/TargetLocations.mk | 16 +---- solenv/gbuild/gbuild.mk | 2 29 files changed, 165 insertions(+), 228 deletions(-)
New commits: commit 7a878f9c5fde18e1e86ee0784d9a7f1252700e74 Author: Matúš Kukan <[email protected]> Date: Mon Jun 10 00:56:28 2013 +0200 gbuild: s/AutoInstallLibs/AutoInstall/g Change-Id: I582a841ea3b2a882cbdc1556058b007a8667024a diff --git a/Makefile.in b/Makefile.in index 0fde85c..7dde471 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,7 +100,7 @@ $(eval $(call gbuild_modules_rules,$(gbuild_modules))) gbuild_TARGETS := AllLangHelp \ AllLangPackage \ AllLangResTarget \ - AutoInstallLibs \ + AutoInstall \ CliLibrary \ CliNativeLibrary \ CliUnoApiTarget \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk new file mode 100644 index 0000000..a6dad3c --- /dev/null +++ b/scp2/AutoInstall.mk @@ -0,0 +1,24 @@ +# -*- 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/. +# + +$(eval $(call gb_AutoInstall_AutoInstall)) + +$(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE)) +$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/AutoInstallLibs.mk b/scp2/AutoInstallLibs.mk deleted file mode 100644 index 6363fb1..0000000 --- a/scp2/AutoInstallLibs.mk +++ /dev/null @@ -1,24 +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/. -# - -$(eval $(call gb_AutoInstallLibs_AutoInstallLibs)) - -$(eval $(call gb_AutoInstallLibs_add_module,base,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,gnome,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,graphicfilter,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,impress,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,kde,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,math,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,onlineupdate,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,ooo,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,tde,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstallLibs_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE)) -$(eval $(call gb_AutoInstallLibs_add_module,writer,LIBO_LIB_FILE)) - -# vim: set noet sw=4 ts=4: diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 695c88c..0712d4a4 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,scp2)) $(eval $(call gb_Module_add_targets,scp2,\ - AutoInstallLibs \ + AutoInstall \ CustomTarget_langmacros \ InstallModule_accessories \ InstallModule_base \ diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp index 9a1f22d..4dfd886 100644 --- a/scp2/source/base/module_base.scp +++ b/scp2/source/base/module_base.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/base" +#include "AutoInstall/base" Module gid_Module_Prg_Base MOD_NAME_DESC(MODULE_PRG_BASE); diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 262799d..2b45bb1 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/gnome" +#include "AutoInstall/gnome" Module gid_Module_Optional_Gnome ParentID = gid_Module_Optional; diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index 6c8b2e8..88ab156 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/graphicfilter" +#include "AutoInstall/graphicfilter" Module gid_Module_Optional_Grfflt PackageInfo = "packinfo_office.txt"; diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index 8201e9a..ebf90a2 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/impress" +#include "AutoInstall/impress" Module gid_Module_Prg_Impress MOD_NAME_DESC ( MODULE_PRG_IMPRESS ); diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp index 23b921e..c82a094 100644 --- a/scp2/source/kde/module_kde.scp +++ b/scp2/source/kde/module_kde.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/kde" +#include "AutoInstall/kde" Module gid_Module_Optional_Kde ParentID = gid_Module_Optional; diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp index b8427c9..0c01f98 100644 --- a/scp2/source/math/module_math.scp +++ b/scp2/source/math/module_math.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/math" +#include "AutoInstall/math" Module gid_Module_Prg_Math MOD_NAME_DESC ( MODULE_PRG_MATH ); diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp index 4fdb0b3..ecd0cda 100644 --- a/scp2/source/onlineupdate/module_onlineupdate.scp +++ b/scp2/source/onlineupdate/module_onlineupdate.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/onlineupdate" +#include "AutoInstall/onlineupdate" Module gid_Module_Optional_Onlineupdate PackageInfo = "packinfo_office.txt"; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index b5452d3..d8a0a5f 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -17,7 +17,7 @@ */ #include "macros.inc" -#include "AutoInstallLibs/ooo" +#include "AutoInstall/ooo" #ifdef AIX #ifndef SYSTEM_CURL diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 63c8e26..b2246e8 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/ure" +#include "AutoInstall/ure" Directory gid_Dir_Ure_Bin #if defined MACOSX diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp index 2f4523d..03138fe 100644 --- a/scp2/source/tde/module_tde.scp +++ b/scp2/source/tde/module_tde.scp @@ -11,7 +11,7 @@ #include "macros.inc" -#include "AutoInstallLibs/tde" +#include "AutoInstall/tde" Module gid_Module_Optional_Tde ParentID = gid_Module_Optional; diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index b0a2bc9..c141fa1 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#include "AutoInstallLibs/writer" +#include "AutoInstall/writer" Module gid_Module_Prg_Wrt MOD_NAME_DESC(MODULE_PRG_WRT); diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk new file mode 100644 index 0000000..518d06e --- /dev/null +++ b/solenv/gbuild/AutoInstall.mk @@ -0,0 +1,55 @@ +# -*- 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/. +# + +# AutoInstall class + +$(dir $(call gb_AutoInstall_get_target,%)).dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(call gb_AutoInstall_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoInstall.mk + $(call gb_Output_announce,$*,$(true),AIN,3) + echo "/* autogenerated installs for group $* */" > $@ + echo "#define auto_$*_ALL \ " >> $@ + $(foreach lib,$(gb_Library_MODULE_$*),\ + echo " auto_$*_lib_$(lib), \ " >> $@;) + $(foreach exe,$(gb_Executable_MODULE_$*),\ + echo " auto_$*_exe_$(exe), \ " >> $@;) + echo "" >> $@ + $(foreach lib,$(gb_Library_MODULE_$*),\ + echo "$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;) + $(foreach exe,$(gb_Executable_MODULE_$*),\ + echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(exe),$(exe)$(gb_Executable_EXT))" >> $@;) + + +$(call gb_AutoInstall_get_clean_target,%) : + $(call gb_Output_announce,$*,$(false),AIL,3) + rm -f $(call gb_AutoInstall_get_target,$*) + +define gb_AutoInstall_AutoInstall +$(call gb_AutoInstall_get_target,all) :| $(dir $(call gb_AutoInstall_get_target,all)).dir + +$$(eval $$(call gb_Module_register_target,$(call gb_AutoInstall_get_target,all),$(call gb_AutoInstall_get_clean_target,all))) +$(call gb_Helper_make_userfriendly_targets,all,AutoInstall) + +endef + +# gb_AutoInstall_add_module module lib_template optional:exe_template +define gb_AutoInstall_add_module +$(call gb_AutoInstall_get_target,all) : $(call gb_AutoInstall_get_target,$(1)) +$(call gb_AutoInstall_get_clean_target,all) : $(call gb_AutoInstall_get_clean_target,$(1)) +$(call gb_Helper_make_userfriendly_targets,$(1),AutoInstall) + +$(call gb_AutoInstall_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE) +$(call gb_AutoInstall_get_target,$(1)) :| $(dir $(call gb_AutoInstall_get_target,$(1))).dir +$(call gb_AutoInstall_get_target,$(1)) : SCP2LIBTEMPLATE := $(2) +$(call gb_AutoInstall_get_target,$(1)) : SCP2EXETEMPLATE := $(3) + +endef + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk deleted file mode 100644 index aeb7c94..0000000 --- a/solenv/gbuild/AutoInstallLibs.mk +++ /dev/null @@ -1,55 +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/. -# - -# AutoInstallLibs class - -$(dir $(call gb_AutoInstallLibs_get_target,%)).dir : - $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) - -$(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoInstallLibs.mk - $(call gb_Output_announce,$*,$(true),AIN,3) - echo "/* autogenerated installs for group $* */" > $@ - echo "#define auto_$*_ALL \ " >> $@ - $(foreach lib,$(gb_Library_MODULE_$*),\ - echo " auto_$*_lib_$(lib), \ " >> $@;) - $(foreach exe,$(gb_Executable_MODULE_$*),\ - echo " auto_$*_exe_$(exe), \ " >> $@;) - echo "" >> $@ - $(foreach lib,$(gb_Library_MODULE_$*),\ - echo "$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;) - $(foreach exe,$(gb_Executable_MODULE_$*),\ - echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(exe),$(exe)$(gb_Executable_EXT))" >> $@;) - - -$(call gb_AutoInstallLibs_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),AIL,3) - rm -f $(call gb_AutoInstallLibs_get_target,$*) - -define gb_AutoInstallLibs_AutoInstallLibs -$(call gb_AutoInstallLibs_get_target,all) :| $(dir $(call gb_AutoInstallLibs_get_target,all)).dir - -$$(eval $$(call gb_Module_register_target,$(call gb_AutoInstallLibs_get_target,all),$(call gb_AutoInstallLibs_get_clean_target,all))) -$(call gb_Helper_make_userfriendly_targets,all,AutoInstallLibs) - -endef - -# gb_AutoInstallLibs_add_module module lib_template optional:exe_template -define gb_AutoInstallLibs_add_module -$(call gb_AutoInstallLibs_get_target,all) : $(call gb_AutoInstallLibs_get_target,$(1)) -$(call gb_AutoInstallLibs_get_clean_target,all) : $(call gb_AutoInstallLibs_get_clean_target,$(1)) -$(call gb_Helper_make_userfriendly_targets,$(1),AutoInstallLibs) - -$(call gb_AutoInstallLibs_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE) -$(call gb_AutoInstallLibs_get_target,$(1)) :| $(dir $(call gb_AutoInstallLibs_get_target,$(1))).dir -$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2LIBTEMPLATE := $(2) -$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2EXETEMPLATE := $(3) - -endef - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 0ef0780..d4cf4c9 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -256,7 +256,7 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ endef define gb_InstallModuleTarget_use_auto_install_libs -$(call gb_InstallModuleTarget_get_external_target,$(1)) : $(call gb_AutoInstallLibs_get_target,$(2)) +$(call gb_InstallModuleTarget_get_external_target,$(1)) : $(call gb_AutoInstall_get_target,$(2)) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 72c2fa1..e87efe3 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -63,7 +63,7 @@ endef # workdir target patterns -gb_AutoInstallLibs_get_target = $(WORKDIR)/AutoInstallLibs/$(1) +gb_AutoInstall_get_target = $(WORKDIR)/AutoInstall/$(1) gb_AllLangHelp_get_target = $(WORKDIR)/AllLangHelp/$(1) gb_AllLangPackage_get_target = $(WORKDIR)/AllLangPackage/$(1) gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1) @@ -233,7 +233,7 @@ $(WORKDIR)/Headers/StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1)) endef $(eval $(call gb_Helper_make_clean_targets,\ - AutoInstallLibs \ + AutoInstall \ AllLangHelp \ AllLangPackage \ AllLangResTarget \ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 4b65f0e..47d6e6e 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -336,7 +336,7 @@ include $(foreach class, \ InstallModuleTarget \ InstallModule \ InstallScript \ - AutoInstallLibs \ + AutoInstall \ PackageSet \ GeneratedPackage \ ,$(GBUILDDIR)/$(class).mk) commit 74f5df9bacf50464affdf48c0ea0fbfa01f28728 Author: Matúš Kukan <[email protected]> Date: Mon Jun 10 00:48:31 2013 +0200 gbuild: rework AutoInstallLibs and autoinstall ure executables Change-Id: I7312d94f90758d450a69410819c5e8c142756a47 diff --git a/Repository.mk b/Repository.mk index 748fb61..42363d1 100644 --- a/Repository.mk +++ b/Repository.mk @@ -151,22 +151,15 @@ endif endif -ifneq ($(OS),IOS) - -$(eval $(call gb_Helper_register_executables,UREBIN,\ +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +$(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ regmerge \ regview \ - uno \ + $(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS))),javaldx) \ )) - -endif - -ifneq ($(OS),MACOSX) - $(eval $(call gb_Helper_register_executables,UREBIN,\ - javaldx \ + uno \ )) - endif ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES) @@ -203,35 +196,35 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ endif -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,BASE, \ +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \ abp \ dbp \ dbu \ )) -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \ +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \ svgfilter \ flash \ wpftdraw \ graphicfilter \ )) -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \ +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,tde, \ $(if $(ENABLE_TDE),tdebe1) \ )) -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,IMPRESS, \ +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \ animcore \ placeware \ PresenterScreen \ )) -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ONLINEUPDATE, \ +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \ updatecheckui \ updchk \ )) -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \ +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \ $(if $(ENABLE_EVOAB2),evoab) \ $(if $(ENABLE_GTK),vclplug_gtk) \ $(if $(ENABLE_GTK3),vclplug_gtk3) \ @@ -242,17 +235,17 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \ $(if $(ENABLE_GNOMEVFS),ucpgvfs1) \ )) -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \ +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \ $(if $(ENABLE_KDE),kdebe1) \ $(if $(ENABLE_KDE4),kde4be1) \ )) -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,MATH, \ +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \ sm \ smd \ )) -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ avmedia \ $(if $(DISABLE_SCRIPTING),,basctl) \ basegfx \ @@ -376,7 +369,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ xsltfilter \ )) -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \ +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \ hwp \ $(if $(ENABLE_LWP),lwpft) \ msword \ @@ -458,7 +451,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ unotest \ )) -$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \ +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ affine_uno \ $(if $(SOLAR_JAVA),java_uno) \ $(if $(SOLAR_JAVA),juh) \ @@ -477,7 +470,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \ $(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \ )) -$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,URE, \ +$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,ure, \ acceptor \ binaryurp \ bootstrap \ @@ -505,7 +498,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ $(if $(filter WNT,$(OS)),jpipx) \ )) -$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,OOO, \ +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ comphelper \ deployment \ fileacc \ diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk index dbd8d2b..75fdc3f 100644 --- a/jvmfwk/Module_jvmfwk.mk +++ b/jvmfwk/Module_jvmfwk.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Module_add_targets,jvmfwk,\ Package_jreproperties \ )) -ifneq ($(OS),MACOSX) +ifneq (,$(filter-out MACOSX WNT,$(OS))) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,jvmfwk,\ Executable_javaldx \ diff --git a/scp2/AutoInstallLibs.mk b/scp2/AutoInstallLibs.mk index 7fc4878..6363fb1 100644 --- a/scp2/AutoInstallLibs.mk +++ b/scp2/AutoInstallLibs.mk @@ -9,16 +9,16 @@ $(eval $(call gb_AutoInstallLibs_AutoInstallLibs)) -$(eval $(call gb_AutoInstallLibs_add_category,base,BASE,LIBO_LIB_FILE,auto_Base_Lib)) -$(eval $(call gb_AutoInstallLibs_add_category,gnome,GNOME,LIBO_LIB_FILE,auto_Gnome_Lib)) -$(eval $(call gb_AutoInstallLibs_add_category,graphicfilter,GRAPHICFILTER,LIBO_LIB_FILE,auto_Graphicfilter_Lib)) -$(eval $(call gb_AutoInstallLibs_add_category,impress,IMPRESS,LIBO_LIB_FILE,auto_Impress_Lib)) -$(eval $(call gb_AutoInstallLibs_add_category,kde,KDE,LIBO_LIB_FILE,auto_Kde_Lib)) -$(eval $(call gb_AutoInstallLibs_add_category,math,MATH,LIBO_LIB_FILE,auto_Math_Lib)) -$(eval $(call gb_AutoInstallLibs_add_category,onlineupdate,ONLINEUPDATE,LIBO_LIB_FILE,auto_Onlineupdate_Lib)) -$(eval $(call gb_AutoInstallLibs_add_category,ooo,OOO,LIBO_LIB_FILE,auto_File_Lib)) -$(eval $(call gb_AutoInstallLibs_add_category,tde,TDE,LIBO_LIB_FILE,auto_Tde_Lib)) -$(eval $(call gb_AutoInstallLibs_add_category,ure,URE,URE_PRIVATE_LIB,auto_Ure_Private_Lib)) -$(eval $(call gb_AutoInstallLibs_add_category,writer,WRITER,LIBO_LIB_FILE,auto_Writer_Lib)) +$(eval $(call gb_AutoInstallLibs_add_module,base,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstallLibs_add_module,gnome,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstallLibs_add_module,graphicfilter,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstallLibs_add_module,impress,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstallLibs_add_module,kde,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstallLibs_add_module,math,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstallLibs_add_module,onlineupdate,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstallLibs_add_module,ooo,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstallLibs_add_module,tde,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstallLibs_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE)) +$(eval $(call gb_AutoInstallLibs_add_module,writer,LIBO_LIB_FILE)) # vim: set noet sw=4 ts=4: diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 871ed53..99f0d98 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -445,6 +445,14 @@ End Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \ End +#define URE_EXECUTABLE(id,name) \ + File id \ + BIN_FILE_BODY; \ + Dir = gid_Dir_Ure_Bin; \ + Name = name; \ + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \ + End + #define GALLERY_NAME(id) \ #define GALLERY_FILELIST(id) \ diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp index 615cbdd..9a1f22d 100644 --- a/scp2/source/base/module_base.scp +++ b/scp2/source/base/module_base.scp @@ -35,7 +35,7 @@ Module gid_Module_Prg_Base_Bin Minimal = NO; Default = YES; Styles = (HIDDEN_ROOT); - Files = (auto_Base_Lib_ALL + Files = (auto_base_ALL gid_File_Share_Registry_Base_Xcd ); End diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index f66178d..262799d 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -29,7 +29,7 @@ Module gid_Module_Optional_Gnome #ifdef ENABLE_GNOMEVFS XpdCheckSolaris = "SUNWgnome-vfs"; #endif - Files = (auto_Gnome_Lib_ALL + Files = (auto_gnome_ALL #if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO gid_File_Share_Registry_Gnome_Xcd, #endif diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index 556161e..6c8b2e8 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -26,6 +26,6 @@ Module gid_Module_Optional_Grfflt Sortkey = "600"; ParentID = gid_Module_Optional; Default = YES; - Files = (auto_Graphicfilter_Lib_ALL + Files = (auto_graphicfilter_ALL gid_File_Share_Registry_Graphicfilter_Xcd); End diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index 1dac3a0..8201e9a 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -35,7 +35,7 @@ Module gid_Module_Prg_Impress_Bin Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); - Files = (auto_Impress_Lib_ALL + Files = (auto_impress_ALL gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress, gid_File_Share_Registry_Impress_Xcd, gid_File_sd_xml, diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp index 8e8012f..23b921e 100644 --- a/scp2/source/kde/module_kde.scp +++ b/scp2/source/kde/module_kde.scp @@ -26,6 +26,6 @@ Module gid_Module_Optional_Kde PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_KDE); Styles = (); - Files = (auto_Kde_Lib_ALL + Files = (auto_kde_ALL ); End diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp index aec363a..b8427c9 100644 --- a/scp2/source/math/module_math.scp +++ b/scp2/source/math/module_math.scp @@ -35,7 +35,7 @@ Module gid_Module_Prg_Math_Bin Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); - Files = (auto_Math_Lib_ALL + Files = (auto_math_ALL gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math, gid_File_Share_Registry_Math_Xcd, gid_File_Tmp_Userinstall_Math_Inf); diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp index 6c86444..4fdb0b3 100644 --- a/scp2/source/onlineupdate/module_onlineupdate.scp +++ b/scp2/source/onlineupdate/module_onlineupdate.scp @@ -27,7 +27,7 @@ Module gid_Module_Optional_Onlineupdate ParentID = gid_Module_Optional; Default = YES; Styles = (); - Files = (auto_Onlineupdate_Lib_ALL + Files = (auto_onlineupdate_ALL gid_File_Bin_UnpackUpdate, gid_File_Share_Registry_Onlineupdate_Xcd); End diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index cf10632..b5452d3 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -143,7 +143,7 @@ Module gid_Module_Root_Files_4 Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Dat_Root4, - auto_File_Lib_ALL + auto_ooo_ALL gid_File_Lib_Bib, gid_File_Lib_J, gid_File_Lib_Oox, diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index d127ab6..63c8e26 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -84,32 +84,6 @@ Shortcut gid_Shortcut_Exe_Uno End #endif -File gid_File_Exe_Regmerge - BIN_FILE_BODY; - Dir = gid_Dir_Ure_Bin; - Name = EXENAME(regmerge); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "881BCC1D-BA4A-4527-9C7D-D89157C2D03B"; -End - -File gid_File_Exe_Regview - BIN_FILE_BODY; - Dir = gid_Dir_Ure_Bin; - Name = EXENAME(regview); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "DAB09DCD-8491-4DC8-B153-2BA81A830AC2"; -End - -#if !defined MACOSX && !defined WNT && defined SOLAR_JAVA -File gid_File_Exe_Javaldx - BIN_FILE_BODY; - Dir = gid_Dir_Ure_Bin; - Name = EXENAME(javaldx); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "291B5981-3E41-40E2-9C3F-115A7DF1C6A1"; -End -#endif - // Private Executables: #if !defined WNT @@ -643,13 +617,11 @@ Module gid_Module_Root_Ure_Hidden gid_Dir_Ure_Share, gid_Dir_Ure_Java, gid_Dir_Ure_Misc); - Files = (gid_File_ThirdpartylicensereadmeHtml_Ure, + Files = (auto_ure_ALL + gid_File_ThirdpartylicensereadmeHtml_Ure, gid_File_Readme_Ure, gid_File_License_Ure, gid_File_Exe_Uno, - gid_File_Exe_Regmerge, - gid_File_Exe_Regview, - gid_File_Exe_Javaldx, gid_File_Exe_StartupSh, gid_File_Exe_UnoBin, gid_File_Dl_Cli_Uno, @@ -684,7 +656,6 @@ Module gid_Module_Root_Ure_Hidden gid_Unixlink_File_Dl_Store, gid_Unixlink_File_Dl_Jvmaccess, gid_Unixlink_File_Dl_Jvmfwk, - auto_Ure_Private_Lib_ALL gid_File_Dl_JrepropertiesClass, gid_File_Dl_Profile_Jvmfwk3rc, gid_File_Dl_Jpipe, diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp index 89f2462..2f4523d 100644 --- a/scp2/source/tde/module_tde.scp +++ b/scp2/source/tde/module_tde.scp @@ -19,7 +19,7 @@ Module gid_Module_Optional_Tde PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_TDE); Styles = (); - Files = (auto_Tde_Lib_ALL + Files = (auto_tde_ALL ); End diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index 6628e86..b0a2bc9 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -37,7 +37,7 @@ Module gid_Module_Prg_Wrt_Bin Styles = (HIDDEN_ROOT); Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel, gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard, - auto_Writer_Lib_ALL + auto_writer_ALL gid_File_Lib_Vbaswobj, gid_File_Jar_Email, gid_File_Jar_Mail, diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk index ab520d6..aeb7c94 100644 --- a/solenv/gbuild/AutoInstallLibs.mk +++ b/solenv/gbuild/AutoInstallLibs.mk @@ -12,15 +12,19 @@ $(dir $(call gb_AutoInstallLibs_get_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) -$(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk - $(call gb_Output_announce,$*,$(true),AIL,3) - echo "/* autogenerated library installs for group $(INSTALLMODULE) */" > $@ - echo "#define $(SCP2ID)_ALL \ " >> $@ - $(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\ - echo " $(SCP2ID)_$(lib), \ " >> $@;) +$(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoInstallLibs.mk + $(call gb_Output_announce,$*,$(true),AIN,3) + echo "/* autogenerated installs for group $* */" > $@ + echo "#define auto_$*_ALL \ " >> $@ + $(foreach lib,$(gb_Library_MODULE_$*),\ + echo " auto_$*_lib_$(lib), \ " >> $@;) + $(foreach exe,$(gb_Executable_MODULE_$*),\ + echo " auto_$*_exe_$(exe), \ " >> $@;) echo "" >> $@ - $(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\ - echo "$(SCP2TEMPLATE)($(SCP2ID)_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;) + $(foreach lib,$(gb_Library_MODULE_$*),\ + echo "$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;) + $(foreach exe,$(gb_Executable_MODULE_$*),\ + echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(exe),$(exe)$(gb_Executable_EXT))" >> $@;) $(call gb_AutoInstallLibs_get_clean_target,%) : @@ -35,16 +39,16 @@ $(call gb_Helper_make_userfriendly_targets,all,AutoInstallLibs) endef -define gb_AutoInstallLibs_add_category +# gb_AutoInstallLibs_add_module module lib_template optional:exe_template +define gb_AutoInstallLibs_add_module $(call gb_AutoInstallLibs_get_target,all) : $(call gb_AutoInstallLibs_get_target,$(1)) $(call gb_AutoInstallLibs_get_clean_target,all) : $(call gb_AutoInstallLibs_get_clean_target,$(1)) $(call gb_Helper_make_userfriendly_targets,$(1),AutoInstallLibs) $(call gb_AutoInstallLibs_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE) $(call gb_AutoInstallLibs_get_target,$(1)) :| $(dir $(call gb_AutoInstallLibs_get_target,$(1))).dir -$(call gb_AutoInstallLibs_get_target,$(1)) : INSTALLMODULE = $(2) -$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2TEMPLATE = $(3) -$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2ID = $(4) +$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2LIBTEMPLATE := $(2) +$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2EXETEMPLATE := $(3) endef diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index d6af980..cb51f50 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -109,7 +109,6 @@ endef define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS -gb_Library_VALIDINSTALLMODULES := BASE ONLINEUPDATE GRAPHICFILTER GNOME TDE IMPRESS KDE MATH OOO URE WRITER gb_Jar_VALIDGROUPS := URE OOO OXT NONE $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=)) @@ -148,6 +147,13 @@ gb_Executable_$(1) += $(2) endef +define gb_Helper_register_executables_for_install +$(call gb_Helper_register_executables,$(1),$(3)) + +gb_Executable_MODULE_$(2) += $(3) + +endef + define gb_Helper_register_libraries ifeq ($$(filter $(1),$$(gb_Library_VALIDGROUPS)),) $$(eval $$(call gb_Output_error,$(1) is not a valid group for libraries. Valid groups are: $$(gb_Library_VALIDGROUPS))) @@ -166,9 +172,6 @@ endef # the first argument is the group, which sets rpaths etc. # the second argument is the install module, which describes in which distro package/msi a lib should show up define gb_Helper_register_libraries_for_install -ifeq ($$(filter $(2),$$(gb_Library_VALIDINSTALLMODULES)),) -$$(eval $$(call gb_Output_error,$(2) is not a valid install module for libraries. Valid groups are: $$(gb_Library_VALIDINSTALLMODULES))) -endif $(call gb_Helper_register_libraries,$(1),$(3)) gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS) $(gb_URELIBS),$(3)) commit 6b408d1cc20a340a501e81d02dacbd301fb4360f Author: Matúš Kukan <[email protected]> Date: Fri Jun 7 23:22:16 2013 +0200 gbuild: remove external_headers targets gb_LinkTarget__add_internal_headers was used only for sdi headers now anyway, hopefully for no good reason. One headers target is enough for all. Change-Id: Ia01fb7a0aac7f72915448424b3393ecd9ba0f8f5 diff --git a/cli_ure/Library_cli_uno.mk b/cli_ure/Library_cli_uno.mk index 01d7519..a215e9f 100644 --- a/cli_ure/Library_cli_uno.mk +++ b/cli_ure/Library_cli_uno.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Library_add_exception_objects,cli_uno,\ cli_ure/source/uno_bridge/cli_uno \ )) -$(call gb_Library_get_external_headers_target,cli_uno) :| \ +$(call gb_Library_get_headers_target,cli_uno) :| \ $(call gb_CliLibrary_get_target,cli_ure) \ $(call gb_CliUnoApi_get_target,cli_uretypes) diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 2a52aeb..9b7afbf 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -233,7 +233,7 @@ $(call gb_Helper_abbreviate_dirs,\ endef endif -$(call gb_SrsTarget_get_external_headers_target,%) : +$(call gb_SrsTarget_get_headers_target,%) : $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && touch $@) @@ -285,7 +285,7 @@ $(call gb_SrsTarget_get_dep_target,$(1)) : $(call gb_SrsPartTarget_get_dep_targe endif $(call gb_SrsPartTarget_SrsPartTarget,$(2),$(3)) $(call gb_SrsTarget_get_target,$(1)) : $(call gb_SrsPartTarget_get_target,$(2)) -$(call gb_SrsPartTarget_get_target,$(2)) :| $(call gb_SrsTarget_get_external_headers_target,$(1)) +$(call gb_SrsPartTarget_get_target,$(2)) :| $(call gb_SrsTarget_get_headers_target,$(1)) $(call gb_SrsPartTarget_get_target,$(2)) :| $(call gb_SrsTemplateTarget_get_target,$(1)) $(call gb_SrsTarget_get_clean_target,$(1)) : PARTS += $(2) $(call gb_SrsTarget_get_target,$(1)) : PARTS += $(2) @@ -333,21 +333,11 @@ $(foreach template,$(2),$(call gb_SrsTarget_add_template,$(1),$(template))) endef -define gb_SrsTarget_use_package -$(call gb_SrsTarget_get_external_headers_target,$(1)) : $(call gb_Package_get_target,$(2)) - -endef - -define gb_SrsTarget_use_packages -$(foreach package,$(2),$(call gb_SrsTarget_use_package,$(1),$(package))) - -endef - # Use templates built by another SrsTarget. # # gb_SrsTarget_use_srstarget srs other-srs define gb_SrsTarget_use_srstarget -$(call gb_SrsTarget_get_external_headers_target,$(1)) : $(call gb_SrsTemplateTarget_get_target,$(2)) +$(call gb_SrsTarget_get_headers_target,$(1)) : $(call gb_SrsTemplateTarget_get_target,$(2)) endef diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk index ecf8fea5..b014a18 100644 --- a/solenv/gbuild/CliNativeLibrary.mk +++ b/solenv/gbuild/CliNativeLibrary.mk @@ -55,7 +55,7 @@ endef define gb_CliNativeLibraryTarget_wrap_library $(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_LIBRARY := $(call gb_CliNativeLibraryTarget__get_library,$(2)) $(call gb_CliNativeLibraryTarget_get_target,$(1)) : $(call gb_Library_get_target,$(2)) -$(call gb_Library_get_external_headers_target,$(2)) : $(call gb_CliNativeLibraryTarget_get_external_target,$(1)) +$(call gb_Library_get_headers_target,$(2)) : $(call gb_CliNativeLibraryTarget_get_external_target,$(1)) endef diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 7b328bd..f7a05b0 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -247,7 +247,6 @@ $(eval $(foreach method,\ use_externals \ add_custom_headers \ use_custom_headers \ - add_external_headers \ use_package \ use_packages \ use_unpacked \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 418b43f..ef79709 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -59,11 +59,9 @@ gb_LinkTarget__get_ldflags=$(if $(LDFLAGS),$(LDFLAGS),$(call gb_LinkTarget__get_ # LinkTarget/headers # LinkTarget/dep joined dep file AsmObject/dep CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep ObjCxxObject/dep # | LinkTarget/headers -# LinkTarget/headers all headers available LinkTarget/external_headers -# including own generated own generated headers +# LinkTarget/headers all headers available +# including own generated # PCH precompiled headers LinkTarget/headers -# LinkTarget/external_headers all external headers avail. header files of linked libs -# # CObject plain c compile | LinkTarget/headers # CxxObject c++ compile | LinkTarget/headers PCH # GenCObject plain c compile from | LinkTarget/headers @@ -391,7 +389,6 @@ $(call gb_LinkTarget_get_clean_target,%) : $(call gb_LinkTarget_get_target,$*) \ $(call gb_LinkTarget_get_dep_target,$*) \ $(call gb_LinkTarget_get_headers_target,$*) \ - $(call gb_LinkTarget_get_external_headers_target,$*) \ $(call gb_LinkTarget_get_objects_list,$*) \ $(call gb_LinkTarget_get_target,$*).exports \ $(DLLTARGET) \ @@ -466,7 +463,7 @@ endif # old build.pl/dmake system. Once all is migrated, gbuild should error out # when is is told to depend on a linktarget it does not know about and not # only warn. -define gb_LinkTarget__get_external_headers_check +define gb_LinkTarget__get_headers_check ifneq ($$(SELF),$$*) $$(eval $$(call gb_Output_info,LinkTarget $$* not defined: Assuming headers to be there!,ALL)) endif @@ -474,23 +471,16 @@ $$@ : COMMAND := $$(call gb_Helper_abbreviate_dirs, mkdir -p $$(dir $$@) && touc endef -$(call gb_LinkTarget_get_external_headers_target,%) : - $(eval $(gb_LinkTarget__get_external_headers_check)) +$(call gb_LinkTarget_get_headers_target,%) : + $(eval $(gb_LinkTarget__get_headers_check)) $(COMMAND) -$(call gb_LinkTarget_get_headers_target,%) : $(call gb_LinkTarget_get_external_headers_target,%) - $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $@) && touch $@) - # Explanation of some of the targets: -# - gb_LinkTarget_get_external_headers_target is the targets that guarantees all -# headers from linked against libraries are in OUTDIR. # - gb_LinkTarget_get_headers_target is the target that guarantees all headers # from the linked against the libraries and the linktargets own headers # (including generated headers) are in the OUTDIR. # - gb_LinkTarget_get_target links the objects into a file in WORKDIR. -# gb_LinkTarget_get_target depends on gb_LinkTarget_get_headers_target which in -# turn depends gb_LinkTarget_get_external_headers_target. +# gb_LinkTarget_get_target depends on gb_LinkTarget_get_headers_target. # gb_LinkTarget_get_target depends additionally on the objects, which in turn # depend build-order only on the gb_LinkTarget_get_headers_target. The build # order-only dependency ensures all headers to be there for compiling and @@ -521,7 +511,7 @@ $(call gb_LinkTarget_get_headers_target,%) : $(call gb_LinkTarget_get_external_h # variables have a T_ prefix. define gb_LinkTarget_LinkTarget $(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS := -$(call gb_LinkTarget_get_external_headers_target,$(1)) : SELF := $(1) +$(call gb_LinkTarget_get_headers_target,$(1)) : SELF := $(1) $(call gb_LinkTarget_get_target,$(1)) : DLLTARGET := $(call gb_LinkTarget_get_clean_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : COBJECTS := @@ -758,7 +748,7 @@ $(call gb_LinkTarget_get_target,$(1)) : LIBS := $$(filter-out $$(gb_STDLIBS),$$( endef define gb_LinkTarget__use_api -$(call gb_LinkTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(2)) +$(call gb_LinkTarget_get_headers_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(2)) $(call gb_LinkTarget__add_include,$(1),$(call gb_UnoApiHeadersTarget_get_dir,$(2))) endef @@ -778,7 +768,7 @@ $(call gb_LinkTarget__use_api,$(1),offapi) endef define gb_LinkTarget__use_internal_api_one -$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ +$(call gb_LinkTarget_get_headers_target,$(1)) :| \ $(call gb_UnoApiHeadersTarget_get_$(3)target,$(2)) $(call gb_LinkTarget__add_include,$(1),$(call gb_UnoApiHeadersTarget_get_$(3)dir,$(2))) @@ -845,7 +835,7 @@ $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $(3) # for faster incremental builds when the ABI is unchanged $(call gb_LinkTarget_get_target,$(1)) : \ $(foreach lib,$(3),$(call gb_Library_get_exports_target,$(lib))) -$(call gb_LinkTarget_get_external_headers_target,$(1)) : \ +$(call gb_LinkTarget_get_headers_target,$(1)) : \ $(foreach lib,$(2),$(call gb_Library_get_headers_target,$(lib))) endef @@ -910,7 +900,7 @@ define gb_LinkTarget_use_static_libraries $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $$(if $$(filter-out StaticLibrary,$$(TARGETTYPE)),$(2)) $(call gb_LinkTarget_get_target,$(1)) : $(foreach lib,$(2),$(call gb_StaticLibrary_get_target,$(lib))) -$(call gb_LinkTarget_get_external_headers_target,$(1)) : \ +$(call gb_LinkTarget_get_headers_target,$(1)) : \ $(foreach lib,$(2),$(call gb_StaticLibrary_get_headers_target,$(lib))) endef @@ -1125,7 +1115,7 @@ $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Librar $$(eval $$(call gb_Output_error,Cannot import objects library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk)) endif $(call gb_LinkTarget__use_linktarget_objects,$(1),$(foreach lib,$(2),$(call gb_Library_get_linktargetname,$(lib)))) -$(call gb_LinkTarget_get_external_headers_target,$(1)) : \ +$(call gb_LinkTarget_get_headers_target,$(1)) : \ $(foreach lib,$(2),$(call gb_Library_get_headers_target,$(lib))) endef @@ -1245,19 +1235,13 @@ $(foreach aux,$(2),$(call gb_LinkTarget_add_auxtarget,$(1),$(aux))) endef -define gb_LinkTarget__add_internal_headers -$(call gb_LinkTarget_get_headers_target,$(1)) : $(2) -$(2) :| $(call gb_LinkTarget_get_external_headers_target,$(1)) - -endef - define gb_LinkTarget_add_custom_headers $$(call gb_Output_error,\ gb_LinkTarget_add_custom_headers: use gb_LinkTarget_use_custom_headers instead.) endef define gb_LinkTarget__use_custom_headers -$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ +$(call gb_LinkTarget_get_headers_target,$(1)) :| \ $(call gb_CustomTarget_get_target,$(2)) $(call gb_LinkTarget__add_include,$(1),$(call gb_CustomTarget_get_workdir,$(2))) @@ -1275,7 +1259,7 @@ endef # add SDI (svidl) headers define gb_LinkTarget_add_sdi_headers -$(call gb_LinkTarget__add_internal_headers,$(1),$(foreach sdi,$(2),$(call gb_SdiTarget_get_target,$(sdi)))) +$(call gb_LinkTarget_get_headers_target,$(1)) : $(foreach sdi,$(2),$(call gb_SdiTarget_get_target,$(sdi))) $(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach sdi,$(2),$(call gb_SdiTarget_get_clean_target,$(sdi))) endef @@ -1328,14 +1312,9 @@ $$(call gb_Output_error,\ gb_LinkTarget_add_precompiled_header: use gb_LinkTarget_set_precompiled_header instead.) endef -define gb_LinkTarget_add_external_headers -$$(call gb_Output_error,\ - gb_LinkTarget_add_external_headers: use gb_LinkTarget_use_package instead.) -endef - # use a header package, possibly from another module (i.e. via OUTDIR) define gb_LinkTarget_use_package -$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ +$(call gb_LinkTarget_get_headers_target,$(1)) :| \ $(call gb_Package_get_target,$(strip $(2))) endef @@ -1346,14 +1325,14 @@ endef # Use sources from unpacked tarball of an external project define gb_LinkTarget_use_unpacked -$(call gb_LinkTarget_get_external_headers_target,$(1)) :| $(call gb_UnpackedTarball_get_final_target,$(2)) +$(call gb_LinkTarget_get_headers_target,$(1)) :| $(call gb_UnpackedTarball_get_final_target,$(2)) endef # Use artifacts from ExternalProject (i. e. configure) of an external project # example in expat: StaticLibrary depends on ExternalProject outcome define gb_LinkTarget_use_external_project -$(call gb_LinkTarget_get_external_headers_target,$(1)) :| $(call gb_ExternalProject_get_target,$(2)) +$(call gb_LinkTarget_get_headers_target,$(1)) :| $(call gb_ExternalProject_get_target,$(2)) endef @@ -1364,7 +1343,7 @@ endef # # gb_LinkTarget_use_headers linktarget other-linktarget(s) define gb_LinkTarget_use_headers -$(call gb_LinkTarget_get_external_headers_target,$(1)) :\ +$(call gb_LinkTarget_get_headers_target,$(1)) :\ $(foreach linktarget,$(2),$(call gb_LinkTarget_get_headers_target,$(linktarget))) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 1bcc4db..72c2fa1 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -92,7 +92,6 @@ gb_DescriptionTranslateTarget_get_target = $(WORKDIR)/DescriptionTranslateTarget gb_Dictionary_get_target = $(WORKDIR)/Dictionary/$(1).done gb_CxxObject_get_target = $(WORKDIR)/CxxObject/$(1).o gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o -gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1) gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1) gb_Executable_get_runtime_target = $(WORKDIR_FOR_BUILD)/Executable/$(1).run gb_Extension_get_target = $(WORKDIR)/Extension/$(1).oxt @@ -137,7 +136,6 @@ gb_JunitTest_get_classsetname = JunitTest/$(1) gb_JunitTest_get_target = $(WORKDIR)/JunitTest/$(1)/done gb_JunitTest_get_userdir = $(WORKDIR)/JunitTest/$(1)/user gb_PythonTest_get_target = $(WORKDIR)/PythonTest/$(1)/done -gb_LinkTarget_get_external_headers_target = $(WORKDIR)/ExternalHeaders/$(1) gb_LinkTarget_get_headers_target = $(WORKDIR)/Headers/$(1) gb_LinkTarget_get_target = $(WORKDIR)/LinkTarget/$(1) gb_LinkTarget_get_objects_list = $(WORKDIR)/LinkTarget/$(1).objectlist @@ -173,7 +171,7 @@ gb_ScpTemplateTarget_get_target = $(abspath $(WORKDIR)/ScpTemplateTarget/$(dir $ gb_SdiTarget_get_target = $(WORKDIR)/SdiTarget/$(1) gb_SrsPartMergeTarget_get_target = $(WORKDIR)/SrsPartMergeTarget/$(1) gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1) -gb_SrsTarget_get_external_headers_target = $(WORKDIR)/ExternalHeaders/SrsTarget/$(1) +gb_SrsTarget_get_headers_target = $(WORKDIR)/SrsTarget/$(1).headers gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1))) gb_SrsTemplateTarget_get_include_dir = $(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1))) @@ -226,18 +224,10 @@ gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip gb_Library__get_final_target = $(WORKDIR)/Dummy/$(1) -define gb_Library_get_external_headers_target -$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES))) -endef - define gb_Library_get_headers_target $(patsubst $(1):%,$(WORKDIR)/Headers/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES))) endef -define gb_StaticLibrary_get_external_headers_target -$(WORKDIR)/ExternalHeaders/StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1)) -endef - define gb_StaticLibrary_get_headers_target $(WORKDIR)/Headers/StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1)) endef
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
