X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fbootstrap;h=1e66948ce7f6b646cb138517c83f8fd4378264e7;hb=fbe71f14d35b3dca19d6222a76a587bb9ecf5ea1;hp=f3fe2d770f22f9652d9a7bb554e705c62392bccb;hpb=f8ed81fffac90f713fa4b6c368a93a57c4d0163c;p=synfig.git

diff --git a/synfig-studio/trunk/bootstrap b/synfig-studio/trunk/bootstrap
index f3fe2d7..1e66948 100755
--- a/synfig-studio/trunk/bootstrap
+++ b/synfig-studio/trunk/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # Synfig Studio Bootstrap Script
-# $Id: bootstrap,v 1.2 2005/01/10 08:13:44 darco Exp $
+# $Id$
 # 
 # This script creates the configure script and Makefile.in files,
 # and also fixes a few things in both to ensure a smooth build
@@ -14,9 +14,9 @@ cd $(dirname $0)
 
 # Environment Variables
 BOOTSTRAP_NAME=$(basename $0)
-CONFIG_DIR=$(pwd)/config
+CONFIG_DIR="config"
 
-. $CONFIG_DIR/build.cfg
+. "$CONFIG_DIR/build.cfg"
 
 SED_SCRIPT="
 s/@PACKAGE@/$PACKAGE/g;
@@ -26,6 +26,7 @@ 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;
 s/@VERSION_MIN@/$VERSION_MIN/g;
 s/@VERSION_REV@/$VERSION_REV/g;
@@ -58,7 +59,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.
@@ -142,7 +143,7 @@ mv $TEMPFILE aclocal.m4
 
 for FILENAME in 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 project.spec to $PACKAGE.spec...
@@ -153,7 +154,11 @@ 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 Generating ChangeLog from SVN
+if test x != "x$VERSION_REL" ; then export REVISION="--revision $VERSION_REL" ; fi
+test -f ChangeLog || svn2cl --include-rev $REVISION $SVN_REPOSITORY/trunk/ || touch ChangeLog
 
 output Setting up build environment...
 
@@ -164,11 +169,11 @@ set -x
 (
 #	$INTLTOOLIZE -c &&
 	$LIBTOOLIZE -c -f &&
-	$ACLOCAL -I $CONFIG_DIR $ACLOCAL_FLAGS &&
+	$ACLOCAL -I "$CONFIG_DIR" $ACLOCAL_FLAGS &&
 	aclocalfix &&
 	$AUTOHEADER &&
-	$AUTOMAKE --foreign --add-missing --copy --include-deps &&
 	$AUTOCONF -o configure &&
+	$AUTOMAKE --force-missing --add-missing --include-deps &&
 	true
 ) ||
 {
@@ -250,4 +255,4 @@ echo $BOOTSTRAP_NAME: Complete.
 cleanup;
 
 # Move back to the current directory
-cd $CURR_DIR
+cd "$CURR_DIR"