[Libreoffice-commits] core.git: 5 commits - bin/module-deps.pl clucene/Library_clucene.mk filter/Configuration_filter.mk filter/source solenv/gbuild
Peter Foley
pefoley2 at verizon.net
Sat Mar 16 13:14:18 PDT 2013
bin/module-deps.pl | 2 +-
clucene/Library_clucene.mk | 3 +++
filter/Configuration_filter.mk | 3 ++-
filter/source/config/tools/merge/pyAltFCFGMerge | 9 ++++++---
solenv/gbuild/CppunitTest.mk | 2 +-
solenv/gbuild/Postprocess.mk | 6 +++---
solenv/gbuild/TargetLocations.mk | 2 +-
7 files changed, 17 insertions(+), 10 deletions(-)
New commits:
commit 7956ff62ee9a4b82f64d19d51cccddd73bc49d1e
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Mar 16 16:14:07 2013 -0400
cleanup postprocess output
Change-Id: I4287adbe97e8abc65b4bb36be8c9ec44799767d8
diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk
index e0c448d..3e2a1cf 100644
--- a/solenv/gbuild/Postprocess.mk
+++ b/solenv/gbuild/Postprocess.mk
@@ -26,9 +26,9 @@ define gb_Postprocess_make_targets
$(call gb_Postprocess_Postprocess,AllExecutables,All executables)
$(call gb_Postprocess_Postprocess,AllLibraries,All libraries)
$(call gb_Postprocess_Postprocess,AllModulesButInstsetNative,All modules but instset,$(WORKDIR)/Module/)
-$(call gb_Postprocess_Postprocess,AllPackages,All packages)
-$(call gb_Postprocess_Postprocess,AllResources,All resources)
-$(call gb_Postprocess_Postprocess,AllUIs,All UI files)
+$(call gb_Postprocess_Postprocess,AllPackages,All packages,$(WORKDIR)/Package/)
+$(call gb_Postprocess_Postprocess,AllResources,All resources,$(WORKDIR)/AllLangRes/)
+$(call gb_Postprocess_Postprocess,AllUIs,All UI files,$(WORKDIR)/UI/)
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index eb31b58..7434e65 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -190,7 +190,7 @@ gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/SrsTemplatePartTarget/$(firstwo
gb_SrsTemplateTarget_get_include_dir = $(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))
gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
gb_ThesaurusIndexTarget_get_target = $(WORKDIR)/ThesaurusIndexTarget/$(basename $(1)).idx
-gb_UI_get_target = $(WORKDIR)/UI/$(1).done
+gb_UI_get_target = $(WORKDIR)/UI/$(1)
gb_UILocalizeTarget_get_target = $(WORKDIR)/UILocalizeTarget/$(1).done
gb_UILocalizeTarget_get_workdir = $(WORKDIR)/UILocalizeTarget/$(1)
gb_UnoApiTarget_get_external_headers_target = $(WORKDIR)/UnoApiTarget/$(1).external
commit c71131e83f0d75ead253e3f7f2b53ef9872c20ca
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Mar 16 16:11:55 2013 -0400
auto-load the gdb helpers for cppunit test debugging
Change-Id: I75e08fa1de5affdb3b42d169bb5ccac50c8c736e
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index aa3900b..8e809d0 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -33,7 +33,7 @@
UNIT_FAILED_MSG := echo; echo "Error: a unit test failed, please do one of:"; echo; echo "export DEBUGCPPUNIT=TRUE \# for exception catching"; echo "export GDBCPPUNITTRACE=\"gdb --args\" \# for interactive debugging"; echo "export VALGRIND=memcheck \# for memory checking" ; echo "and retry."
ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
-gb_CppunitTest_GDBTRACE := gdb -nx --command=$(SOLARENV)/bin/gdbtrycatchtrace-stdout -return-child-result --args
+gb_CppunitTest_GDBTRACE := gdb -nx -ex "add-auto-load-safe-path $(OUTDIR)/lib" --command=$(SOLARENV)/bin/gdbtrycatchtrace-stdout -return-child-result --args
else ifneq ($(strip $(GDBCPPUNITTRACE)),)
gb_CppunitTest_GDBTRACE := $(GDBCPPUNITTRACE)
gb_CppunitTest__interactive := $(true)
commit df78a7e1c9069414348ae4fd006b3a8096af4b94
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Mar 16 12:47:52 2013 -0400
perl defined is deprecated
Change-Id: Ibe63cf7c70dc12ae76a6d21ef8c05c58c684eb82
diff --git a/bin/module-deps.pl b/bin/module-deps.pl
index 49ffedf..4ed9ca8 100755
--- a/bin/module-deps.pl
+++ b/bin/module-deps.pl
@@ -214,7 +214,7 @@ sub collapse_lib_to_module($)
my $result = $tree->{$name};
# sal has no dependencies, take care of it
# otherwise it doesn't have target key
- if (!defined(@{$result->{deps}})) {
+ if (!@{$result->{deps}}) {
$digraph{$name}{target} = $result->{target};
}
for my $dep (@{$result->{deps}}) {
commit 4db62dfbce440864df27c0a99ae46866fb4c16ca
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Mar 16 09:38:38 2013 -0400
quiet FCFGMerge
Change-Id: I17a2f2fd51a06195af3b5b7325b3bad1129c01d2
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 2cd9119..45ca965 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -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 #######################
diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge b/filter/source/config/tools/merge/pyAltFCFGMerge
index 7c725ce..1baecf6 100755
--- a/filter/source/config/tools/merge/pyAltFCFGMerge
+++ b/filter/source/config/tools/merge/pyAltFCFGMerge
@@ -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
commit 6388703a76be472d47c16714bc7f31741bab1f27
Author: Peter Foley <pefoley2 at verizon.net>
Date: Fri Mar 15 21:41:25 2013 -0400
suppress warnings for clucene c files too
Change-Id: Ib83a140035637820cab34efc8e94cdd75c499b82
diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 72a1dcc..78da81f 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -55,6 +55,9 @@ $(eval $(call gb_Library_add_defs,clucene,\
$(eval $(call gb_Library_add_cxxflags,clucene,\
-w \
))
+$(eval $(call gb_Library_add_cflags,clucene,\
+ -w \
+))
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,clucene,\
More information about the Libreoffice-commits
mailing list