Skip to content

Commit 9a0f988

Browse files
author
foobar
committed
- Removed unnecessary makedist.ZendEngine2
- Modified makedist to use php5 CVS module (alias)
1 parent 2d0f432 commit 9a0f988

File tree

2 files changed

+9
-161
lines changed

2 files changed

+9
-161
lines changed

makedist

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# where <package> is the package name and the CVS module
1010
# and <version> s the version number with underscores instead of dots.
1111
#
12-
# For example: cvs tag php_3_0a1
12+
# For example: cvs tag php_5_0_1
1313
#
1414
# The distribution ends up in a .tar.gz file that contains the distribution
1515
# in a directory called <package>-<version>. The distribution contains all
@@ -45,10 +45,7 @@ fi
4545
IFS="$old_IFS"
4646

4747
PHPROOT=:pserver:cvsread@cvs.php.net:/repository
48-
ZENDROOT=:pserver:cvsread@cvs.php.net:/repository
49-
PHPMOD=php4
50-
ZENDMOD=Zend
51-
TSRMMOD=TSRM
48+
PHPMOD=php5
5249
LT_TARGETS='ltconfig ltmain.sh config.guess config.sub'
5350

5451
if echo '\c' | grep -s c >/dev/null 2>&1
@@ -79,27 +76,27 @@ fi
7976
CVSVER=`echo $VER | sed -e 's/[\.\-]/_/g'`
8077

8178
# CVS release tag
82-
CVSTAG=${PKG}_$CVSVER
79+
if test "$VER" != "HEAD"; then
80+
CVSTAG=${PKG}_$CVSVER
81+
else
82+
CVSTAG=HEAD
83+
fi
8384

8485
if test ! -d $DIRPATH; then
8586
mkdir -p $DIRPATH || exit 2
8687
fi
8788

88-
#cd $DIRPATH || exit 3
89-
9089
# Export PHP
9190
$ECHO_N "makedist: exporting tag '$CVSTAG' from '$PHPMOD'...$ECHO_C"
9291
cvs -z 9 -d $PHPROOT export -d $DIR -r $CVSTAG $PHPMOD || exit 4
9392
echo ""
9493

95-
# Export the other modules inside the PHP directory
96-
cd $DIR || exit 5
97-
9894
# remove CVS stuff...
95+
cd $DIR || exit 5
9996
find . \( \( -name CVS -type d \) -o -name .cvsignore \) -exec rm -rf {} \;
10097

10198
# The full ChangeLog is available separately from lxr.php.net
102-
rm ChangeLog*
99+
rm -f ChangeLog*
103100

104101
# hide away our own versions of libtool-generated files
105102
for i in $LT_TARGETS; do

makedist.ZendEngine2

Lines changed: 0 additions & 149 deletions
This file was deleted.

0 commit comments

Comments
 (0)