Update of /cvsroot/audacity/audacity-src/scripts
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29458/scripts
Modified Files:
maketarball.sh
Log Message:
Make the configure run in quiet mode work correctly, and configure more
libraries for safety
Index: maketarball.sh
===================================================================
RCS file: /cvsroot/audacity/audacity-src/scripts/maketarball.sh,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- maketarball.sh 12 Jul 2009 16:03:10 -0000 1.25
+++ maketarball.sh 7 Nov 2009 16:49:06 -0000 1.26
@@ -294,20 +294,22 @@
reconf=1
fi
+# these are the arguments we will pass to configure when it is run
+configargs="--enable-maintainer-mode --with-libsndfile=local
--with-lib-preference=\"local system\""
+
if [[ x"$reconf" = x1 ]] ; then
echo "Your Makefiles are out of date or missing. (Re)running configure
to"
echo "create up-to-date Makefiles before building tarballs..."
- echo "\t./configure --enable-maintainer-mode --with-libsndfile=local"
+ echo " ./configure ${configargs}"
fi
# if we are in silent mode, then redirect the output of configure
if [ $mode -eq 1 ]; then
- configargs="";
+ $SHELL -c "./configure ${configargs}"
else
- configargs="2>/dev/null > /dev/null";
+ $SHELL -c "./configure ${configargs}" > /dev/null 2>&1
fi
-# actually run configure
- ./configure --enable-maintainer-mode --with-libsndfile=local
${configargs};
+echo -n "Getting program version... "
# find version number from C header file
major_version=`awk '/^#define+ AUDACITY_VERSION / {print $3}' src/Audacity.h`
@@ -316,7 +318,8 @@
version_suffix=`awk '/^#define+ AUDACITY_SUFFIX / {split($0,subs,"\"");
print(subs[2]) }' src/Audacity.h`
version="${major_version}.${minor_version}.${micro_version}${version_suffix}"
-echo "version set to ${version}"
+echo "${version}"
+# completes previous echo -n call
# capture some directory information, we'll want it later
sourcedir="$(pwd)" # where the sources are
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
