[Libreoffice-commits] core.git: 9 commits - filter/Configuration_filter.mk ios/CustomTarget_LibreOffice_app.mk lingucomponent/Module_lingucomponent.mk lingucomponent/Package_config.mk officecfg/Module_officecfg.mk officecfg/Package_tools.mk postprocess/CustomTarget_registry.mk postprocess/Module_postprocess.mk postprocess/Package_registry_install.mk postprocess/Package_registry.mk RepositoryExternal.mk sdext/Extension_minimizer.mk sdext/Module_sdext.mk sdext/Package_pdfimport_xcu.mk sdext/source solenv/gbuild
Matúš Kukan
matus.kukan at gmail.com
Wed Oct 2 13:07:42 PDT 2013
RepositoryExternal.mk | 2
filter/Configuration_filter.mk | 53 ++-------
ios/CustomTarget_LibreOffice_app.mk | 6 -
lingucomponent/Module_lingucomponent.mk | 1
lingucomponent/Package_config.mk | 17 --
officecfg/Module_officecfg.mk | 1
officecfg/Package_tools.mk | 35 ------
postprocess/CustomTarget_registry.mk | 160 ++++++++++++++--------------
postprocess/Module_postprocess.mk | 1
postprocess/Package_registry.mk | 11 +
postprocess/Package_registry_install.mk | 28 ----
sdext/Extension_minimizer.mk | 2
sdext/Module_sdext.mk | 1
sdext/Package_pdfimport_xcu.mk | 15 --
sdext/source/pdfimport/config/pdf_types.xcu | 2
solenv/gbuild/Configuration.mk | 109 +++++--------------
solenv/gbuild/CppunitTest.mk | 2
solenv/gbuild/TargetLocations.mk | 16 +-
solenv/gbuild/gbuild.mk | 2
19 files changed, 147 insertions(+), 317 deletions(-)
New commits:
commit 1f82c0a46529ee056e99fd7031b5d569de522359
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Sep 27 20:52:35 2013 +0200
gbuild: kill gb_XcsTarget_get_outdir_target
No idea what the '--path $(gb_Configuration_registry)' parameter was for.
Change-Id: I892e178a62fa2ea971101815ea558f79d32f85ed
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index d0f2e97..0d1c10d 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,postprocess/registry))
# Variables
#
-postprocess_XCS := $(call gb_XcsTarget_get_outdir_target,org/openoffice)
+postprocess_XCS := $(call gb_XcsTarget_get_target,org/openoffice)
postprocess_XCU := $(call gb_XcuDataTarget_get_target,officecfg/registry/data/org/openoffice)
postprocess_MOD := $(call gb_XcuModuleTarget_get_target,officecfg/registry/data)
postprocess_DRIVERS :=
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
index f747d0e..70bce16 100644
--- a/sdext/Extension_minimizer.mk
+++ b/sdext/Extension_minimizer.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Extension_add_files,presentation-minimizer,bitmaps,\
$(SRCDIR)/icon-themes/galaxy/minimizer/opt_26.png \
))
-$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs,$(call gb_XcsTarget_get_target,sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs)))
+$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs,$(call gb_XcsTarget_get_target,org/openoffice/Office/extension/SunPresentationMinimizer.xcs)))
$(eval $(call gb_Extension_add_files,presentation-minimizer,registry/data/org/openoffice/Office,\
$(call gb_XcuFile_for_extension,sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu) \
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index eec45fb..49864a5 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -48,7 +48,7 @@ gb_Configuration_PRIMARY_REGISTRY_SCHEMA_ROOT = \
gb_Configuration__stringparam_schemaRoot = --stringparam schemaRoot \
$(if $(PRIMARY_REGISTRY), \
$(gb_Configuration_PRIMARY_REGISTRY_SCHEMA_ROOT), \
- $(call gb_XcsTarget_get_outdir_target,))
+ $(call gb_XcsTarget_get_target,))
gb_Configuration_XSLTCOMMAND = $(call gb_ExternalExecutable_get_command,xsltproc)
gb_Configuration_XSLTCOMMAND_DEPS = $(call gb_ExternalExecutable_get_dependencies,xsltproc)
@@ -57,7 +57,7 @@ gb_Configuration_XSLTCOMMAND_DEPS = $(call gb_ExternalExecutable_get_dependencie
# need to locate a schema file corresponding to some XCU file in the outdir
define gb_XcsTarget_for_XcuTarget
-$(call gb_XcsTarget_get_outdir_target,$(basename $(1)).xcs)
+$(call gb_XcsTarget_get_target,$(basename $(1)).xcs)
endef
gb_Configuration_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
@@ -73,8 +73,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_Configuration_XSLTCOMMAND) --nonet \
--noout \
- --stringparam componentName $(subst /,.,$(basename $(XCSFILE))) \
- --stringparam root $(subst $(XCSFILE),,$(3)) \
+ --stringparam componentName $(subst /,.,$(basename $(2))) \
+ --stringparam root $(subst $(2),,$(3)) \
$(gb_Configuration__stringparam_schemaRoot) \
$(gb_XcsTarget_XSLT_SchemaVal) \
$(3) && \
@@ -96,9 +96,7 @@ $(call gb_XcsTarget_get_target,%) : \
$(call gb_XcsTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCS,1)
- $(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_XcsTarget_get_target,$*) \
- $(call gb_XcsTarget_get_outdir_target,$(XCSFILE)))
+ rm -f $(call gb_XcsTarget_get_target,$*)
# XcuDataTarget class
@@ -115,14 +113,12 @@ $(call gb_Helper_abbreviate_dirs,\
--noout \
--stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
$(gb_Configuration__stringparam_schemaRoot) \
- --path $(gb_Configuration_registry) \
$(gb_XcuDataTarget_XSLT_DataVal) \
$(3) && \
$(gb_Configuration_XSLTCOMMAND) --nonet \
-o $(1) \
--stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
$(gb_Configuration__stringparam_schemaRoot) \
- --path $(gb_Configuration_registry) \
$(gb_XcuTarget_XSLT_AllLang) \
$(3))
endef
@@ -145,7 +141,7 @@ $(SRCDIR)/$(basename $(subst -,.,$(basename $(1)))).xcu
endef
define gb_XcsTarget_for_XcuModuleTarget
-$(call gb_XcsTarget_get_outdir_target,$(basename $(subst -,.,$(basename $(1)))).xcs)
+$(call gb_XcsTarget_get_target,$(basename $(subst -,.,$(basename $(1)))).xcs)
endef
define gb_XcuModuleTarget__command
@@ -253,7 +249,6 @@ $(call gb_Helper_abbreviate_dirs,\
--stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
$(gb_Configuration__stringparam_schemaRoot) \
--stringparam locale $(word 2,$(subst /, ,$(2))) \
- --path $(gb_Configuration_registry) \
$(gb_XcuTarget_XSLT_AllLang) \
$(3))
endef
@@ -311,24 +306,16 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Configuration)
endef
# $(call gb_Configuration_add_schema,configuration,prefix,xcsfile)
-# FIXME this is always delivered because commands depend on it...
# hopefully extensions do not need to add schemas with same name as officecfg
define gb_Configuration_add_schema
$(call gb_Configuration_get_clean_target,$(1)) : \
- $(call gb_XcsTarget_get_clean_target,$(2)/$(3))
-$(call gb_XcsTarget_get_target,$(2)/$(3)) : \
+ $(call gb_XcsTarget_get_clean_target,$(3))
+$(call gb_XcsTarget_get_target,$(3)) : \
$(SRCDIR)/$(2)/$(3) \
$(call gb_Configuration_get_preparation_target,$(1))
-$(call gb_XcsTarget_get_target,$(2)/$(3)) : PRIMARY_REGISTRY := $(filter $(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME))
-$(call gb_XcsTarget_get_target,$(2)/$(3)) : XCSFILE := $(3)
-$(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE := $(3)
+$(call gb_XcsTarget_get_target,$(3)) : PRIMARY_REGISTRY := $(filter $(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME))
$(call gb_Configuration_get_target,$(1)) : \
- $(call gb_XcsTarget_get_outdir_target,$(3))
-$(call gb_XcsTarget_get_outdir_target,$(3)) : \
- $(call gb_XcsTarget_get_target,$(2)/$(3)) \
- | $(dir $(call gb_XcsTarget_get_outdir_target,$(3))).dir
-$(call gb_Deliver_add_deliverable,$(call gb_XcsTarget_get_outdir_target,$(3)),\
- $(call gb_XcsTarget_get_target,$(2)/$(3)),$(2)/$(3))
+ $(call gb_XcsTarget_get_target,$(3))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 217f020..040dfdf 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -31,16 +31,14 @@ gb_PackagePart_get_destinations = \
$(OUTDIR)/res \
$(OUTDIR)/share \
$(OUTDIR)/unittest \
- $(OUTDIR)/xml \
gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT)
gb_ResTarget_get_unittest_target = \
$(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res
gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb
gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
-gb_Configuration_registry = $(OUTDIR)/xml/registry
-gb_XcsTarget_get_outdir_target = \
- $(gb_Configuration_registry)/schema$(if $(1),/)$(1)
+
+# instdir target patterns
gb_Executable_get_target = $(gb_Executable__get_linktarget_target)
@@ -216,7 +214,7 @@ 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_XcsTarget_get_target = $(WORKDIR)/XcsTarget$(if $(1),/)$(1)
gb_XcuDataTarget_get_target = $(WORKDIR)/XcuDataTarget/$(1)
gb_XcuFilterFiltersTarget_get_target = $(WORKDIR)/XcuFilterFiltersTarget/$(1)
gb_XcuFilterInternalTarget_get_target = $(WORKDIR)/XcuFilterInternalTarget/$(1)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 23e2d09..cab9953 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -279,8 +279,6 @@ $(eval $(call gb_Deliver_init))
# with $(OUTDIR)/bin/%.res for resources on unix
# $(OUTDIR)/lib/%.lib collides
# on windows (static and dynamic libs)
-# $(OUTDIR)/xml/% for packageparts collides
-# with $(OUTDIR)/xml/component/%.component for components
# This is less of an issue with GNU Make versions > 3.82 which matches for
# shortest stem instead of first match. However, upon intoduction this version
# is not available everywhere by default.
commit e5525abb90c5f95bd66c14260f435f86cca60b0e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Sep 26 10:47:34 2013 +0200
get rid of officecfg/Package_tools.mk
Change-Id: If549f6f5fba14067290b9ec0325381e6d590a472
diff --git a/officecfg/Module_officecfg.mk b/officecfg/Module_officecfg.mk
index 0e1e943..45002eb 100644
--- a/officecfg/Module_officecfg.mk
+++ b/officecfg/Module_officecfg.mk
@@ -23,7 +23,6 @@ include $(SRCDIR)/officecfg/files.mk
$(eval $(call gb_Module_add_targets,officecfg,\
CustomTarget_registry \
Package_misc \
- Package_tools \
Configuration_officecfg \
))
diff --git a/officecfg/Package_tools.mk b/officecfg/Package_tools.mk
deleted file mode 100644
index 040d2b8..0000000
--- a/officecfg/Package_tools.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-# this package contains stuff that is used during the build
-
-$(eval $(call gb_Package_Package,officecfg_tools,$(SRCDIR)/officecfg))
-
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/alllang.xsl,util/alllang.xsl))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/schema_val.xsl,util/schema_val.xsl))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/schema_trim.xsl,util/schema_trim.xsl))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/resource.xsl,util/resource.xsl))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/sanity.xsl,util/sanity.xsl))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/data_val.xsl,util/data_val.xsl))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/delcomment.sed,util/delcomment.sed))
-
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/registry/data.dtd,registry/data.dtd))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/registry/component-update.dtd,registry/component-update.dtd))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/registry/component-schema.dtd,registry/component-schema.dtd))
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index cda32c4..eec45fb 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -62,10 +62,10 @@ endef
gb_Configuration_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
-gb_XcsTarget_XSLT_SchemaVal := $(OUTDIR)/xml/processing/schema_val.xsl
-gb_XcsTarget_XSLT_Sanity := $(OUTDIR)/xml/processing/sanity.xsl
-gb_XcsTarget_XSLT_SchemaTrim := $(OUTDIR)/xml/processing/schema_trim.xsl
-gb_XcsTarget_DTD_Schema := $(OUTDIR)/xml/registry/component-schema.dtd
+gb_XcsTarget_XSLT_SchemaVal := $(SRCDIR)/officecfg/util/schema_val.xsl
+gb_XcsTarget_XSLT_Sanity := $(SRCDIR)/officecfg/util/sanity.xsl
+gb_XcsTarget_XSLT_SchemaTrim := $(SRCDIR)/officecfg/util/schema_trim.xsl
+gb_XcsTarget_DTD_Schema := $(SRCDIR)/officecfg/registry/component-schema.dtd
define gb_XcsTarget__command
$(call gb_Output_announce,$(2),$(true),XCS,1)
@@ -103,9 +103,9 @@ $(call gb_XcsTarget_get_clean_target,%) :
# XcuDataTarget class
-gb_XcuTarget_XSLT_AllLang := $(OUTDIR)/xml/processing/alllang.xsl
-gb_XcuDataTarget_XSLT_DataVal := $(OUTDIR)/xml/processing/data_val.xsl
-gb_XcuDataTarget_DTD_ComponentUpdate := $(OUTDIR)/xml/registry/component-update.dtd
+gb_XcuTarget_XSLT_AllLang := $(SRCDIR)/officecfg/util/alllang.xsl
+gb_XcuDataTarget_XSLT_DataVal := $(SRCDIR)/officecfg/util/data_val.xsl
+gb_XcuDataTarget_DTD_ComponentUpdate := $(SRCDIR)/officecfg/registry/component-update.dtd
define gb_XcuDataTarget__command
$(call gb_Output_announce,$(2),$(true),XCU,2)
@@ -179,7 +179,7 @@ gb_XcuLangpackTarget__get_name_with_lang = $(basename $(1))-$(2)$(suffix $(1))
gb_XcuLangpackTarget__get_target_with_lang = \
$(call gb_XcuLangpackTarget_get_target,$(call gb_XcuLangpackTarget__get_name_with_lang,$(1),$(2)))
-gb_XcuLangpackTarget_SED_delcomment := $(OUTDIR)/xml/processing/delcomment.sed
+gb_XcuLangpackTarget_SED_delcomment := $(SRCDIR)/officecfg/util/delcomment.sed
define gb_XcuLangpackTarget__command
$(call gb_Output_announce,$(2),$(true),XCL,1)
commit f351a98565d55d172b3f873ff1740344e16cdddd
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Sep 26 20:04:55 2013 +0200
gbuild: kill gb_XcuModuleTarget_get_outdir_target
Change-Id: I1d54d98b8aa50f778de87e6ebb17ec2eed0d65dc
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index b986390..645768e 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -31,11 +31,10 @@ filter_MERGE := $(call gb_ExternalExecutable_get_command,python) \
### types
-filter_XcuFilterTypesTarget_get_target = $(WORKDIR)/XcuFilterTypesTarget/$(1)
filter_XcuFilterTypesTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterTypesTarget/$(1)
-$(call filter_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET)
+$(call gb_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET)
$(call gb_Output_announce,$*,$(true),FIT,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
@@ -48,43 +47,32 @@ $(call filter_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET)
outdir=$(dir $@) pkg=$@ xmlpackage=Types tcfg=$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE})
-# delivering is handled by the rule for gb_XcuModuleTarget_get_outdir_target
-
$(call filter_XcuFilterTypesTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),FIT,1)
- $(call gb_Helper_abbreviate_dirs,\
- rm -f $(call filter_XcuFilterTypesTarget_get_target,$*) \
- $(call gb_XcuModuleTarget_get_outdir_target,$*))
+ rm -f $(call gb_XcuFilterTypesTarget_get_target,$*)
# $(call filter_Configuration__add_module,configuration,module,prefix,xcufiles,target,cleantarget)
define filter_Configuration__add_module
-$(call gb_Configuration_get_target,$(1)) : \
- $(call gb_XcuModuleTarget_get_outdir_target,$(2))
+$(call gb_Configuration_get_target,$(1)) : $(5)
$(call gb_Configuration_get_clean_target,$(1)) : $(6)
$(if $(4),,$(error filter_Configuration__add_module: no input files))
$(5) : \
$(addprefix $(SRCDIR)/$(3)/,$(addsuffix .xcu,$(4)))
-$(call gb_XcuModuleTarget_get_outdir_target,$(2)) : $(5)
-$(call gb_XcuModuleTarget_get_outdir_target,$(2)) |: $(dir $(call gb_XcuModuleTarget_get_outdir_target,$(2))).dir
-$(call gb_Deliver_add_deliverable,\
- $(call gb_XcuModuleTarget_get_outdir_target,$(2)),$(5),$(2))
endef
# $(call filter_Configuration_add_types,configuration,typesfile,prefix,xcufiles)
define filter_Configuration_add_types
$(eval $(call filter_Configuration__add_module,$(1),$(2),$(3),$(4),\
- $(call filter_XcuFilterTypesTarget_get_target,$(2)),\
+ $(call gb_XcuFilterTypesTarget_get_target,$(2)),\
$(call filter_XcuFilterTypesTarget_get_clean_target,$(2))))
endef
### filters
-filter_XcuFilterFiltersTarget_get_target = \
- $(WORKDIR)/XcuFilterFiltersTarget/$(1)
filter_XcuFilterFiltersTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterFiltersTarget/$(1)
-$(call filter_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET)
+$(call gb_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET)
$(call gb_Output_announce,$*,$(true),FIF,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
@@ -97,28 +85,23 @@ $(call filter_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET)
outdir=$(dir $@) pkg=$@ xmlpackage=Filter fcfg=$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE})
-# delivering is handled by the rule for gb_XcuModuleTarget_get_outdir_target
-
$(call filter_XcuFilterFiltersTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),FIF,1)
- $(call gb_Helper_abbreviate_dirs,\
- rm -f $(call filter_XcuFilterFiltersTarget_get_target,$*) \
- $(call gb_XcuModuleTarget_get_outdir_target,$*))
+ rm -f $(call gb_XcuFilterFiltersTarget_get_target,$*)
# $(call filter_Configuration_add_filters,configuration,typesfile,prefix,xcufiles)
define filter_Configuration_add_filters
$(eval $(call filter_Configuration__add_module,$(1),$(2),$(3),$(4),\
- $(call filter_XcuFilterFiltersTarget_get_target,$(2)),\
+ $(call gb_XcuFilterFiltersTarget_get_target,$(2)),\
$(call filter_XcuFilterFiltersTarget_get_clean_target,$(2))))
endef
### others (frameloaders, contenthandlers)
-filter_XcuFilterOthersTarget_get_target = $(WORKDIR)/XcuFilterOthersTarget/$(1)
filter_XcuFilterOthersTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterOthersTarget/$(1)
-$(call filter_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET)
+$(call gb_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET)
$(call gb_Output_announce,$*,$(true),FIO,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
@@ -137,27 +120,21 @@ $(call filter_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET)
$(call filter_XcuFilterOthersTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),FIO,1)
- $(call gb_Helper_abbreviate_dirs,\
- rm -f $(call filter_XcuFilterOthersTarget_get_target,$*) \
- $(call gb_XcuModuleTarget_get_outdir_target,$*))
-
-# delivering is handled by the rule for gb_XcuModuleTarget_get_outdir_target
+ rm -f $(call gb_XcuFilterOthersTarget_get_target,$*)
# $(call filter_Configuration_add_others,configuration,typesfile,prefix,xcufiles)
define filter_Configuration_add_others
$(eval $(call filter_Configuration__add_module,$(1),$(2),$(3),$(4),\
- $(call filter_XcuFilterOthersTarget_get_target,$(2)),\
+ $(call gb_XcuFilterOthersTarget_get_target,$(2)),\
$(call filter_XcuFilterOthersTarget_get_clean_target,$(2))))
endef
### internal filters
-filter_XcuFilterInternalTarget_get_target = \
- $(WORKDIR)/XcuFilterInternalTarget/$(1)
filter_XcuFilterInternalTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterInternalTarget/$(1)
-$(call filter_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET)
+$(call gb_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET)
$(call gb_Output_announce,$*,$(true),FII,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
@@ -171,18 +148,14 @@ $(call filter_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET)
fcfg=$${RESPONSEFILE} subdir_filters=internalgraphicfilters && \
rm -f $${RESPONSEFILE})
-# delivering is handled by the rule for gb_XcuModuleTarget_get_outdir_target
-
$(call filter_XcuFilterInternalTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),FII,1)
- $(call gb_Helper_abbreviate_dirs,\
- rm -f $(call filter_XcuFilterInternalTarget_get_target,$*) \
- $(call gb_XcuModuleTarget_get_outdir_target,$*))
+ rm -f $(call gb_XcuFilterInternalTarget_get_target,$*)
# $(call filter_Configuration_add_internal_filters,configuration,typesfile,prefix,xcufiles)
define filter_Configuration_add_internal_filters
$(eval $(call filter_Configuration__add_module,$(1),$(2),$(3),$(4),\
- $(call filter_XcuFilterInternalTarget_get_target,$(2)),\
+ $(call gb_XcuFilterInternalTarget_get_target,$(2)),\
$(call filter_XcuFilterInternalTarget_get_clean_target,$(2))))
endef
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 9aba656..d0f2e97 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,postprocess/registry))
postprocess_XCS := $(call gb_XcsTarget_get_outdir_target,org/openoffice)
postprocess_XCU := $(call gb_XcuDataTarget_get_target,officecfg/registry/data/org/openoffice)
-postprocess_MOD := $(call gb_XcuModuleTarget_get_outdir_target,)
+postprocess_MOD := $(call gb_XcuModuleTarget_get_target,officecfg/registry/data)
postprocess_DRIVERS :=
postprocess_XCDS := \
@@ -38,9 +38,9 @@ postprocess_XCDS := \
postprocess_DEPS_base := main
postprocess_FILES_base := \
- $(postprocess_MOD)/fcfg_database_filters.xcu \
- $(postprocess_MOD)/fcfg_database_others.xcu \
- $(postprocess_MOD)/fcfg_database_types.xcu \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_database_filters.xcu) \
+ $(call gb_XcuFilterOthersTarget_get_target,fcfg_database_others.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_database_types.xcu) \
$(postprocess_MOD)/org/openoffice/Office/Common-base.xcu \
$(postprocess_MOD)/org/openoffice/Setup-base.xcu
@@ -50,15 +50,15 @@ postprocess_FILES_calc := \
$(postprocess_XCS)/Office/UI/CalcWindowState.xcs \
$(postprocess_XCU)/Office/UI/CalcCommands.xcu \
$(postprocess_XCU)/Office/UI/CalcWindowState.xcu \
- $(postprocess_MOD)/fcfg_calc_filters.xcu \
- $(postprocess_MOD)/fcfg_calc_types.xcu \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_calc_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_calc_types.xcu) \
$(postprocess_MOD)/org/openoffice/Office/Common-calc.xcu \
$(postprocess_MOD)/org/openoffice/Office/Embedding-calc.xcu \
$(postprocess_MOD)/org/openoffice/Setup-calc.xcu
ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
postprocess_FILES_calc += \
- $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-calc.xcu
+ $(call gb_XcuModuleTarget_get_target,connectivity/registry/calc)/org/openoffice/Office/DataAccess/Drivers-calc.xcu
postprocess_DRIVERS += calc
endif
@@ -75,20 +75,20 @@ postprocess_DEPS_draw := main
postprocess_FILES_draw := \
$(postprocess_XCS)/Office/UI/DrawWindowState.xcs \
$(postprocess_XCU)/Office/UI/DrawWindowState.xcu \
- $(postprocess_MOD)/fcfg_draw_filters.xcu \
- $(postprocess_MOD)/fcfg_draw_types.xcu \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_draw_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_draw_types.xcu) \
$(postprocess_MOD)/org/openoffice/Office/Common-draw.xcu \
$(postprocess_MOD)/org/openoffice/Office/Embedding-draw.xcu \
$(postprocess_MOD)/org/openoffice/Setup-draw.xcu
postprocess_DEPS_graphicfilter := main
postprocess_FILES_graphicfilter := \
- $(postprocess_MOD)/fcfg_drawgraphics_filters.xcu \
- $(postprocess_MOD)/fcfg_drawgraphics_types.xcu \
- $(postprocess_MOD)/fcfg_impressgraphics_filters.xcu \
- $(postprocess_MOD)/fcfg_impressgraphics_types.xcu \
- $(postprocess_MOD)/fcfg_writergraphics_filters.xcu \
- $(postprocess_MOD)/fcfg_writergraphics_types.xcu
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_drawgraphics_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_drawgraphics_types.xcu) \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_impressgraphics_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_impressgraphics_types.xcu) \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_writergraphics_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_writergraphics_types.xcu)
postprocess_DEPS_impress := main
postprocess_FILES_impress := \
@@ -98,8 +98,8 @@ postprocess_FILES_impress := \
$(postprocess_XCU)/Office/PresenterScreen.xcu \
$(postprocess_XCU)/Office/UI/Effects.xcu \
$(postprocess_XCU)/Office/UI/ImpressWindowState.xcu \
- $(postprocess_MOD)/fcfg_impress_filters.xcu \
- $(postprocess_MOD)/fcfg_impress_types.xcu \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_impress_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_impress_types.xcu) \
$(postprocess_MOD)/org/openoffice/Office/Common-impress.xcu \
$(postprocess_MOD)/org/openoffice/Office/Embedding-impress.xcu \
$(postprocess_MOD)/org/openoffice/Office/Jobs-impress.xcu \
@@ -262,14 +262,14 @@ postprocess_FILES_main := \
$(postprocess_XCU)/UserProfile.xcu \
$(postprocess_XCU)/VCL.xcu \
$(postprocess_XCU)/ucb/Configuration.xcu \
- $(postprocess_MOD)/fcfg_base_filters.xcu \
- $(postprocess_MOD)/fcfg_base_others.xcu \
- $(postprocess_MOD)/fcfg_base_types.xcu \
- $(postprocess_MOD)/fcfg_chart_filters.xcu \
- $(postprocess_MOD)/fcfg_chart_others.xcu \
- $(postprocess_MOD)/fcfg_chart_types.xcu \
- $(postprocess_MOD)/fcfg_internalgraphics_filters.xcu \
- $(postprocess_MOD)/fcfg_internalgraphics_types.xcu \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_base_filters.xcu) \
+ $(call gb_XcuFilterOthersTarget_get_target,fcfg_base_others.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_base_types.xcu) \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_chart_filters.xcu) \
+ $(call gb_XcuFilterOthersTarget_get_target,fcfg_chart_others.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_chart_types.xcu) \
+ $(call gb_XcuFilterInternalTarget_get_target,fcfg_internalgraphics_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_internalgraphics_types.xcu) \
$(postprocess_MOD)/org/openoffice/Office/Embedding-chart.xcu \
$(postprocess_MOD)/org/openoffice/Setup-start.xcu \
$(postprocess_MOD)/org/openoffice/TypeDetection/UISort-calc.xcu \
@@ -279,26 +279,26 @@ postprocess_FILES_main := \
$(postprocess_MOD)/org/openoffice/TypeDetection/UISort-writer.xcu
ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
postprocess_FILES_main += \
- $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-dbase.xcu \
- $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-flat.xcu \
- $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mysql.xcu \
- $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu
+ $(call gb_XcuModuleTarget_get_target,connectivity/registry/dbase)/org/openoffice/Office/DataAccess/Drivers-dbase.xcu \
+ $(call gb_XcuModuleTarget_get_target,connectivity/registry/flat)/org/openoffice/Office/DataAccess/Drivers-flat.xcu \
+ $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysql)/org/openoffice/Office/DataAccess/Drivers-mysql.xcu \
+ $(call gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu
postprocess_DRIVERS += dbase flat mysql odbc
ifeq (WNT,$(OS))
ifeq ($(WITH_MOZAB4WIN),YES)
-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
+postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/mozab)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
postprocess_DRIVERS += mozab
endif
else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
+postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/mork)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
postprocess_DRIVERS += mork
endif
endif
endif
ifeq (MACOSX,$(OS))
postprocess_FILES_main += \
- $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-macab.xcu \
+ $(call gb_XcuModuleTarget_get_target,connectivity/registry/macab)/org/openoffice/Office/DataAccess/Drivers-macab.xcu \
$(postprocess_MOD)/org/openoffice/Inet-macosx.xcu \
$(postprocess_MOD)/org/openoffice/Office/Accelerators-macosx.xcu \
$(postprocess_MOD)/org/openoffice/Office/Common-macosx.xcu \
@@ -320,7 +320,7 @@ postprocess_FILES_main += \
# VCL-unixdesktop.xcu must come after VCL.xcu
else ifeq (WNT,$(OS))
postprocess_FILES_main += \
- $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-ado.xcu \
+ $(call gb_XcuModuleTarget_get_target,connectivity/registry/ado)/org/openoffice/Office/DataAccess/Drivers-ado.xcu \
$(postprocess_MOD)/org/openoffice/Inet-wnt.xcu \
$(postprocess_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \
$(postprocess_MOD)/org/openoffice/Office/Common-wnt.xcu \
@@ -333,26 +333,26 @@ ifeq ($(DISABLE_NEON),$(false))
postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu
endif
ifeq ($(ENABLE_EVOAB2),TRUE)
-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
+postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
postprocess_DRIVERS += evoab
endif
ifeq ($(ENABLE_JAVA),TRUE)
postprocess_FILES_main += \
- $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-hsqldb.xcu \
- $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu
+ $(call gb_XcuModuleTarget_get_target,connectivity/registry/hsqldb)/org/openoffice/Office/DataAccess/Drivers-hsqldb.xcu \
+ $(call gb_XcuModuleTarget_get_target,connectivity/registry/jdbc)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu
postprocess_DRIVERS += hsqldb jdbc
endif
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
postprocess_FILES_main += \
- $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-firebird.xcu
+ $(call gb_XcuModuleTarget_get_target,connectivity/registry/firebird)/org/openoffice/Office/DataAccess/Drivers-firebird.xcu
postprocess_DRIVERS += firebird_sdbc
endif
ifeq ($(ENABLE_TDEAB),TRUE)
-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-tdeab.xcu
+postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/tdeab)/org/openoffice/Office/DataAccess/Drivers-tdeab.xcu
endif
ifeq ($(ENABLE_KAB),TRUE)
-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-kab.xcu
+postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/kab)/org/openoffice/Office/DataAccess/Drivers-kab.xcu
postprocess_DRIVERS += kab
endif
@@ -368,8 +368,8 @@ postprocess_FILES_math := \
$(postprocess_XCS)/Office/UI/MathWindowState.xcs \
$(postprocess_XCU)/Office/UI/MathCommands.xcu \
$(postprocess_XCU)/Office/UI/MathWindowState.xcu \
- $(postprocess_MOD)/fcfg_math_filters.xcu \
- $(postprocess_MOD)/fcfg_math_types.xcu \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_math_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_math_types.xcu) \
$(postprocess_MOD)/org/openoffice/Office/Common-math.xcu \
$(postprocess_MOD)/org/openoffice/Office/Embedding-math.xcu \
$(postprocess_MOD)/org/openoffice/Setup-math.xcu
@@ -413,25 +413,25 @@ postprocess_FILES_writer := \
$(postprocess_XCU)/Office/UI/WriterWebWindowState.xcu \
$(postprocess_XCU)/Office/UI/WriterWindowState.xcu \
$(postprocess_XCU)/Office/UI/XFormsWindowState.xcu \
- $(postprocess_MOD)/fcfg_global_filters.xcu \
- $(postprocess_MOD)/fcfg_global_types.xcu \
- $(postprocess_MOD)/fcfg_web_filters.xcu \
- $(postprocess_MOD)/fcfg_web_types.xcu \
- $(postprocess_MOD)/fcfg_writer_filters.xcu \
- $(postprocess_MOD)/fcfg_writer_types.xcu \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_global_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_global_types.xcu) \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_web_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_web_types.xcu) \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_writer_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_writer_types.xcu) \
$(postprocess_MOD)/org/openoffice/Office/Common-writer.xcu \
$(postprocess_MOD)/org/openoffice/Office/Embedding-writer.xcu \
$(postprocess_MOD)/org/openoffice/Setup-writer.xcu
postprocess_DEPS_xsltfilter := main
postprocess_FILES_xsltfilter := \
- $(postprocess_MOD)/fcfg_xslt_filters.xcu \
- $(postprocess_MOD)/fcfg_xslt_types.xcu
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_xslt_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_xslt_types.xcu)
ifeq ($(BUILD_POSTGRESQL_SDBC),YES)
postprocess_XCDS += postgresqlsdbc.xcd
postprocess_DEPS_postgresqlsdbc := main
-postprocess_FILES_postgresqlsdbc := $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-postgresql.xcu
+postprocess_FILES_postgresqlsdbc := $(call gb_XcuModuleTarget_get_target,connectivity/registry/postgresql)/org/openoffice/Office/DataAccess/Drivers-postgresql.xcu
postprocess_DRIVERS += postgresql
endif
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 4857341..cda32c4 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -163,13 +163,13 @@ endef
$(call gb_XcuModuleTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang) \
| $(gb_Configuration_XSLTCOMMAND_DEPS)
+ $(if $(filter %.xcu,$^),,$(error There is no target $(call gb_XcuModuleTarget_get_target,$*)))
$(call gb_XcuModuleTarget__command,$@,$*,$(filter %.xcu,$^),$(filter %.xcs,$^))
$(call gb_XcuModuleTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCM,3)
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_XcuModuleTarget_get_target,$*) \
- $(call gb_XcuModuleTarget_get_outdir_target,$(XCUFILE)))
+ rm -f $(call gb_XcuModuleTarget_get_target,$*))
# XcuLangpackTarget class
@@ -299,9 +299,9 @@ $(call gb_Configuration_get_preparation_target,%) :
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && touch $@)
-# $(call gb_Configuration_Configuration,configuration,repo,nodeliver)
-# cannot use target local variable for REPO because it's needed in prereq
+# $(call gb_Configuration_Configuration,configuration,nodeliver)
# last parameter may be used to turn off delivering of files
+# FIXME: not anymore, no files are delivered now
define gb_Configuration_Configuration
$(eval gb_Configuration_NODELIVER_$(1) := $(2))
@@ -368,21 +368,8 @@ $(call gb_XcuModuleTarget_get_target,$(2)/$(3)) : \
$(call gb_Configuration_get_preparation_target,$(1)) \
$(call gb_XcsTarget_for_XcuModuleTarget,$(3))
$(call gb_XcuModuleTarget_get_target,$(2)/$(3)) : PRIMARY_REGISTRY := $(filter $(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME))
-$(call gb_XcuModuleTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3)
-ifeq ($(strip $(gb_Configuration_NODELIVER_$(1))),)
-$(call gb_Configuration_get_target,$(1)) : \
- $(call gb_XcuModuleTarget_get_outdir_target,$(3))
-$(call gb_XcuModuleTarget_get_outdir_target,$(3)) : \
- $(call gb_XcuModuleTarget_get_target,$(2)/$(3)) \
- | $(dir $(call gb_XcuModuleTarget_get_outdir_target,$(3))).dir
-$(call gb_Deliver_add_deliverable,\
- $(call gb_XcuModuleTarget_get_outdir_target,$(3)),\
- $(call gb_XcuModuleTarget_get_target,$(2)/$(3)),\
- $(2)/$(3))
-else
$(call gb_Configuration_get_target,$(1)) : \
$(call gb_XcuModuleTarget_get_target,$(2)/$(3))
-endif
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 58023b1..217f020 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -41,7 +41,6 @@ gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
gb_Configuration_registry = $(OUTDIR)/xml/registry
gb_XcsTarget_get_outdir_target = \
$(gb_Configuration_registry)/schema$(if $(1),/)$(1)
-gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
gb_Executable_get_target = $(gb_Executable__get_linktarget_target)
@@ -219,6 +218,10 @@ 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_XcuFilterFiltersTarget_get_target = $(WORKDIR)/XcuFilterFiltersTarget/$(1)
+gb_XcuFilterInternalTarget_get_target = $(WORKDIR)/XcuFilterInternalTarget/$(1)
+gb_XcuFilterOthersTarget_get_target = $(WORKDIR)/XcuFilterOthersTarget/$(1)
+gb_XcuFilterTypesTarget_get_target = $(WORKDIR)/XcuFilterTypesTarget/$(1)
gb_XcuLangpackTarget_get_target = $(WORKDIR)/XcuLangpackTarget/$(1)
gb_XcuModuleTarget_get_target = $(WORKDIR)/XcuModuleTarget/$(1)
gb_XcuMergeTarget_get_target = $(WORKDIR)/XcuMergeTarget/$(1)
commit db8ac18b46c1095a2c7e8a5adc0818d72d66ef13
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon May 27 16:25:39 2013 +0200
gbuild: kill gb_XcuDataTarget_get_outdir_target
Change-Id: Ifad958524cc75ead4d2bb383369f63457a2237fc
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 184abb9..9aba656 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,postprocess/registry))
#
postprocess_XCS := $(call gb_XcsTarget_get_outdir_target,org/openoffice)
-postprocess_XCU := $(call gb_XcuDataTarget_get_outdir_target,org/openoffice)
+postprocess_XCU := $(call gb_XcuDataTarget_get_target,officecfg/registry/data/org/openoffice)
postprocess_MOD := $(call gb_XcuModuleTarget_get_outdir_target,)
postprocess_DRIVERS :=
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index e0652e6..4857341 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -135,8 +135,7 @@ $(call gb_XcuDataTarget_get_target,%) : $(gb_XcuDataTarget_XSLT_DataVal) \
$(call gb_XcuDataTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCU,2)
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_XcuDataTarget_get_target,$*) \
- $(call gb_XcuDataTarget_get_outdir_target,$(XCUFILE)))
+ rm -f $(call gb_XcuDataTarget_get_target,$*))
# XcuModuleTarget class
@@ -349,21 +348,8 @@ $(call gb_XcuDataTarget_get_target,$(2)/$(3)) : \
$(call gb_XcsTarget_for_XcuTarget,$(3))
$(call gb_XcuDataTarget_get_target,$(2)/$(3)) : PRIMARY_REGISTRY := $(filter $(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME))
$(call gb_XcuDataTarget_get_target,$(2)/$(3)) : XCUFILE := $(3)
-$(call gb_XcuDataTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3)
-ifeq ($(strip $(gb_Configuration_NODELIVER_$(1))),)
-$(call gb_Configuration_get_target,$(1)) : \
- $(call gb_XcuDataTarget_get_outdir_target,$(3))
-$(call gb_XcuDataTarget_get_outdir_target,$(3)) : \
- $(call gb_XcuDataTarget_get_target,$(2)/$(3)) \
- | $(dir $(call gb_XcuDataTarget_get_outdir_target,$(3))).dir
-$(call gb_Deliver_add_deliverable,\
- $(call gb_XcuDataTarget_get_outdir_target,$(3)),\
- $(call gb_XcuDataTarget_get_target,$(2)/$(3)),\
- $(2)/$(3))
-else
$(call gb_Configuration_get_target,$(1)) : \
$(call gb_XcuDataTarget_get_target,$(2)/$(3))
-endif
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 741706b..58023b1 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -41,7 +41,6 @@ gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
gb_Configuration_registry = $(OUTDIR)/xml/registry
gb_XcsTarget_get_outdir_target = \
$(gb_Configuration_registry)/schema$(if $(1),/)$(1)
-gb_XcuDataTarget_get_outdir_target = $(gb_Configuration_registry)/data/$(1)
gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
gb_Executable_get_target = $(gb_Executable__get_linktarget_target)
commit 58163b4cabea155ee58e163eb64a87d98222098a
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon May 27 15:50:15 2013 +0200
gbuild: kill gb_XcuLangpackTarget_get_outdir_target
Change-Id: I91444ed4fb98b094ba45bfc2a789abc83eb67212
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 19622d1..184abb9 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -523,7 +523,7 @@ $(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_XcuLangpackTarget_get_target,Langpack-$(1).xcu)
$(call gb_XcdTarget_get_target,fcfg_langpack_$(1).xcd) : \
$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list
@@ -582,7 +582,7 @@ $(call gb_XcdTarget_get_target,%.xcd) : \
$(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>' > $@
+ echo '<list><dependency file="main"/><filename>$(call gb_XcuLangpackTarget_get_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
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 4b67015..e0652e6 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -177,8 +177,6 @@ $(call gb_XcuModuleTarget_get_clean_target,%) :
gb_XcuLangpackTarget__get_name_with_lang = $(basename $(1))-$(2)$(suffix $(1))
-gb_XcuLangpackTarget__get_outdir_target_with_lang = \
- $(call gb_XcuLangpackTarget_get_outdir_target,$(call gb_XcuLangpackTarget__get_name_with_lang,$(1),$(2)))
gb_XcuLangpackTarget__get_target_with_lang = \
$(call gb_XcuLangpackTarget_get_target,$(call gb_XcuLangpackTarget__get_name_with_lang,$(1),$(2)))
@@ -200,8 +198,7 @@ $(call gb_XcuLangpackTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCL,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(foreach lang,$(gb_Configuration_LANGS),\
- $(call gb_XcuLangpackTarget__get_target_with_lang,$*,$(lang)) \
- $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(XCUFILE),$(lang))))
+ $(call gb_XcuLangpackTarget__get_target_with_lang,$*,$(lang))))
# XcuMergeTarget class
@@ -412,21 +409,11 @@ endef
define gb_Configuration__add_langpack
$(if $(gb_Configuration_NODELIVER_$(1)),\
$(error TODO not needed yet: cannot add langpack if nodeliver))
-$(call gb_Configuration_get_clean_target,$(1)) : \
- $(call gb_XcuLangpackTarget_get_clean_target,$(2)/$(3))
$(call gb_Configuration_get_target,$(1)) : \
- $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4))
-$(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)) : \
+ $(call gb_XcuLangpackTarget__get_target_with_lang,$(3),$(4))
+$(call gb_XcuLangpackTarget__get_target_with_lang,$(3),$(4)) : \
$(SRCDIR)/$(2)/$(3).tmpl
-$(call gb_XcuLangpackTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3)
-$(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)) : LANG := $(4)
-$(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)) : \
- $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)) \
- | $(dir $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4))).dir
-$(call gb_Deliver_add_deliverable,\
- $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)),\
- $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)),\
- $(call gb_XcuLangpackTarget__get_name_with_lang,$(2)/$(3),$(4)))
+$(call gb_XcuLangpackTarget__get_target_with_lang,$(3),$(4)) : LANG := $(4)
endef
@@ -434,6 +421,8 @@ endef
define gb_Configuration_add_spool_langpack
$(foreach lang,$(gb_Configuration_LANGS),$(eval \
$(call gb_Configuration__add_langpack,$(1),$(2),$(strip $(3)),$(lang))))
+$(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_XcuLangpackTarget_get_clean_target,$(strip $(3)))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 2ac7cde..741706b 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -42,7 +42,6 @@ gb_Configuration_registry = $(OUTDIR)/xml/registry
gb_XcsTarget_get_outdir_target = \
$(gb_Configuration_registry)/schema$(if $(1),/)$(1)
gb_XcuDataTarget_get_outdir_target = $(gb_Configuration_registry)/data/$(1)
-gb_XcuLangpackTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
gb_Executable_get_target = $(gb_Executable__get_linktarget_target)
commit 386a382e6263e573a483482a70184d61bdf6b02c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Sep 26 18:16:51 2013 +0200
lingucomponent: kill Package_config.mk
Change-Id: I5c97347cfaefb23cd985b7776a83337856e4d55c
diff --git a/lingucomponent/Module_lingucomponent.mk b/lingucomponent/Module_lingucomponent.mk
index bddc46d..ed9a325 100644
--- a/lingucomponent/Module_lingucomponent.mk
+++ b/lingucomponent/Module_lingucomponent.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_Module_add_targets,lingucomponent,\
Library_lnth \
$(if $(filter MACOSX,$(OS)),Library_MacOSXSpell) \
Library_spell \
- Package_config \
StaticLibrary_ulingu \
))
diff --git a/lingucomponent/Package_config.mk b/lingucomponent/Package_config.mk
deleted file mode 100644
index 7cd657e..0000000
--- a/lingucomponent/Package_config.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile; 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,lingucomponent_config,$(SRCDIR)/lingucomponent/config))
-
-$(eval $(call gb_Package_add_file,lingucomponent_config,xml/registry/data/org/openoffice/Office/Linguistic-lingucomponent-hyphenator.xcu,Linguistic-lingucomponent-hyphenator.xcu))
-$(eval $(call gb_Package_add_file,lingucomponent_config,xml/registry/data/org/openoffice/Office/Linguistic-lingucomponent-spellchecker.xcu,Linguistic-lingucomponent-spellchecker.xcu))
-$(eval $(call gb_Package_add_file,lingucomponent_config,xml/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu,Linguistic-lingucomponent-thesaurus.xcu))
-
-# vim: set noet sw=4 ts=4:
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index cdb129b..19622d1 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -117,9 +117,9 @@ postprocess_FILES_korea := \
postprocess_DEPS_lingucomponent := main
postprocess_FILES_lingucomponent := \
- $(postprocess_XCU)/Office/Linguistic-lingucomponent-hyphenator.xcu \
- $(postprocess_XCU)/Office/Linguistic-lingucomponent-spellchecker.xcu \
- $(postprocess_XCU)/Office/Linguistic-lingucomponent-thesaurus.xcu \
+ $(SRCDIR)/lingucomponent/config/Linguistic-lingucomponent-hyphenator.xcu \
+ $(SRCDIR)/lingucomponent/config/Linguistic-lingucomponent-spellchecker.xcu \
+ $(SRCDIR)/lingucomponent/config/Linguistic-lingucomponent-thesaurus.xcu \
postprocess_FILES_main := \
$(postprocess_XCS)/FirstStartWizard.xcs \
commit 04496cb8697d7b68d4705148efaa7cf7d908a852
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun May 26 13:52:02 2013 +0200
sdext: kill Package_pdfimport_xcu.mk
Change-Id: I88a402bf26852e8e216de11d71cbd42edb0aff23
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 0686019..cdb129b 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -475,8 +475,8 @@ postprocess_OPTDEPS_pdfimport := calc draw impress math writer
# impress, math, web, writer), add optional dependencies on those XCDS that
# include those fcfg_X_types.xcu
postprocess_FILES_pdfimport := \
- $(OUTDIR)/xml/pdfimport/pdf_import_filter.xcu \
- $(OUTDIR)/xml/pdfimport/pdf_types.xcu
+ $(SRCDIR)/sdext/source/pdfimport/config/pdf_import_filter.xcu \
+ $(SRCDIR)/sdext/source/pdfimport/config/pdf_types.xcu
endif
ifeq (WNT,$(OS))
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index c6e48d6..506bb1a 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
CustomTarget_pdfimport \
Executable_xpdfimport \
Library_pdfimport \
- Package_pdfimport_xcu \
Package_pdfimport_xpdfimport \
StaticLibrary_pdfimport_s \
))
diff --git a/sdext/Package_pdfimport_xcu.mk b/sdext/Package_pdfimport_xcu.mk
deleted file mode 100644
index cbc0971..0000000
--- a/sdext/Package_pdfimport_xcu.mk
+++ /dev/null
@@ -1,15 +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,pdfimport_xcu,$(SRCDIR)/sdext))
-
-$(eval $(call gb_Package_add_file,pdfimport_xcu,xml/pdfimport/pdf_import_filter.xcu,source/pdfimport/config/pdf_import_filter.xcu))
-$(eval $(call gb_Package_add_file,pdfimport_xcu,xml/pdfimport/pdf_types.xcu,source/pdfimport/config/pdf_types.xcu))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sdext/source/pdfimport/config/pdf_types.xcu b/sdext/source/pdfimport/config/pdf_types.xcu
index 66ed8a8..d8128741 100644
--- a/sdext/source/pdfimport/config/pdf_types.xcu
+++ b/sdext/source/pdfimport/config/pdf_types.xcu
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE oor:component-data SYSTEM "../registry/component-update.dtd">
+<!DOCTYPE oor:component-data SYSTEM "../../../../officecfg/registry/component-update.dtd">
<!--
* This file is part of the LibreOffice project.
*
commit aac04a7f3c7f7c1bc8d75e8caa5e67eb38743afe
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun May 26 13:48:46 2013 +0200
use full path in postprocess_FILES_foo
Change-Id: I55144900bedd79e26979438e9e689488a3bfe2ae
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 7eabc93..0686019 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -13,9 +13,9 @@ $(eval $(call gb_CustomTarget_CustomTarget,postprocess/registry))
# Variables
#
-postprocess_XCS := registry/schema/org/openoffice
-postprocess_XCU := registry/data/org/openoffice
-postprocess_MOD := registry/spool
+postprocess_XCS := $(call gb_XcsTarget_get_outdir_target,org/openoffice)
+postprocess_XCU := $(call gb_XcuDataTarget_get_outdir_target,org/openoffice)
+postprocess_MOD := $(call gb_XcuModuleTarget_get_outdir_target,)
postprocess_DRIVERS :=
postprocess_XCDS := \
@@ -474,7 +474,9 @@ postprocess_OPTDEPS_pdfimport := calc draw impress math writer
# include pdf_Portable_Document_Format (i.e., X in calc, draw, global,
# impress, math, web, writer), add optional dependencies on those XCDS that
# include those fcfg_X_types.xcu
-postprocess_FILES_pdfimport := pdfimport/pdf_import_filter.xcu pdfimport/pdf_types.xcu
+postprocess_FILES_pdfimport := \
+ $(OUTDIR)/xml/pdfimport/pdf_import_filter.xcu \
+ $(OUTDIR)/xml/pdfimport/pdf_types.xcu
endif
ifeq (WNT,$(OS))
@@ -508,7 +510,7 @@ $(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 : \
- $(foreach file,$(postprocess_FILES_$(1)),$(OUTDIR)/xml/$(file)) \
+ $(postprocess_FILES_$(1)) \
$(SRCDIR)/postprocess/CustomTarget_registry.mk \
$(call gb_Postprocess_get_target,AllPackages) \
| $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
@@ -613,6 +615,6 @@ $(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"/>') \
$(foreach i,$(postprocess_OPTDEPS_$*), '<dependency file="$i" optional="true"/>') \
- $(foreach i,$(postprocess_FILES_$*), '<filename>$(OUTDIR)/xml/$(i)</filename>') '</list>' > $@
+ $(foreach i,$(postprocess_FILES_$*), '<filename>$(i)</filename>') '</list>' > $@
# vim: set noet sw=4 ts=4:
commit 8b162f2fe245ada426b128b87b11090c418a70b7
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Sep 27 10:58:28 2013 +0200
we do not need .xcd files in solver
Change-Id: Ic08b12b0deb7342c520a5385c226d864596fc858
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4e06e63..5285bcc 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 1bf6799..6fedb74 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 d60bd0d..7eabc93 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 15e7b58..9ed1a75 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 5b082b6..371ef8f 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 ba1d516..0000000
--- 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 062d3ed..963b77a 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 5e16f47..2ac7cde 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)
More information about the Libreoffice-commits
mailing list