diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-10 00:56:28 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-10 20:03:02 +0200 |
commit | 7a878f9c5fde18e1e86ee0784d9a7f1252700e74 (patch) | |
tree | 994b8e6787c4f93a1e1d75f37e61b790f16e03a6 | |
parent | gbuild: rework AutoInstallLibs and autoinstall ure executables (diff) | |
download | core-7a878f9c5fde18e1e86ee0784d9a7f1252700e74.tar.gz core-7a878f9c5fde18e1e86ee0784d9a7f1252700e74.zip |
gbuild: s/AutoInstallLibs/AutoInstall/g
Change-Id: I582a841ea3b2a882cbdc1556058b007a8667024a
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | scp2/AutoInstall.mk | 24 | ||||
-rw-r--r-- | scp2/AutoInstallLibs.mk | 24 | ||||
-rw-r--r-- | scp2/Module_scp2.mk | 2 | ||||
-rw-r--r-- | scp2/source/base/module_base.scp | 2 | ||||
-rw-r--r-- | scp2/source/gnome/module_gnome.scp | 2 | ||||
-rw-r--r-- | scp2/source/graphicfilter/module_graphicfilter.scp | 2 | ||||
-rw-r--r-- | scp2/source/impress/module_impress.scp | 2 | ||||
-rw-r--r-- | scp2/source/kde/module_kde.scp | 2 | ||||
-rw-r--r-- | scp2/source/math/module_math.scp | 2 | ||||
-rw-r--r-- | scp2/source/onlineupdate/module_onlineupdate.scp | 2 | ||||
-rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 2 | ||||
-rw-r--r-- | scp2/source/ooo/ure.scp | 2 | ||||
-rw-r--r-- | scp2/source/tde/module_tde.scp | 2 | ||||
-rw-r--r-- | scp2/source/writer/module_writer.scp | 2 | ||||
-rw-r--r-- | solenv/gbuild/AutoInstall.mk | 55 | ||||
-rw-r--r-- | solenv/gbuild/AutoInstallLibs.mk | 55 | ||||
-rw-r--r-- | solenv/gbuild/InstallModuleTarget.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/TargetLocations.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/gbuild.mk | 2 |
20 files changed, 96 insertions, 96 deletions
diff --git a/Makefile.in b/Makefile.in index 0fde85c211ff..7dde471d8912 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 000000000000..a6dad3c70085 --- /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 6363fb1f125f..000000000000 --- 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 695c88c4ec40..0712d4a42e1e 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 9a1f22d1969a..4dfd8863b3ba 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 262799d9a4b4..2b45bb14203c 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 6c8b2e8e8581..88ab15668070 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 8201e9a3f8c5..ebf90a25de47 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 23b921e5e8e7..c82a094563c5 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 b8427c9a73b9..0c01f984caf9 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 4fdb0b3304f3..ecd0cda907e4 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 b5452d33dd8d..d8a0a5f49eca 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 63c8e26c54e3..b2246e847675 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 2f4523d87739..03138fecf79f 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 b0a2bc982002..c141fa199cff 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 000000000000..518d06e71e02 --- /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 aeb7c944ff8e..000000000000 --- 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 0ef0780ed10a..d4cf4c9d030d 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 72c2fa10aaef..e87efe3bf770 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 4b65f0ecee83..47d6e6e9727e 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) |