ooo-build r15256 - in branches/ooo-build-3-0-1: . bin

[strba svn gnome org]

Author: strba
Date: Fri Jan 30 16:20:13 2009
New Revision: 15256
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15256&view=rev

Log:
get the srcdir and toolsdir/src correctly

Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/bin/unpack

Modified: branches/ooo-build-3-0-1/bin/unpack
==============================================================================
--- branches/ooo-build-3-0-1/bin/unpack	(original)
+++ branches/ooo-build-3-0-1/bin/unpack	Fri Jan 30 16:20:13 2009
@@ -195,7 +195,7 @@
 		ln -s "$BUILDDIR/$CVSTAG-$PIECE" $OOBUILDDIR
 		# ugly hack around odd positioning of this info
 		echo "Unpacking setup_native .txt pieces"
-		($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-ooo300-m3.tar.bz2 | $GNUTAR xpf - ) || exit
+		($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-ooo300-m4.tar.bz2 | $GNUTAR xpf - ) || exit
 	fi
 fi
 
@@ -275,7 +275,7 @@
 
 # copy in misc Mono related dlls if we need to
 # we can't build them on Unix.
-OOO_CLI_PREBUILT_ARCHIVE=ooo-cli-prebuilt-3.0.1.tar.bz2
+OOO_CLI_PREBUILT_ARCHIVE=ooo-cli-prebuilt-3.0.tar.bz2
 if test "z$PIECE" = "z"; then
 if test -f "$SRCDIR/$OOO_CLI_PREBUILT_ARCHIVE"; then
     mkdir -p $OOBUILDDIR/external/cli
@@ -283,6 +283,11 @@
 fi
 fi
 
+if test "$ENABLE_GRAPHITE" = "TRUE"; then
+    mkdir -p $OOBUILDDIR/graphite/download
+    $GNUCP -af $SRCDIR/$GRAPHITE_SRC $OOBUILDDIR/graphite/download
+fi
+
 # Win32 prerequisites ...
 if test "z$BUILD_WIN32" != "z"; then
 
@@ -334,9 +339,9 @@
     cd $BUILDDIR;
     APACHE_ANT='apache-ant-1.7.0'
     APACHE_ANT_TARBALL=$APACHE_ANT-bin.tar.gz
-    if test -f $TOOLSDIR/src/$APACHE_ANT_TARBALL; then
+    if test -f $SRCDIR/$APACHE_ANT_TARBALL; then
 	$echo_n "Extracting ant $echo_c"
-	(gunzip -dc $TOOLSDIR/src/$APACHE_ANT_TARBALL | $GNUTAR xpf - )|| exit 1;
+	(gunzip -dc $SRCDIR/$APACHE_ANT_TARBALL | $GNUTAR xpf - )|| exit 1;
 	echo "done";
     else
 	echo "Don't need to unpack ant";
@@ -347,9 +352,9 @@
     # Bypass the Mozilla source bits for now
     if false; then
 
-    if test -f $TOOLSDIR/src/$BUILD_MOZILLA_SOURCE;  then
+    if test -f $SRCDIR/$BUILD_MOZILLA_SOURCE;  then
         $echo_n "Installing Mozilla source $echo_c"
-	$GNUCP -f $TOOLSDIR/src/$BUILD_MOZILLA_SOURCE $OOBUILDDIR/moz/download || exit 1;
+	$GNUCP -f $SRCDIR/$BUILD_MOZILLA_SOURCE $OOBUILDDIR/moz/download || exit 1;
 	echo "done";
     else
 	echo "Don't need to unpack Mozilla sources";
@@ -365,8 +370,8 @@
 	echo "Already have Mozilla libIDL sources";
     else
         $echo_n "Installing Mozilla libIDL source $echo_c"
-	$GNUCP -f $TOOLSDIR/src/$MOZILLA_IDL_SRC $OOBUILDDIR/moz/download || exit 1;
-	$GNUCP -f $TOOLSDIR/src/$MOZILLA_IDL_PATCH $OOBUILDDIR/moz/download || exit 1;
+	$GNUCP -f $SRCDIR/$MOZILLA_IDL_SRC $OOBUILDDIR/moz/download || exit 1;
+	$GNUCP -f $SRCDIR/$MOZILLA_IDL_PATCH $OOBUILDDIR/moz/download || exit 1;
 	echo "done";
     fi
 
@@ -374,8 +379,8 @@
 	echo "Already have Mozilla GLib source";
     else
         $echo_n "Installing Mozilla GLib source $echo_c"
-	$GNUCP -f $TOOLSDIR/src/$MOZILLA_GLIB_SRC $OOBUILDDIR/moz/download || exit 1;
-	$GNUCP -f $TOOLSDIR/src/$MOZILLA_GLIB_PATCH $OOBUILDDIR/moz/download || exit 1;
+	$GNUCP -f $SRCDIR/$MOZILLA_GLIB_SRC $OOBUILDDIR/moz/download || exit 1;
+	$GNUCP -f $SRCDIR/$MOZILLA_GLIB_PATCH $OOBUILDDIR/moz/download || exit 1;
 	echo "done";
     fi
 
@@ -383,7 +388,7 @@
 	echo "Already have Mozilla wintools";
     else
         $echo_n "Installing Mozilla wintools $echo_c"
-	$GNUCP -f $TOOLSDIR/src/$MOZILLA_WINTOOLS_BIN $OOBUILDDIR/moz/download || exit 1;
+	$GNUCP -f $SRCDIR/$MOZILLA_WINTOOLS_BIN $OOBUILDDIR/moz/download || exit 1;
 	echo "done";
     fi
 
@@ -399,9 +404,9 @@
 	echo "Already have the prebuilt Mozilla zip files";
     else
         $echo_n "Installing prebuilt Mozilla zip files $echo_c"
-	$GNUCP -f $TOOLSDIR/src/$MOZILLA_PREBUILT_INC $OOBUILDDIR/moz/zipped || exit 1;
-	$GNUCP -f $TOOLSDIR/src/$MOZILLA_PREBUILT_LIB $OOBUILDDIR/moz/zipped || exit 1;
-	$GNUCP -f $TOOLSDIR/src/$MOZILLA_PREBUILT_RUNTIME $OOBUILDDIR/moz/zipped || exit 1;
+	$GNUCP -f $SRCDIR/$MOZILLA_PREBUILT_INC $OOBUILDDIR/moz/zipped || exit 1;
+	$GNUCP -f $SRCDIR/$MOZILLA_PREBUILT_LIB $OOBUILDDIR/moz/zipped || exit 1;
+	$GNUCP -f $SRCDIR/$MOZILLA_PREBUILT_RUNTIME $OOBUILDDIR/moz/zipped || exit 1;
 	echo "done";
     fi
 
@@ -439,13 +444,13 @@
 	chmod a+x $OOBUILDDIR/external/msi/instmsiw.exe
     fi
 
-    if test -f $TOOLSDIR/src/$AGFA_MONOTYPE_FONTS_SOURCE; then
+    if test -f $SRCDIR/$AGFA_MONOTYPE_FONTS_SOURCE; then
         if test -f $OOBUILDDIR/agfa_monotype_fonts/download/$AGFA_MONOTYPE_FONTS_SOURCE; then
             echo "Already have the Agfa Monotype fonts"
 	else
 	    $echo_n "Installing Agfa Monotype fonts $echo_c"
 	    mkdir -p $OOBUILDDIR/agfa_monotype_fonts/download
-	    $GNUCP -f $TOOLSDIR/src/$AGFA_MONOTYPE_FONTS_SOURCE $OOBUILDDIR/agfa_monotype_fonts/download || exit 1
+	    $GNUCP -f $SRCDIR/$AGFA_MONOTYPE_FONTS_SOURCE $OOBUILDDIR/agfa_monotype_fonts/download || exit 1
 	    echo "done"
         fi
 	if grep 'Agfa Monotype' $OOBUILDDIR/readlicense_oo/html/THIRDPARTYLICENSEREADME.html; then
@@ -458,7 +463,7 @@
     else
         case "$DISTRO" in
 	    NovellWin32*)
-	        echo Missing $TOOLSDIR/src/$AGFA_MONOTYPE_FONTS_SOURCE
+	        echo Missing $SRCDIR/$AGFA_MONOTYPE_FONTS_SOURCE
 		echo which should always be included when building $DISTRO
 		exit 1
 		;;
@@ -484,6 +489,18 @@
         mkdir -p $OOBUILDDIR/moz/download || exit 1
         $GNUCP -a $SRCDIR/$BUILD_MOZILLA_SOURCE $OOBUILDDIR/moz/download/ || exit 1
     fi
+
+    cd $BUILDDIR;
+    APACHE_ANT='apache-ant-1.7.0'
+    APACHE_ANT_TARBALL=$APACHE_ANT-bin.tar.gz
+    if test -f $SRCDIR/$APACHE_ANT_TARBALL; then
+	$echo_n "Extracting ant $echo_c"
+	(gunzip -dc $SRCDIR/$APACHE_ANT_TARBALL | $GNUTAR xpf - )|| exit 1;
+	echo "done";
+    else
+	echo "Don't need to unpack ant";
+    fi
+
 fi
 
 case "$DISTRO" in