[Libreoffice-commits] .: 3 commits - filter/Configuration_filter.mk officecfg/registry solenv/gbuild swext/Configuration_mediawiki.mk
Michael Stahl
mst at kemper.freedesktop.org
Wed Oct 12 14:22:37 PDT 2011
filter/Configuration_filter.mk | 6 --
officecfg/registry/data/org/openoffice/Office/Paths.xcu | 3 -
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 3 -
solenv/gbuild/Configuration.mk | 30 +++++++++----
swext/Configuration_mediawiki.mk | 7 ---
5 files changed, 29 insertions(+), 20 deletions(-)
New commits:
commit 0ecc6c2ca0927591479a227a28f2b58888080609
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 12 23:15:39 2011 +0200
officecfg: hack: adapt Help path
this is just to get my smoketest running and should be revisited.
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index fa55c57..bb0af9b 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -126,7 +126,8 @@
<node oor:name="Help" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths">
- <node oor:name="$(instpath)/help" oor:op="fuse" />
+ <!-- FIXME where should this go -->
+ <node oor:name="$(instpath)/basis-link/help" oor:op="fuse" />
</node>
</node>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index be50f74..bdd2edf 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1660,7 +1660,8 @@
<author>ABI</author>
<desc>Specifies the path to the Office help files.</desc>
</info>
- <value>$(instpath)/help</value>
+ <!-- FIXME where should this go -->
+ <value>$(instpath)/basis-link/help</value>
</prop>
<prop oor:name="Linguistic" oor:type="xs:string">
<info>
commit eb15d03b906cfc183d455f69922eab3a8e6d0006
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 12 23:11:30 2011 +0200
Configuration.mk: add nodeliver mode
Add a special mode where a Configuration does not deliver to the solver,
and use it in Configuration_mediawiki, preventing the files from
officecfg being overwritten by files from swext.
Should fix the annoying sc_test_filters failure and the smoketest
as well if the mediawiki extension is enabled.
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index b444167..5f34487 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -311,13 +311,15 @@ $(call gb_Configuration_get_target,%) :
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && touch $@)
-# $(call gb_Configuration_Configuration,zipfile,repo)
+# $(call gb_Configuration_Configuration,zipfile,repo,nodeliver)
# cannot use target local variable for REPO because it's needed in prereq
+# last parameter may be used to turn off delivering of files
define gb_Configuration_Configuration
$(if $(filter $(2),$(gb_Configuration_REPOSITORYNAMES)),,\
$(error Configuration: no or invalid repository given; known repositories: \
$(gb_Configuration_REPOSITORYNAMES)))
$(eval gb_Configuration_REPO_$(1) := $(2))
+$(eval gb_Configuration_NODELIVER_$(1) := $(3))
$(foreach lang,$(gb_Configuration_LANGS),$(eval \
$(call gb_Zip_Zip,$(1)_$(lang),$(call gb_XcuResTarget_get_target,$(1)/$(lang)))))
$(foreach lang,$(gb_Configuration_LANGS),$(eval \
@@ -331,15 +333,17 @@ $$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1
endef
# $(call gb_Configuration_add_schema,zipfile,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_Configuration_get_target,$(1)) : \
- $(call gb_XcsTarget_get_outdir_target,$(3))
$(call gb_XcsTarget_get_target,$(2)/$(3)) : \
$(call gb_Configuration__get_source,$(1),$(2)/$(3))
$(call gb_XcsTarget_get_target,$(2)/$(3)) : XCSFILE := $(3)
$(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE := $(3)
+$(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))
$(call gb_Deliver_add_deliverable,$(call gb_XcsTarget_get_outdir_target,$(3)),\
@@ -357,19 +361,24 @@ endef
define gb_Configuration_add_data
$(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_XcuDataTarget_get_clean_target,$(2)/$(3))
-$(call gb_Configuration_get_target,$(1)) : \
- $(call gb_XcuDataTarget_get_outdir_target,$(3))
$(call gb_XcuDataTarget_get_target,$(2)/$(3)) : \
$(call gb_Configuration__get_source,$(1),$(2)/$(3)) \
$(call gb_XcsTarget_for_XcuTarget,$(3))
$(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))
$(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
@@ -383,18 +392,23 @@ endef
define gb_Configuration_add_spool_module
$(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_XcuModuleTarget_get_clean_target,$(2)/$(3))
-$(call gb_Configuration_get_target,$(1)) : \
- $(call gb_XcuModuleTarget_get_outdir_target,$(3))
$(call gb_XcuModuleTarget_get_target,$(2)/$(3)) : \
$(call gb_XcuDataSource_for_XcuModuleTarget,$(1),$(2)/$(3)) \
$(call gb_XcsTarget_for_XcuModuleTarget,$(3))
$(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))
$(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
@@ -405,6 +419,8 @@ $(foreach xcu,$(3),$(call gb_Configuration_add_spool_module,$(1),$(2),$(xcu)))
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)) : \
diff --git a/swext/Configuration_mediawiki.mk b/swext/Configuration_mediawiki.mk
index 9ece045..23d10e7 100644
--- a/swext/Configuration_mediawiki.mk
+++ b/swext/Configuration_mediawiki.mk
@@ -27,14 +27,11 @@
# instead of those above.
#
-$(eval $(call gb_Configuration_Configuration,mediawiki,SRCDIR))
+$(eval $(call gb_Configuration_Configuration,mediawiki,SRCDIR,nodeliver))
$(eval $(call gb_Configuration_add_datas,mediawiki,swext/mediawiki/src/registry/data,\
- org/openoffice/Office/Addons.xcu \
- org/openoffice/Office/OptionsDialog.xcu \
org/openoffice/Office/ProtocolHandler.xcu \
org/openoffice/Office/Paths.xcu \
- org/openoffice/Office/Custom/WikiExtension.xcu \
org/openoffice/TypeDetection/Filter.xcu \
org/openoffice/TypeDetection/Types.xcu \
))
@@ -47,4 +44,4 @@ $(eval $(call gb_Configuration_add_localized_datas,mediawiki,swext/mediawiki/src
$(eval $(call gb_Configuration_add_schemas,mediawiki,swext/mediawiki/src/registry/schema,\
org/openoffice/Office/Custom/WikiExtension.xcs \
-))
+))
commit 6659c12d12d5a00b618b9fe30c4b0d14df8f61d5
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 12 23:07:09 2011 +0200
remove comment obsoleted by fcf6c0a19f1a8cdff34e95ca0787277399a82c3c
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 5143d74..07301dc 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -22,12 +22,6 @@
# most of the rules here use some weird merge program, and this is sort of
# semi-integrated with the stuff from Configuration.mk; not exactly pretty...
-# comment from commit c9e3885ea7c950b4784b01ab0f42e92824a779c0:
-# Just assume cross-compiling from a sane system with a sane java
-# command... Too bored now to start propagating all the crazy
-# possibilities for Java as FOR_BUILD variants
-
-# this if is supposed to be an AND
ifeq ($(SOLAR_JAVA),)
filter_MERGE_TARGET := $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge
filter_MERGE := $(gb_PYTHON) $(filter_MERGE_TARGET)
More information about the Libreoffice-commits
mailing list