X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fbootstrap;h=f2398d25f7122fe5af41560e5ec40de6280f60f7;hb=88a964cff54a732fd42f3a479122a0b1894c8852;hp=85fb254aee7515fe36b448d4cca726a20a4676cb;hpb=18f426c62a55555033ed25ae1b0037638b18553f;p=synfig.git

diff --git a/synfig-core/trunk/bootstrap b/synfig-core/trunk/bootstrap
index 85fb254..f2398d2 100755
--- a/synfig-core/trunk/bootstrap
+++ b/synfig-core/trunk/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
-# Sinfg Bootstrap Script
-# $Id: bootstrap,v 1.2 2005/01/10 07:40:26 darco Exp $
+# Synfig Bootstrap Script
+# $Id$
 # 
 # This script creates the configure script and Makefile.in files,
 # and also fixes a few things in both to ensure a smooth build
@@ -9,13 +9,17 @@
 #
 
 # Grab the current directory and move to our own
-CURR_DIR=$(pwd)
-cd $(dirname $0)
+CURR_DIR="$(pwd)"
+cd "$(dirname $0)"
 
 # Environment Variables
-BOOTSTRAP_NAME=$(basename $0)
-CONFIG_DIR=$(pwd)/config
+BOOTSTRAP_NAME="$(basename $0)"
+CONFIG_DIR="config"
 
+[ -x /bin/cygpath ] && CONFIG_DIR="`cygpath -m -s "$CONFIG_DIR"`"
+[ -x /bin/cygpath ] && CONFIG_DIR="`cygpath -u "$CONFIG_DIR"`"
+[ -x /bin/cygpath ] && CURR_DIR="`cygpath -m -s "$CURR_DIR"`"
+[ -x /bin/cygpath ] && CURR_DIR="`cygpath -u "$CURR_DIR"`"
 # Automake,Autoconf, and Libtool versions that we require
 #AUTOCONF_VERSION=2.5
 #AUTOMAKE_VERSION=1.6
@@ -25,7 +29,7 @@ export WANT_AUTOMAKE=1.8
 export WANT_AUTOCONF_2_5=1
 export WANT_AUTOCONF=2.5
 
-. $CONFIG_DIR/build.cfg
+. "$CONFIG_DIR/build.cfg"
 
 SED_SCRIPT="
 s/@PACKAGE@/$PACKAGE/g;
@@ -33,6 +37,7 @@ s/@PACKAGE_NAME@/$PACKAGE_NAME/g;
 s/@PACKAGE_BUGREPORT@/$PACKAGE_BUGREPORT/g;
 s/@PACKAGE_TARNAME@/$PACKAGE_TARNAME/g;
 s/@PACKAGE_VERSION@/$PACKAGE_VERSION/g;
+s|@SVN_REPOSITORY@|$SVN_REPOSITORY|g;
 s/@VERSION@/$VERSION/g;
 s/@API_VERSION@/$API_VERSION/g;
 s/@VERSION_MAJ@/$VERSION_MAJ/g;
@@ -53,7 +58,7 @@ cleanup () {
 	rm -fr config.cache autom4te*.cache configure.in $TEMPFILE
 }
 
-output Prepairing build environment for $PACKAGE-$VERSION...
+output Preparing build environment for $PACKAGE-$VERSION...
 
 # Look for the CVS directory. If we don't find it, we need to
 # ask the user if they know what they are doing.
@@ -138,21 +143,21 @@ RECONFIG_LTDL=1
 
 for FILENAME in doxygen.cfg pkgconfig.pc project.spec ; do {
 output Creating $FILENAME...
-sed "$SED_SCRIPT" < $CONFIG_DIR/$FILENAME.in > $FILENAME;
+sed "$SED_SCRIPT" < "$CONFIG_DIR/$FILENAME.in" > $FILENAME;
 } ; done
 
 output Renaming pkgconfig.pc to $PACKAGE_TARNAME.pc.in...
 mv pkgconfig.pc "$PACKAGE_TARNAME.pc.in"
 
-output Renaming project.spec to $PACKAGE-$VERSION.spec...
-mv project.spec "$PACKAGE-$VERSION.spec"
+output Renaming project.spec to $PACKAGE.spec...
+mv project.spec "$PACKAGE.spec"
 
-output Finishing up $PACKAGE-$VERSION.spec...
-echo %changelog >> "$PACKAGE-$VERSION.spec"
-cat NEWS >> "$PACKAGE-$VERSION.spec"
+output Finishing up $PACKAGE.spec...
+echo %changelog >> "$PACKAGE.spec"
+cat NEWS >> "$PACKAGE.spec"
 
 output Creating configure.in from configure.ac...
-sed "$SED_SCRIPT" < $CONFIG_DIR/configure.ac > configure.in;
+sed "$SED_SCRIPT" < "$CONFIG_DIR/configure.ac" > configure.in;
 
 output Setting up build environment...
 
@@ -162,7 +167,7 @@ set -x
 # Create all of the build environment files
 (
 	libtoolize -c -f --ltdl &&
-	aclocal -I $CONFIG_DIR $ACLOCAL_FLAGS &&
+	aclocal -I "$CONFIG_DIR" $ACLOCAL_FLAGS &&
 	autoheader &&
 	autoconf -o configure &&
 	automake --foreign --add-missing --copy --include-deps &&
@@ -186,7 +191,7 @@ set +x
 	(
 		cd libltdl &&
 		( echo "AC_CONFIG_AUX_DIR(../config)" >> configure.[ai][cn] ) &&
-		aclocal -I $CONFIG_DIR &&
+		aclocal -I "../$CONFIG_DIR" &&
 		autoheader &&
 		autoconf &&
 		automake --foreign --add-missing --copy
@@ -218,8 +223,8 @@ set +x
 (
 output Patching libtool...
 patch config/ltmain.sh config/ltmain.patch
-) ||
-{
+) || true
+false && {
 	# Something went wrong...
 	set +x
 	output Failure.
@@ -243,7 +248,7 @@ patch config/ltmain.sh config/ltmain.patch
 # sed "
 # s/g++ c++/g++3 g++ c++/;
 # s/gcc cc/gcc3 gcc cc/;
-# s:"'${prefix}/include'":"'${prefix}/include/sinfg'":;
+# s:"'${prefix}/include'":"'${prefix}/include/synfig'":;
 # s:PREFIX/include:PREFIX/include/ETL:;
 # " < configure > $TEMPFILE
 # cp $TEMPFILE configure
@@ -305,4 +310,6 @@ output Complete.
 cleanup;
 
 # Move back to the current directory
-cd $CURR_DIR
+cd "$CURR_DIR"
+
+make -C src/synfig/proto