Skip to content

C
core
Kaydet (Commit) 08914f9a authored tarafından Matúš Kukan's avatar Matúš Kukan
Dosyalara gözat
Seçenekler

oops, path to FCFGMerge.cfg is hardcoded in the script 

Change-Id: I87c5373748a03800a889eb29f1d203291dd87d85
üst 05680f9d
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
filter/Configuration_filter.mk
Dosyayı görüntüle @ 08914f9a
...@@ -25,7 +25,6 @@ filter_MERGE_TARGET := $(call gb_ExternalExecutable_get_dependencies,python) \ ...@@ -25,7 +25,6 @@ filter_MERGE_TARGET := $(call gb_ExternalExecutable_get_dependencies,python) \
$(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge
filter_MERGE := $(call gb_ExternalExecutable_get_command,python) \ filter_MERGE := $(call gb_ExternalExecutable_get_command,python) \
$(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge
filter_MERGE_CONFIG_TARGET := $(SRCDIR)/filter/source/config/tools/merge/FCFGMerge.cfg
### filter configuration rules: generic stuff ####################### ### filter configuration rules: generic stuff #######################
...@@ -35,7 +34,7 @@ filter_XcuFilterTypesTarget_get_target = $(WORKDIR)/XcuFilterTypesTarget/$(1) ...@@ -35,7 +34,7 @@ filter_XcuFilterTypesTarget_get_target = $(WORKDIR)/XcuFilterTypesTarget/$(1)
filter_XcuFilterTypesTarget_get_clean_target = \ filter_XcuFilterTypesTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterTypesTarget/$(1) $(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_Output_announce,$*,$(true),XCU,1)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \ mkdir -p $(dir $@) && \
...@@ -83,7 +82,7 @@ filter_XcuFilterFiltersTarget_get_target = \ ...@@ -83,7 +82,7 @@ filter_XcuFilterFiltersTarget_get_target = \
filter_XcuFilterFiltersTarget_get_clean_target = \ filter_XcuFilterFiltersTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterFiltersTarget/$(1) $(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_Output_announce,$*,$(true),XCU,1)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \ mkdir -p $(dir $@) && \
...@@ -116,7 +115,7 @@ filter_XcuFilterOthersTarget_get_target = $(WORKDIR)/XcuFilterOthersTarget/$(1) ...@@ -116,7 +115,7 @@ filter_XcuFilterOthersTarget_get_target = $(WORKDIR)/XcuFilterOthersTarget/$(1)
filter_XcuFilterOthersTarget_get_clean_target = \ filter_XcuFilterOthersTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterOthersTarget/$(1) $(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_Output_announce,$*,$(true),XCU,1)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \ mkdir -p $(dir $@) && \
...@@ -154,7 +153,7 @@ filter_XcuFilterInternalTarget_get_target = \ ...@@ -154,7 +153,7 @@ filter_XcuFilterInternalTarget_get_target = \
filter_XcuFilterInternalTarget_get_clean_target = \ filter_XcuFilterInternalTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterInternalTarget/$(1) $(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_Output_announce,$*,$(true),XCU,1)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \ mkdir -p $(dir $@) && \
...@@ -200,7 +199,7 @@ filter_XCU_filter := org/openoffice/TypeDetection/Filter.xcu ...@@ -200,7 +199,7 @@ filter_XCU_filter := org/openoffice/TypeDetection/Filter.xcu
filter_XcuResTarget_get_target = \ filter_XcuResTarget_get_target = \
$(call gb_XcuResTarget_get_target,fcfg_langpack/$(1)/$(filter_XCU_filter)) $(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_Output_announce,$(filter_XcuFilterUiTarget),$(true),XCU,1)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \ mkdir -p $(dir $@) && \
......
filter/source/config/tools/merge/pyAltFCFGMerge
Dosyayı görüntüle @ 08914f9a
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
import sys, string, os.path, codecs 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_XMLVERSION = "xmlversion" # // <= global cfg file
PROP_XMLENCODING = "xmlencoding" # // <= global cfg file PROP_XMLENCODING = "xmlencoding" # // <= global cfg file
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment