diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-18 19:31:49 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:06 +0200 |
commit | 89ac3c4acae1f0ffe3e96933d3449749ddf86847 (patch) | |
tree | d5a1b5a0fed33f26fee0741d7e1638c6c2c088cd | |
parent | scp2: fix Windows build: python wrapper is an executable there (diff) | |
download | core-89ac3c4acae1f0ffe3e96933d3449749ddf86847.tar.gz core-89ac3c4acae1f0ffe3e96933d3449749ddf86847.zip |
replace variables in main.xcd already in gbuild
In main.xcd we have some variables which used to be defined mostly
in instsetoo_native/util/openoffice.lst and replaced in installer.
Process the file in custom target,
so we can copy correct main.xcd directly with gbuild.
Change-Id: Ie2b1b6da1adb161394f69c345bbe8671cfafb7c4
-rw-r--r-- | config_host.mk.in | 2 | ||||
-rw-r--r-- | postprocess/CustomTarget_registry.mk | 49 |
2 files changed, 27 insertions, 24 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index e5e1953c7cc2..f3d379b7a24c 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -318,6 +318,8 @@ export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@ export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@ export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@ export LIBO_VERSION_PATCH=@LIBO_VERSION_PATCH@ +export LIBO_VERSION_SUFFIX=@LIBO_VERSION_SUFFIX@ +export LIBO_VERSION_SUFFIX_SUFFIX=@LIBO_VERSION_SUFFIX_SUFFIX@ export LIBPNG_CFLAGS=$(gb_SPACE)@LIBPNG_CFLAGS@ export LIBPNG_LIBS=$(gb_SPACE)@LIBPNG_LIBS@ export LIBREPOSITORY_JAR=@LIBREPOSITORY_JAR@ diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index ec5961187c15..e004ad15002f 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -546,19 +546,32 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval $(call postprocess_lang_deps,$(l # Rules # -$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.xcd : \ +postprocess_main_SED := \ + -e 's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g' \ + -e 's,$${ABOUTBOXPRODUCTVERSIONSUFFIX},$(LIBO_VERSION_SUFFIX_SUFFIX),g' \ + -e 's,$${DICT_REPO_URL},http://extensions.libreoffice.org/dictionaries/,g' \ + -e 's,$${FILEFORMATNAME},OpenOffice.org,g' \ + -e 's,$${FILEFORMATVERSION},1.0,g' \ + -e 's,$${OOOVENDOR},$(if $(OOO_VENDOR),$(OOO_VENDOR),The Document Foundation),g' \ + -e 's,$${PRODUCTNAME},$(PRODUCTNAME),g' \ + -e 's,$${PRODUCTVERSION},$(PRODUCTVERSION),g' \ + -e 's,$${PRODUCTEXTENSION},.$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g' \ + -e 's,$${STARTCENTER_ADDFEATURE_URL},http://extensions.libreoffice.org/,g' \ + -e 's,$${STARTCENTER_INFO_URL},http://www.libreoffice.org/,g' \ + -e 's,$${STARTCENTER_HIDE_EXTERNAL_LINKS},0,g' \ + -e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' \ + -e 's,$${WRITERCOMPATIBILITYVERSIONOOO11},OpenOffice.org 1.1,g' \ + +$(call gb_CustomTarget_get_workdir,postprocess/registry)/main.xcd : \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3) $(call gb_Helper_abbreviate_dirs, \ - $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ \ - $(SOLARENV)/bin/packregistry.xslt $< \ + $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ + -o $@.tmp $(SOLARENV)/bin/packregistry.xslt $< \ + && sed $(postprocess_main_SED) $@.tmp > $@ \ ) -$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list : - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2) - echo '<list><dependency file="main"/><filename>$(call gb_XcuLangpackTarget_get_outdir_target,Langpack-$*.xcu)</filename></list>' > $@ - -$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.xcd : \ +$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.xcd : \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3) $(call gb_Helper_abbreviate_dirs, \ @@ -566,6 +579,10 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.xcd : \ -o $@ $(SOLARENV)/bin/packregistry.xslt $< \ ) +$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list : + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2) + echo '<list><dependency file="main"/><filename>$(call gb_XcuLangpackTarget_get_outdir_target,Langpack-$*.xcu)</filename></list>' > $@ + # It can happen that localized fcfg_langpack_*.zip contains # zero-sized org/openoffice/TypeDectection/Filter.xcu; filter them out in the # find shell command below (see issue 110041): @@ -577,14 +594,6 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list : && echo '</list>' >> $@ \ ) -$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.xcd : \ - | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3) - $(call gb_Helper_abbreviate_dirs, \ - $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ - -o $@ $(SOLARENV)/bin/packregistry.xslt $< \ - ) - $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2) echo '<list>' > $@ \ @@ -601,14 +610,6 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list : ) \ && echo '</list>' >> $@ -$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.xcd : \ - | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3) - $(call gb_Helper_abbreviate_dirs, \ - $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ - -o $@ $(SOLARENV)/bin/packregistry.xslt $< \ - ) - $(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2) echo '<list>' $(foreach i,$(postprocess_DEPS_$*), '<dependency file="$i"/>') \ |