ooo-build r12842 - in trunk: . bin

[tml svn gnome org]

Author: tml
Date: Tue Jun 10 10:57:19 2008
New Revision: 12842
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12842&view=rev

Log:
2008-06-10  Tor Lillqvist  <tml novell com>

	* bin/build-ooo: Don't say "A very clean straight-through build -
	deferring dep generation" and then immediately afterwards
	"Building with full dependencies - for win32".

	Create the $OOBUILDDIR/external/msvcp90 folder on Windows for the
	MSVS9 runtime DLLs.



Modified:
   trunk/ChangeLog
   trunk/bin/build-ooo

Modified: trunk/bin/build-ooo
==============================================================================
--- trunk/bin/build-ooo	(original)
+++ trunk/bin/build-ooo	Tue Jun 10 10:57:19 2008
@@ -72,9 +72,9 @@
 # Check to see if dmake was not there - if not, this is a from-pristine build
 echo "Build: z$BUILD_DMAKE == zYES -a ! -f $SOLARENV/$OUTPATH/bin/dmake";
 if test "z$BUILD_DMAKE" == "zYES" -a ! -f "$SOLARENV/$OUTPATH/bin/dmake"; then
-    echo "A very clean straight-through build - deferring dep generation"
     if test "z$BUILD_WIN32" != "zyes"; then
 	# Accelerate straight-through compiles by not building / using dependencies
+	echo "A very clean straight-through build - deferring dep generation"
 	export nodep=1
     else
 	echo "Building with full dependencies - for win32"
@@ -118,6 +118,11 @@
 echo "Env:"
 set
 
+if test "z$BUILD_WIN32" != "z" -a "z$PREVIOUS_IDT_DIR" = "z"; then
+    export PREVIOUS_IDT_DIR="$TOOLSDIR/previous-idt-dirs/Novell-OOo-2.4.0-16"
+    mkdir -p $OOBUILDDIR/external/msvcp90
+fi
+
 # update localizations from external sources
 # FIXME temporary hack to merge the GSI files
 cd $TOOLSDIR/bin
@@ -127,10 +132,6 @@
 
 echo 'Commencing main build'
 
-if test "z$BUILD_WIN32" != "z" -a "z$PREVIOUS_IDT_DIR" = "z"; then
-    export PREVIOUS_IDT_DIR="$TOOLSDIR/previous-idt-dirs/Novell-OOo-2.4.0-16"
-fi
-
 cd $OOBUILDDIR/instsetoo_native || exit 1;
 perl $SOLARENV/bin/build.pl --all $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
 OOO_REBUILD_NEEDED="no"