Kaydet (Commit) 4db62dfb authored tarafından Peter Foley's avatar Peter Foley

quiet FCFGMerge

Change-Id: I17a2f2fd51a06195af3b5b7325b3bad1129c01d2
üst 6388703a
......@@ -24,7 +24,8 @@
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
$(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge \
$(if $(VERBOSE)$(verbose),-verbose)
### filter configuration rules: generic stuff #######################
......
......@@ -39,6 +39,7 @@ PROP_FCFG = "fcfg" # // <= cmdline
PROP_LCFG = "lcfg" # // <= cmdline
PROP_CCFG = "ccfg" # // <= cmdline
PROP_LANGUAGEPACK = "languagepack" # // <= cmdline
PROP_VERBOSE = "verbose" # // <= cmdline
PROP_ITEMS = "items" # // <= pkg cfg files!
#---begin java.util.Properties copy---#
......@@ -275,9 +276,11 @@ def readprops(buff):
# @author Andreas Schluens
#
def run(sCmdLine):
printCopyright()
aCfg = ConfigHelper(CFGFILE, sCmdLine)
if aCfg.getValueWithDefault(PROP_VERBOSE,None) == None:
sys.stdout=None
printCopyright()
# help requested?
if aCfg.isHelp():
......@@ -349,7 +352,7 @@ class ConfigHelper:
count = len(lCommandLineArgs)
self.m_bEmpty = (count < 1)
print(lCommandLineArgs, "and len is", count)
# print(lCommandLineArgs, "and len is", count)
for arg in range(count):
# is it a named-value argument?
# Note: We ignores double "=" signs! => search from left to right
......
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