projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 1795913. Subtract now works with colors.
[synfig.git]
/
ETL
/
trunk
/
bootstrap
diff --git
a/ETL/trunk/bootstrap
b/ETL/trunk/bootstrap
index
b843286
..
549b442
100755
(executable)
--- a/
ETL/trunk/bootstrap
+++ b/
ETL/trunk/bootstrap
@@
-1,7
+1,7
@@
#! /bin/sh
#
# Extended Template Library Bootstrap Script
#! /bin/sh
#
# Extended Template Library Bootstrap Script
-# $Id
: bootstrap,v 1.2 2005/01/04 01:54:14 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
#
# This script creates the configure script and Makefile.in files,
# and also fixes a few things in both to ensure a smooth build
@@
-15,7
+15,7
@@
cd "$(dirname $0)"
# Environment Variables
BOOTSTRAP_NAME="$(basename $0)"
# Environment Variables
BOOTSTRAP_NAME="$(basename $0)"
-CONFIG_DIR="
$(pwd)/
config"
+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 ] && CONFIG_DIR="`cygpath -m -s "$CONFIG_DIR"`"
[ -x /bin/cygpath ] && CONFIG_DIR="`cygpath -u "$CONFIG_DIR"`"
@@
-35,6
+35,7
@@
s/@VERSION_MAJ@/$VERSION_MAJ/g;
s/@VERSION_MIN@/$VERSION_MIN/g;
s/@VERSION_REV@/$VERSION_REV/g;
s/@VERSION_REL@/$VERSION_REL/g;
s/@VERSION_MIN@/$VERSION_MIN/g;
s/@VERSION_REV@/$VERSION_REV/g;
s/@VERSION_REL@/$VERSION_REL/g;
+s'@SVN_REPOSITORY@'$SVN_REPOSITORY'g;
s/@CFLAGS@//g;
"
s/@CFLAGS@//g;
"
@@
-56,7
+57,7
@@
cleanup () {
rm -fr config.cache autom4te.cache configure.in $TEMPFILE
}
rm -fr config.cache autom4te.cache configure.in $TEMPFILE
}
-output Prepa
i
ring 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.
# Look for the CVS directory. If we don't find it, we need to
# ask the user if they know what they are doing.
@@
-121,16
+122,20
@@
sed "$SED_SCRIPT" < "$CONFIG_DIR/$FILENAME.in" > $FILENAME;
output Renaming pkgconfig.pc to $PACKAGE_TARNAME.pc.in...
mv pkgconfig.pc "$PACKAGE_TARNAME.pc.in"
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
ChangeLog >> "$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;
output Creating configure.in from configure.ac...
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...
# Set the shell to output what we are doing
output Setting up build environment...
# Set the shell to output what we are doing
@@
-141,7
+146,7
@@
set -x
aclocal -I "$CONFIG_DIR" $ACLOCAL_FLAGS &&
autoheader &&
autoconf -o configure &&
aclocal -I "$CONFIG_DIR" $ACLOCAL_FLAGS &&
autoheader &&
autoconf -o configure &&
- automake --for
eign --add-missing --copy
--include-deps
+ automake --for
ce-missing --add-missing
--include-deps
) ||
{
# Something went wrong...
) ||
{
# Something went wrong...
@@
-212,4
+217,4
@@
echo $BOOTSTRAP_NAME: Complete.
cleanup;
# Move back to the current directory
cleanup;
# Move back to the current directory
-cd
$CURR_DIR
+cd
"$CURR_DIR"