diff options
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | ios/CustomTarget_LibreOffice_app.mk | 6 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 38 | ||||
| -rw-r--r-- | postprocess/Module_postprocess.mk | 1 | ||||
| -rw-r--r-- | postprocess/Package_registry.mk | 11 | ||||
| -rw-r--r-- | postprocess/Package_registry_install.mk | 28 | ||||
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 1 |
8 files changed, 34 insertions, 55 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 4e06e63d9d2e..5285bccb0380 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2941,7 +2941,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\ $(call gb_Library_get_target,vclplug_svp) \ )) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ - $(call gb_Package_get_target_for_build,postprocess_registry_install) \ + $(call gb_Package_get_target_for_build,postprocess_registry) \ $(call gb_Rdb_get_target_for_build,ure/services) \ $(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \ $(call gb_UnoApi_get_target,offapi) \ diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk index 1bf679935932..6fedb74f31ec 100644 --- a/ios/CustomTarget_LibreOffice_app.mk +++ b/ios/CustomTarget_LibreOffice_app.mk @@ -61,6 +61,7 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) # # Copy "registry" files # +# FIXME This can be removed ? registry is copied below mkdir -p $(appdir)/registry/modules $(appdir)/registry/res cp $(OUTDIR)/xml/*.xcd $(appdir)/registry mv $(appdir)/registry/fcfg_langpack_en-US.xcd $(appdir)/registry/res @@ -85,10 +86,7 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) # # "registry" # - mkdir -p $(appdir)/share/registry/res - cp $(OUTDIR)/xml/*.xcd $(appdir)/share/registry - mv $(appdir)/share/registry/fcfg_langpack_en-US.xcd $(appdir)/share/registry/res - cp -R $(OUTDIR)/xml/registry/* $(appdir)/share/registry + cp -R $(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry $(appdir)/share # # Set up rc, the "inifile". See getIniFileName_Impl(). # diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index d60bd0ddc60a..7eabc93d00d8 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -490,21 +490,21 @@ postprocess_DRIVERS := $(foreach driver,$(postprocess_DRIVERS),driver_$(driver)) # Targets # -$(eval $(call gb_CustomTarget_register_targets,postprocess/registry,\ - $(postprocess_XCDS) \ - $(foreach lang,$(gb_Configuration_LANGS), \ - Langpack-$(lang).xcd \ - fcfg_langpack_$(lang).xcd \ - registry_$(lang).xcd \ - ) \ -)) +$(call gb_CustomTarget_get_target,postprocess/registry) : \ + $(foreach target,$(postprocess_XCDS) \ + $(foreach lang,$(gb_Configuration_LANGS), \ + Langpack-$(lang).xcd \ + fcfg_langpack_$(lang).xcd \ + registry_$(lang).xcd \ + ) \ + ,$(call gb_XcdTarget_get_target,$(target))) # # Dependencies # define postprocess_xcd_deps -$(call gb_CustomTarget_get_workdir,postprocess/registry)/$(1).xcd : \ +$(call gb_XcdTarget_get_target,$(1)).xcd : \ $(call gb_CustomTarget_get_workdir,postprocess/registry)/$(1).list $(call gb_CustomTarget_get_workdir,postprocess/registry)/$(1).list : \ @@ -517,19 +517,19 @@ endef $(foreach xcd,$(postprocess_XCDS),$(eval $(call postprocess_xcd_deps,$(basename $(xcd))))) define postprocess_lang_deps -$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).xcd : \ +$(call gb_XcdTarget_get_target,Langpack-$(1).xcd) : \ $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).list $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).list : \ $(call gb_XcuLangpackTarget_get_outdir_target,Langpack-$(1).xcu) -$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).xcd : \ +$(call gb_XcdTarget_get_target,fcfg_langpack_$(1).xcd) : \ $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list : \ $(call gb_Configuration_get_target,fcfg_langpack) -$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).xcd : \ +$(call gb_XcdTarget_get_target,registry_$(1).xcd) : \ $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).list $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).list : \ @@ -559,21 +559,23 @@ postprocess_main_SED := \ -e 's,$${STARTCENTER_HIDE_EXTERNAL_LINKS},0,g' \ -e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' \ -$(call gb_CustomTarget_get_workdir,postprocess/registry)/main.xcd : \ +$(call gb_XcdTarget_get_target,main.xcd) : \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3) + $(call gb_Output_announce,main,$(true),XCD,3) $(call gb_Helper_abbreviate_dirs, \ + mkdir -p $(dir $@) && \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ $(SOLARENV)/bin/packregistry.xslt $< \ | sed $(postprocess_main_SED) > $@ \ ) -$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.xcd : \ +$(call gb_XcdTarget_get_target,%.xcd) : \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3) + $(call gb_Output_announce,$*,$(true),XCD,3) $(call gb_Helper_abbreviate_dirs, \ - $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ - -o $@ $(SOLARENV)/bin/packregistry.xslt $< \ + mkdir -p $(dir $@) && \ + $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ + -o $@ $(SOLARENV)/bin/packregistry.xslt $< \ ) $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list : diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk index 15e7b5875534..9ed1a758e587 100644 --- a/postprocess/Module_postprocess.mk +++ b/postprocess/Module_postprocess.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Module_add_targets,postprocess,\ CustomTarget_registry \ Package_images \ Package_registry \ - Package_registry_install \ Rdb_services \ )) diff --git a/postprocess/Package_registry.mk b/postprocess/Package_registry.mk index 5b082b61c3e0..371ef8f02824 100644 --- a/postprocess/Package_registry.mk +++ b/postprocess/Package_registry.mk @@ -7,12 +7,19 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,postprocess_registry,$(call gb_CustomTarget_get_workdir,postprocess/registry))) +$(eval $(call gb_Package_Package,postprocess_registry,$(patsubst %/,%,$(call gb_XcdTarget_get_target,)))) -$(eval $(call gb_Package_add_files,postprocess_registry,xml,\ +$(eval $(call gb_Package_set_outdir,postprocess_registry,$(INSTROOT))) + +$(eval $(call gb_Package_add_files,postprocess_registry,$(LIBO_SHARE_FOLDER)/registry,\ $(postprocess_XCDS) \ $(foreach lang,$(gb_Configuration_LANGS), \ Langpack-$(lang).xcd \ + ) \ +)) + +$(eval $(call gb_Package_add_files,postprocess_registry,$(LIBO_SHARE_FOLDER)/registry/res,\ + $(foreach lang,$(gb_Configuration_LANGS), \ fcfg_langpack_$(lang).xcd \ registry_$(lang).xcd \ ) \ diff --git a/postprocess/Package_registry_install.mk b/postprocess/Package_registry_install.mk deleted file mode 100644 index ba1d51605489..000000000000 --- a/postprocess/Package_registry_install.mk +++ /dev/null @@ -1,28 +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_Package_Package,postprocess_registry_install,$(call gb_CustomTarget_get_workdir,postprocess/registry))) - -$(eval $(call gb_Package_set_outdir,postprocess_registry_install,$(INSTROOT))) - -$(eval $(call gb_Package_add_files,postprocess_registry_install,$(LIBO_SHARE_FOLDER)/registry,\ - $(postprocess_XCDS) \ - $(foreach lang,$(gb_Configuration_LANGS), \ - Langpack-$(lang).xcd \ - ) \ -)) - -$(eval $(call gb_Package_add_files,postprocess_registry_install,$(LIBO_SHARE_FOLDER)/registry/res,\ - $(foreach lang,$(gb_Configuration_LANGS), \ - fcfg_langpack_$(lang).xcd \ - registry_$(lang).xcd \ - ) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 062d3ed1b90e..963b77a489f4 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -283,7 +283,7 @@ endef # Use standard configuration. define gb_CppunitTest_use_configuration -$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,postprocess_registry_install) +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,postprocess_registry) $(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 5e16f4729305..2ac7cde6ce4e 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -218,6 +218,7 @@ gb_YaccTarget_get_target = $(WORKDIR)/YaccTarget/$(1).done gb_LexTarget_get_scanner_target = $(WORKDIR)/LexTarget/$(1).cxx gb_LexTarget_get_target = $(WORKDIR)/LexTarget/$(1).done +gb_XcdTarget_get_target = $(WORKDIR)/XcdTarget/$(1) gb_XcsTarget_get_target = $(WORKDIR)/XcsTarget/$(1) gb_XcuDataTarget_get_target = $(WORKDIR)/XcuDataTarget/$(1) gb_XcuLangpackTarget_get_target = $(WORKDIR)/XcuLangpackTarget/$(1) |