Fix version check.

[thirdparty/cups.git] / tools / makesrcdist

diff --git a/tools/makesrcdist b/tools/makesrcdist
index aaf200643e42ce35df2fc0cd1f88b6a2550d0cd6..0eb4426f61c77cf5e78a84ff738b86cb1f0be6d7 100755 (executable)
--- a/tools/makesrcdist
+++ b/tools/makesrcdist
@@ -14,25 +14,68 @@ if test ! -f tools/makesrcdist; then
         exit 1
 fi
 
+if (svn st | grep -v makesrcdist | grep -qv '^\?'); then
+        echo Local changes remain:
+        svn st | grep -v makesrcdist | grep -v '^\?'
+        exit 1
+fi
+
 if test $# = 0; then
        echo Updating for snapshot...
        svn up
-       rev=`svnversion . | sed -e '1,$s/[a-zA-Z]//g'`
-       version="1.3svn"
+
+       # Compute version for snapshot
+       rev=`svn info . | grep Revision: | awk '{print $2}'`
+       version="2.0svn"
        revision="-r$rev"
-       fileversion="1.3svn-r$rev"
-       fileurl="ftp://ftp.easysw.com/pub/cups/test/cups-$fileversion-source.tar."
+       fileversion="2.0svn-r$rev"
+       fileurl="http://www.cups.org/software/test/cups-$fileversion-source.tar."
        url="."
 else
-       echo Creating tag for release...
+       # Use version from command-line
        rev="1"
        version=$1
        revision=""
        fileversion=$1
-       fileurl="ftp://ftp.easysw.com/pub/cups/$version/cups-$fileversion-source.tar."
-       url="https://svn.easysw.com/public/cups/tags/release-$version"
+       fileurl="http://www.cups.org/software/$version/cups-$fileversion-source.tar."
+       url="svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-$version"
+
+       echo Validating sources...
+       cupsversionpatch=`echo $version | awk -F. '{if (NF == 3) { print $3 } else { print "0" } }'`
+       cupsversion=`printf "2.00%02d" $cupsversionpatch`
+
+       temp=`grep CUPS_VERSION cups/cups.h | grep -v CUPS_VERSION_ | awk '{print $4}'`
+       if test "$temp" != $cupsversion; then
+               echo "Still need to update CUPS_VERSION to $cupsversion in cups/cups.h (saw $temp)"
+               exit 1
+       fi
+
+       temp=`grep CUPS_VERSION_PATCH cups/cups.h | awk '{print $4}'`
+       if test "$temp" != $cupsversionpatch; then
+               echo "Still need to update CUPS_VERSION_PATCH to $cupsversionpatch in cups/cups.h (saw $temp)"
+               exit 1
+       fi
 
-       svn copy https://svn.easysw.com/public/cups/trunk "$url" \
+       temp=`head -1 README.txt | awk '{print $4}'`
+       if test "$temp" != "v$version"; then
+               echo "Still need to update version to v$version in README.txt (saw $temp)"
+               exit 1
+       fi
+
+       temp=`head -1 INSTALL.txt | awk '{print $4}'`
+       if test "$temp" != "v$version"; then
+               echo "Still need to update version to v$version in INSTALL.txt (saw $temp)"
+               exit 1
+       fi
+
+       temp=`head -4 CHANGES.txt | grep "CHANGES IN" | awk '{print $4}'`
+       if test "$temp" != "V$version"; then
+               echo "Still need to add CHANGES IN V$version in CHANGES.txt (saw $temp)"
+               exit 1
+       fi
+
+       echo Creating tag for release...
+       svn copy svn+ssh://src.apple.com/svn/cups/cups.org/trunk "$url" \
                -m "Tag $version" || exit 1
 fi
 
@@ -54,7 +97,7 @@ cd ..
 echo Configuring...
 autoconf -f
 rm -rf autom4te*.cache
-rm -rf standards
+rm -rf everywhere
 rm -rf tools
 cd ..
 
@@ -75,10 +118,20 @@ sed -e '1,$s/@CUPS_VERSION@/'$version'/' \
 tar cjf cups-$fileversion-source.tar.bz2 cups-$version
 echo "..."
 
+if test -x /usr/bin/md5sum; then
+       (cd /tmp; md5sum cups-$fileversion-source.tar.{bz2,gz} | awk '{print $1, "'$fileversion' '$fileversion'/" $2}')
+elif test -x /sbin/md5; then
+       (cd /tmp; md5 cups-$fileversion-source.tar.{bz2,gz} | awk '{print $4, "'$fileversion' '$fileversion'/" substr($2, 2, length($2) - 2)}')
+fi
+
+for file in /tmp/cups-$fileversion-source.tar.{bz2,gz}; do
+       gpg --detach-sign $file
+done
+
 echo Removing temporary files...
 rm -rf cups-$version
 
-echo "Done!"
+echo "Done."
 
 #
 # End of "$Id$".