[Libreoffice-commits] .: Branch 'feature/gbuildfixes' - 6 commits - solenv/gbuild
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Thu Dec 1 16:30:25 PST 2011
solenv/gbuild/CppunitTest.mk | 8 +---
solenv/gbuild/CustomTarget.mk | 2 +
solenv/gbuild/Helper.mk | 3 -
solenv/gbuild/JunitTest.mk | 8 +---
solenv/gbuild/Module.mk | 4 --
solenv/gbuild/extensions/post_AuxTargets.mk | 2 -
solenv/gbuild/extensions/post_DisableIosUnitchecks.mk | 34 ++++++++++++++++++
solenv/gbuild/gbuild.mk | 6 ---
8 files changed, 43 insertions(+), 24 deletions(-)
New commits:
commit d095f3ac28f987d6e00270d3c0ca754d5c0f6533
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Dec 2 01:06:08 2011 +0100
update JunitTest hint
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 8f7c6ae..5ce0b3f 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -58,7 +58,7 @@ $(call gb_JunitTest_get_target,%) :
&& echo "see full error log at $@.log" \
&& echo "to rerun just this failed test without all others, run:" \
&& echo && echo " make $@" && echo \
- && echo "add \"-f $(SRCDIR)/GNUmakefile.mk\" if you are not in the module dir" \
+ && echo "cd into the module dir if you do not want a full dev-install run" \
&& echo "Or to do interactive debugging, run two shells with (Linux only):" \
&& echo \
&& echo " make debugrun" \
commit c7af6c26a06b6117b442268cfe0235264f2e6e27
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Dec 2 01:02:59 2011 +0100
move platform hacks out of gbuild core
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 55cab3b..b410cfa 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -211,12 +211,10 @@ endef
# why shouldn't it be.
define gb_Module_add_check_target
-$(if $(filter-out IOS,$(OS)),\
$(call gb_Module__read_targetfile,$(1),$(2),check target)
$(call gb_Module_get_check_target,$(1)) : $$(gb_Module_CURRENTTARGET)
$(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
-)
endef
diff --git a/solenv/gbuild/extensions/post_DisableIosUnitchecks.mk b/solenv/gbuild/extensions/post_DisableIosUnitchecks.mk
new file mode 100644
index 0000000..01914a1
--- /dev/null
+++ b/solenv/gbuild/extensions/post_DisableIosUnitchecks.mk
@@ -0,0 +1,34 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+# disable check target on IOS
+ifeq ($(OS),IOS)
+gb_Module_add_check_target=
+endif
+
+
+# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
commit 2aba32e19281d96a6502fafb20ac5ace61f073c9
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Dec 2 00:55:04 2011 +0100
build-order only from debugrun for now
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index c061099..55cab3b 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -116,7 +116,7 @@ else
gb_Module_BUILDHINT=
gb_Module_DEVINSTALLHINT=
-debugrun : build
+debugrun :| build
endif
all : build unitcheck
commit 661b9b8bd08c5291fdbc84edad57c3420a74e35d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Nov 30 15:08:01 2011 +0100
do not globally export gb_Helper_execute gb_Helper_set_ld_path
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 88e5f99..c55e6d8 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -31,6 +31,7 @@ define gb_CustomTarget__command
+$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
gb_AWK=$(gb_AWK) gb_XSLTPROC=$(gb_XSLTPROC) GBUILDDIR=$(GBUILDDIR) SRCDIR=$(SRCDIR) \
+ gb_Helper_set_ld_path=$(gb_Helper_set_ld_path) gb_Helper_execute=$(gb_Helper_execute) \
$(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
touch $(1))
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 8214468..881aed9 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -168,9 +168,6 @@ define gb_Helper_execute
$(call gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
endef
-export gb_Helper_set_ld_path
-export gb_Helper_execute
-
# gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use
# for libraries from the OUTDIR
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index e585745..b8a002f 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -50,7 +50,7 @@ fetch: $(SRCDIR)/src.downloaded
# fixme: can we prevent these exports in the first place?
$(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in
- $(if $(gb_MINISOLARENV),unset gb_Helper_execute gb_Helper_set_ld_path && $(SRCDIR)/autogen.sh, at echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2)
+ $(if $(gb_MINISOLARENV),$(SRCDIR)/autogen.sh, at echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2)
$(WORKDIR)/bootstrap:
@cd $(SRCDIR) && ./bootstrap
commit 23dde59a5524cfbbed4157bfa3292ae61491904a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Nov 30 15:04:37 2011 +0100
do not globally export G_SLICE, GLIBCXX_FORCE_NEW, DBGSV_ERROR_OUT
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index afae72e..aa87be6 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -29,9 +29,6 @@
# CppunitTest class
-# in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
-DBGSV_ERROR_OUT := shell
-export DBGSV_ERROR_OUT
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."
@@ -46,17 +43,16 @@ ifneq ($(strip $(VALGRIND)),)
gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50
ifeq ($(strip $(VALGRIND)),memcheck)
G_SLICE := always-malloc
-export G_SLICE
GLIBCXX_FORCE_NEW := 1
-export GLIBCXX_FORCE_NEW
endif
endif
# defined by platform
# gb_CppunitTest_TARGETTYPE
# gb_CppunitTest_get_filename
+# DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunittester)
-gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTTARGET)
+gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) $(if $(G_SLICE),G_SLICE=$(G_SLICE)) $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) DBGSV_ERROR_OUT=shell STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTTARGET)
gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
# TODO: move this to platform under suitable name
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index b6ce903..8f7c6ae 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -31,9 +31,6 @@
gb_JunitTest_JAVACOMMAND := $(JAVAINTERPRETER) $(JAVAIFLAGS)
-# in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
-DBGSV_ERROR_OUT := shell
-export DBGSV_ERROR_OUT
.PHONY : $(call gb_JunitTest_get_clean_target,%)
$(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_JunitTest_get_classsetname,%))
@@ -42,13 +39,14 @@ $(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_targe
ifneq (,$(strip $(OOO_JUNIT_JAR)))
+# DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
.PHONY : $(call gb_JunitTest_get_target,%)
$(call gb_JunitTest_get_target,%) :
$(call gb_Output_announce,$*,$(true),JUT,2)
$(call gb_Helper_abbreviate_dirs_native,\
rm -rf $(call gb_JunitTest_get_userdir,$*) && \
mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
- ($(gb_JunitTest_JAVACOMMAND) \
+ (DBGSV_ERROR_OUT=shell $(gb_JunitTest_JAVACOMMAND) \
-cp "$(CLASSPATH)" \
$(DEFS) \
org.junit.runner.JUnitCore \
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index 962f275..e585745 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -50,7 +50,7 @@ fetch: $(SRCDIR)/src.downloaded
# fixme: can we prevent these exports in the first place?
$(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in
- $(if $(gb_MINISOLARENV),unset GBUILDDIR gb_Helper_execute gb_XSLTPROC gb_Helper_set_ld_path gb_AWK DBGSV_ERROR_OUT && $(SRCDIR)/autogen.sh, at echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2)
+ $(if $(gb_MINISOLARENV),unset gb_Helper_execute gb_Helper_set_ld_path && $(SRCDIR)/autogen.sh, at echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2)
$(WORKDIR)/bootstrap:
@cd $(SRCDIR) && ./bootstrap
commit ba1430bdfbf7d60569cc8d0b44baa7f3ffb07a27
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Nov 30 14:49:13 2011 +0100
do not globally export gb_AWK, GBUILDDIR, SRCDIR, gb_XSLTPROC
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index a75c1f8..88e5f99 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -30,6 +30,7 @@
define gb_CustomTarget__command
+$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
+ gb_AWK=$(gb_AWK) gb_XSLTPROC=$(gb_XSLTPROC) GBUILDDIR=$(GBUILDDIR) SRCDIR=$(SRCDIR) \
$(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
touch $(1))
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index d7033f0..9f0b32b 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -331,12 +331,6 @@ gb_PYTHONTARGET := $(OUTDIR)/bin/python
gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET)
endif
-export gb_AWK
-export gb_XSLTPROC
-export GBUILDDIR
-# FIXME exporting SRCDIR seems kind of a hack
-export SRCDIR
-
define gb_HelpMessage
NAME
gbuild - GNU make based build system for LibreOffice
More information about the Libreoffice-commits
mailing list