Makefile.in | 12 ++++++------
solenv/gbuild/platform/unxgcc.mk | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit f8b7720ca56e16d718593da8fc394dd91362fbf1
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Nov 25 16:44:45 2011 +0100
dev-install seems to poison the env
diff --git a/Makefile.in b/Makefile.in
index 78608d7..86acb64 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -173,4 +173,4 @@ findunusedcode:
unitcheck: build
subsequentcheck: dev-install
allcheck : dev-install
-debugrun : dev-install
+#debugrun : dev-install # disabled for now, this dep seems to poison the
debugrun !?
commit c036777b4930e5c4ab34f035b8de749a7f80e42a
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Nov 25 16:41:28 2011 +0100
gbuild need no env anymore
diff --git a/Makefile.in b/Makefile.in
index 82dca9a..78608d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,16 +56,16 @@ dev-install: build
fi
debugrun:
- @. ./Env.Host.sh && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk debugrun
+ @ @GNUMAKE@ -f $(dir $(realpath $(firstword
$(MAKEFILE_LIST))))/GNUmakefile.mk debugrun
check : allcheck
@true
%check:
- @. ./Env.Host.sh && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk -r \
- $(if @VERBOSE@,,-s) --jobs="$(if \
-
$(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)" \
- $(patsubst allcheck,check,$@)
+ @ @GNUMAKE@ -f $(dir $(realpath $(firstword
$)MAKEFILE_LIST))))/GNUmakefile.mk -r \
+ $(if @VERBOSE@,,-s) --jobs="$(if \
+
$(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)" \
+ $(patsubst allcheck,check,$@)
cross-build-toolset:
@. ./Env.Build.sh && \
commit faa11fecdbca8cdba62a6cc5610c311fcbe0e607
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Nov 25 16:40:02 2011 +0100
fix default junit soffice path
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d34d4a1..9d07c9f 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -383,7 +383,7 @@ else
ifneq ($(gb_JunitTest_DEBUGRUN),)
gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER)
else
-gb_JunitTest_SOFFICEARG:=$(OUTDIR)/installation/opt/program/soffice"
+gb_JunitTest_SOFFICEARG:=path:$(OUTDIR)/installation/opt/program/soffice
endif
endif
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
