diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-11 16:42:18 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-11 16:43:50 +0100 |
| commit | 08914f9a3a0501c23ee21a7b363df814135c8b3a (patch) | |
| tree | 414c30f62bb9153f518b4eb30bb1bc2a05d78c79 | |
| parent | 05680f9d5881866629005c88b35dcf39e1488322 (diff) | |
oops, path to FCFGMerge.cfg is hardcoded in the script
Change-Id: I87c5373748a03800a889eb29f1d203291dd87d85
| -rw-r--r-- | filter/Configuration_filter.mk | 11 | ||||
| -rwxr-xr-x | filter/source/config/tools/merge/pyAltFCFGMerge | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 6f36649c9541..e5517e50f0ef 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -25,7 +25,6 @@ filter_MERGE_TARGET := $(call gb_ExternalExecutable_get_dependencies,python) \ $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge filter_MERGE := $(call gb_ExternalExecutable_get_command,python) \ $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge -filter_MERGE_CONFIG_TARGET := $(SRCDIR)/filter/source/config/tools/merge/FCFGMerge.cfg ### filter configuration rules: generic stuff ####################### @@ -35,7 +34,7 @@ filter_XcuFilterTypesTarget_get_target = $(WORKDIR)/XcuFilterTypesTarget/$(1) filter_XcuFilterTypesTarget_get_clean_target = \ $(WORKDIR)/Clean/XcuFilterTypesTarget/$(1) -$(call filter_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET) $(filter_MERGE_CONFIG_TARGET) +$(call filter_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$*,$(true),XCU,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -83,7 +82,7 @@ filter_XcuFilterFiltersTarget_get_target = \ filter_XcuFilterFiltersTarget_get_clean_target = \ $(WORKDIR)/Clean/XcuFilterFiltersTarget/$(1) -$(call filter_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET) $(filter_MERGE_CONFIG_TARGET) +$(call filter_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$*,$(true),XCU,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -116,7 +115,7 @@ filter_XcuFilterOthersTarget_get_target = $(WORKDIR)/XcuFilterOthersTarget/$(1) filter_XcuFilterOthersTarget_get_clean_target = \ $(WORKDIR)/Clean/XcuFilterOthersTarget/$(1) -$(call filter_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET) $(filter_MERGE_CONFIG_TARGET) +$(call filter_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$*,$(true),XCU,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -154,7 +153,7 @@ filter_XcuFilterInternalTarget_get_target = \ filter_XcuFilterInternalTarget_get_clean_target = \ $(WORKDIR)/Clean/XcuFilterInternalTarget/$(1) -$(call filter_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET) $(filter_MERGE_CONFIG_TARGET) +$(call filter_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$*,$(true),XCU,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -200,7 +199,7 @@ filter_XCU_filter := org/openoffice/TypeDetection/Filter.xcu filter_XcuResTarget_get_target = \ $(call gb_XcuResTarget_get_target,fcfg_langpack/$(1)/$(filter_XCU_filter)) -$(filter_XcuFilterUiTarget) : $(filter_MERGE_TARGET) $(filter_MERGE_CONFIG_TARGET) +$(filter_XcuFilterUiTarget) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$(filter_XcuFilterUiTarget),$(true),XCU,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge b/filter/source/config/tools/merge/pyAltFCFGMerge index e09178dc6f39..7c725ce6685b 100755 --- a/filter/source/config/tools/merge/pyAltFCFGMerge +++ b/filter/source/config/tools/merge/pyAltFCFGMerge @@ -11,7 +11,7 @@ import sys, string, os.path, codecs -CFGFILE = os.environ["SOLARVER"] + "/" + os.environ["INPATH_FOR_BUILD"] + "/inc/l10ntools/FCFGMerge.cfg" +CFGFILE = os.environ["SRCDIR"] + "/filter/source/config/tools/merge/FCFGMerge.cfg" PROP_XMLVERSION = "xmlversion" # // <= global cfg file PROP_XMLENCODING = "xmlencoding" # // <= global cfg file |