[Libreoffice-commits] .: 2 commits - Makefile.in Mesa/prj solenv/bin

[Stephan Bergmann]

 Makefile.in                |    3 ++-
 Mesa/prj/build.lst         |    2 +-
 solenv/bin/subsequenttests |   29 -----------------------------
 3 files changed, 3 insertions(+), 31 deletions(-)

New commits:
commit 387620beff3c24f90a7a790821a6d87675aba961
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 14 15:16:40 2011 +0200

    Removed solenv/bin/subsequenttests, moved its (improved) content directly into Makefile.in.

diff --git a/Makefile.in b/Makefile.in
index c9480c5..7b891f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,7 +96,8 @@ check: Makefile dmake/dmake at EXEEXT_FOR_BUILD@ fetch
 	cd smoketestoo_native && \
 	export SAL_USE_VCLPLUGIN="svp" && \
         build.pl -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
-	@. ./Env.Host.sh && $$SOLARENV/bin/subsequenttests
+	@. ./Env.Host.sh && @GNUMAKE@ -f $$SRC_ROOT/GNUmakefile.mk -r \
+            $(if @VERBOSE@,,-s) -j at GMAKE_PARALLELISM@ subsequentcheck
 
 id:
 	@. ./Env.Host.sh && \
diff --git a/solenv/bin/subsequenttests b/solenv/bin/subsequenttests
deleted file mode 100755
index 5052523..0000000
--- a/solenv/bin/subsequenttests
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# 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.
-#
-# The Initial Developer of the Original Code is
-#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen at canonical.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# 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.
-set -e
-${GNUMAKE} -sf ${SOLARSRC}/GNUmakefile.mk subsequentcheck $*
commit 109ca35257a45226e89cbd3152f5aca86f8b99d5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 13 13:33:25 2011 +0200

    Added more missing dependencies on solenv back into build.lsts.

diff --git a/Mesa/prj/build.lst b/Mesa/prj/build.lst
index b5b8387..a8b0026 100644
--- a/Mesa/prj/build.lst
+++ b/Mesa/prj/build.lst
@@ -1,2 +1,2 @@
-me  Mesa : NULL
+me  Mesa : solenv NULL
 me  Mesa\prj	nmake	-	all	me_prj NULL