fix makedist for new tags

smalyshev · smalyshev · commit 82f166fa73f4 · 2012-03-30T00:01:52.000-07:00
diff --git a/makedist b/makedist
@@ -4,12 +4,12 @@
 #
 # Usage: makedist version
 # Example: makedist 5.4.1
-# Example: makedist 5.3.5-RC1
+# Example: makedist 5.3.5RC1
 #
 # To work, this script needs a consistent tagging of all releases.
 # Each release of a package should have a tag of the form
 #
-#  PHP-X.Y.Z[-sub]
+#  php-X.Y.Z[sub]
 #
 # The distribution ends up in a .tar.gz file that contains the distribution
 # in a directory called php-<version>.  
@@ -63,8 +63,8 @@ if test -d "$DIRPATH"; then
 fi
 
 # Export PHP
-$ECHO_N "makedist: exporting tag 'PHP-$VER' from '$PHPROOT'...$ECHO_C"
-git archive --format=tar --remote=$PHPROOT refs/tags/PHP-$VER --prefix=php-$VER/ | (cd $MY_OLDPWD; tar xvf -) || exit 4
+$ECHO_N "makedist: exporting tag 'php-$VER' from '$PHPROOT'...$ECHO_C"
+git archive --format=tar --remote=$PHPROOT refs/tags/php-$VER --prefix=php-$VER/ | (cd $MY_OLDPWD; tar xvf -) || exit 4
 echo ""
 
 cd $DIR || exit 5

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@`
`4`	`4`	`#`
`5`	`5`	`# Usage: makedist version`
`6`	`6`	`# Example: makedist 5.4.1`
`7`		`-# Example: makedist 5.3.5-RC1`
	`7`	`+# Example: makedist 5.3.5RC1`
`8`	`8`	`#`
`9`	`9`	`# To work, this script needs a consistent tagging of all releases.`
`10`	`10`	`# Each release of a package should have a tag of the form`
`11`	`11`	`#`
`12`		`-# PHP-X.Y.Z[-sub]`
	`12`	`+# php-X.Y.Z[sub]`
`13`	`13`	`#`
`14`	`14`	`# The distribution ends up in a .tar.gz file that contains the distribution`
`15`	`15`	`# in a directory called php-<version>.`
`@@ -63,8 +63,8 @@ if test -d "$DIRPATH"; then`
`63`	`63`	`fi`
`64`	`64`
`65`	`65`	`# Export PHP`
`66`		`-$ECHO_N "makedist: exporting tag 'PHP-$VER' from '$PHPROOT'...$ECHO_C"`
`67`		`-git archive --format=tar --remote=$PHPROOT refs/tags/PHP-$VER --prefix=php-$VER/ \| (cd $MY_OLDPWD; tar xvf -) \|\| exit 4`
	`66`	`+$ECHO_N "makedist: exporting tag 'php-$VER' from '$PHPROOT'...$ECHO_C"`
	`67`	`+git archive --format=tar --remote=$PHPROOT refs/tags/php-$VER --prefix=php-$VER/ \| (cd $MY_OLDPWD; tar xvf -) \|\| exit 4`
`68`	`68`	`echo ""`
`69`	`69`
`70`	`70`	`cd $DIR \|\| exit 5`