[Libreoffice-commits] .: Makefile.in set_soenv.in

Caolán McNamara caolan at kemper.freedesktop.org
Thu Dec 2 06:07:16 PST 2010


 Makefile.in  |    8 +++++++-
 set_soenv.in |    1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 2935731635e0decc1a2a4790da1cec894a392a77
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 2 14:06:21 2010 +0000

    make smoketest use ooinstal to build its install set

diff --git a/Makefile.in b/Makefile.in
index 10b003e..9e05c70 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,7 +6,7 @@ SHELL=/bin/sh
 all: dmake/dmake at EXEEXT@ fetch
 	@. ./*[Ee]nv.[Ss]et.sh && \
         cd instsetoo_native && \
-        ../solenv/bin/build.pl -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
+        build.pl -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
 
 install:
 	@. ./*[Ee]nv.[Ss]et.sh && \
@@ -40,3 +40,9 @@ src/downloaded: ooo.lst download
 	$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
 
 fetch: src/downloaded
+
+check:
+	@. ./*[Ee]nv.[Ss]et.sh && \
+	cd smoketestoo_native && \
+	export SAL_USE_VCLPLUGIN="svp" && \
+        build.pl -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
diff --git a/set_soenv.in b/set_soenv.in
index 464056e..2c56a4d 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -2167,6 +2167,7 @@ print "*********************************************************".
 print "To build, issue:\nmake\n\n";
 print "To install when the build is finished, issue:\nmake install\n\n";
 print "If you want to develop LibreOffice, you might prefer:\nmake dev-install\n\n";
+print "If you want to run the smoketest, issue:\nmake check\n\n";
 
 $bootfile = "bootstrap";
 open( OUT, ">$bootfile" ) ||


More information about the Libreoffice-commits mailing list