cvs: /php4 configure.in makedist

ssb Mon Nov 8 11:18:24 1999 EDT Modified files: /php4 configure.in makedist Log: Cleaned up makedist a bit more. # Also changed 4.0B3-RC2 to 4.0b3-RC2. I don't see why we should start # using capital letters in 4.0. Index: php4/configure.in diff -u php4/configure.in:1.22 php4/configure.in:1.23 --- php4/configure.in:1.22 Mon Nov 8 04:18:57 1999 +++ php4/configure.in Mon Nov 8 11:17:53 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.22 1999/11/08 09:18:57 ssb Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.23 1999/11/08 16:17:53 ssb Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(0) @@ -34,7 +34,7 @@ divert(1) dnl ## This is where the version number is changed from now on! -AM_INIT_AUTOMAKE(php, 4.0B3-RC2) +AM_INIT_AUTOMAKE(php, 4.0b3-RC2) PHP_VERSION=$VERSION echo "/* automatically generated by configure */" > php_version.h.new Index: php4/makedist diff -u php4/makedist:1.8 php4/makedist:1.9 --- php4/makedist:1.8 Thu Nov 4 04:52:44 1999 +++ php4/makedist Mon Nov 8 11:17:53 1999 @@ -24,7 +24,7 @@ # # Written by Stig Bakken <ssb@guardian.no> 1997-05-28. # -# $Id: makedist,v 1.8 1999/11/04 09:52:44 ssb Exp $ +# $Id: makedist,v 1.9 1999/11/08 16:17:53 ssb Exp $ # CVSROOT=:pserver:cvsread@cvs.php.net:/repository @@ -55,16 +55,17 @@ ARCHIVE=$MY_OLDPWD/$PKG-$VER.tar.gz # temporary directory used to check out files from CVS -TMPDIR=$MY_OLDPWD/cvstmp-$PKG-$VER +DIR=$PKG-$VER +DIRPATH=$MY_OLDPWD/$DIR -if test -d "$TMPDIR"; then - echo "Temporary directory $TMPDIR" +if test -d "$DIRPATH"; then + echo "The directory $DIR" echo "already exists, rename or remove it and run makedist again." exit 1 fi # version part of the CVS release tag -CVSVER=echo $VER | sed -e 's/\./_/g' +CVSVER=echo $VER | sed -e 's/[\.\-]/_/g' # CVS release tag CVSTAG=${PKG}_$CVSVER @@ -76,17 +77,17 @@ # should become "TSRM" TSRMMOD=cat TSRM/CVS/Repository | sed -e 's!^/[^/]*/!!' -if test ! -d $TMPDIR; then - mkdir -p $TMPDIR || exit 2 +if test ! -d $DIRPATH; then + mkdir -p $DIRPATH || exit 2 fi -cd $TMPDIR || exit 3 +#cd $DIRPATH || exit 3 $ECHO_N "makedist: exporting tag '$CVSTAG' from '$CVSMOD'...$ECHO_C" -cvs -Q export -r $CVSTAG $CVSMOD || exit 4 +cvs -Q export -d $DIR -r $CVSTAG $CVSMOD || exit 4 echo "" -cd $CVSMOD || exit 5 +cd $DIR || exit 5 # Check out Zend $ECHO_N "makedist: exporting tag '$CVSTAG' from '$ZENDMOD'...$ECHO_C" @@ -121,26 +122,26 @@ echo "/* Dummy File */" > ext/bcmath/number.h #perl -i -p -e 's/\r\n/\n/' *.dsw *.dsp -set +x - -INC="$INC \ -configuration-scanner.c \ -configuration-parser.c configuration-parser.h \ -acconfig.h aclocal.m4 missing mkinstalldirs \ -ltconfig ltmain.sh config.sub config.guess php_config.h.in \ -configure install-sh Makefile.in" - - -mkdir $PKG-$VER || exit 6 -mv $INC $PKG-$VER || exit 7 +#set +x +# +#INC="$INC \ +#configuration-scanner.c \ +#configuration-parser.c configuration-parser.h \ +#acconfig.h aclocal.m4 missing mkinstalldirs \ +#ltconfig ltmain.sh config.sub config.guess php_config.h.in \ +#configure install-sh Makefile.in" +# +# +#mkdir $PKG-$VER || exit 6 +#mv $INC $PKG-$VER || exit 7 +cd $MY_OLDPWD $ECHO_N "makedist: making gzipped tar archive...$ECHO_C" tar czf $ARCHIVE $PKG-$VER || exit 8 echo "" $ECHO_N "makedist: cleaning up...$ECHO_C" -cd $MY_OLDPWD -rm -rf $TMPDIR || exit 9 +rm -rf $DIRPATH || exit 9 echo "" exit 0