Mirror updates to makesrcdist script.

diff --git a/tools/makesrcdist b/tools/makesrcdist
index 94edaa9030b404c8daf80fd2bdc602644c6b757a..5447ebcd446b08c71cd7a369b37c46471d929789 100755 (executable)
--- a/tools/makesrcdist
+++ b/tools/makesrcdist
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# "$Id: makesrcdist 12998 2015-12-02 15:09:04Z msweet $"
-#
 # makesrcdist - make a source distribution of CUPS.
 #
 
+TMPDIR="${TMPDIR:=/tmp}"
+
 # Make sure we are running in the right directory...
 if test ! -f tools/makesrcdist; then
         echo "Run this script from the top-level CUPS source directory, e.g.:"
@@ -14,47 +14,37 @@ if test ! -f tools/makesrcdist; then
         exit 1
 fi
 
-# Figure out the proper echo options...
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-        ac_n=-n
-        ac_c=
-else
-        ac_n=
-        ac_c='\c'
-fi
-
 # See if we have local changes (other than this script...)
-if (svn st | grep -v makesrcdist | grep -qv '^\?'); then
+if (git status | grep -v makesrcdist | grep -q modified:); then
         echo Local changes remain:
-        svn st | grep -v makesrcdist | grep -v '^\?'
+        git status | grep -v makesrcdist | grep modified:
         exit 1
 fi
 
 # Prep for snapshot or version release...
 if test $# = 0; then
-       echo Updating for snapshot...
-       svn up
-
        # Compute version for snapshot
-       rev=`svn info . | grep Revision: | awk '{print $2}'`
-       version="2.1svn"
-       revision="-r$rev"
-       fileversion="2.1svn-r$rev"
-       fileurl="http://www.cups.org/software/test/cups-$fileversion-source.tar."
-       url="."
+       rev=`git show --oneline | head -1 | awk '{print $1}'`
+       version="2.1git"
+       fileversion="2.1git-$rev"
+       fileurl="file://$TMPDIR/cups-$fileversion.tar.gz"
 else
        # Use version from command-line
        rev="1"
        version=$1
-       revision=""
        fileversion=$1
-       fileurl="http://www.cups.org/software/$version/cups-$fileversion-source.tar."
-       url="svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-$version"
+       fileurl="https://github.com/apple/cups/releases/download/release-$fileversion/cups-$fileversion-source.tar.gz"
 
        echo Validating sources...
        cupsversionpatch=`echo $version | awk -F. '{if (NF == 3) { print $3 } else { print "0" } }'`
        cupsversion=`printf "2.01%02d" $cupsversionpatch`
 
+        temp=`grep AC_INIT configure.ac | awk '{print $2}' | sed -e '1,$s/^\[//' -e '1,$s/\],$//'`
+        if test "$temp" != $version; then
+               echo "Still need to update version to $version in configure.ac (saw $temp)"
+               exit 1
+       fi
+
        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)"
@@ -86,67 +76,29 @@ else
        fi
 
        echo Creating tag for release...
-       svn copy svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-2.1 "$url" \
-               -m "Tag $version" || exit 1
+       git tag -m "Tag $version" release-$version
 fi
 
 fileurl=`echo $fileurl | sed -e '1,$s/\\//\\\\\\//g'`
 
-TMPDIR="${TMPDIR:=/tmp}"
-
 echo Exporting $fileversion...
 rm -rf $TMPDIR/cups-$version
-svn export $url $TMPDIR/cups-$version
+mkdir $TMPDIR/cups-$version
+git archive | (cd $TMPDIR/cups-$version; tar xf -)
 
-echo Updating version information...
-cd $TMPDIR/cups-$version/config-scripts
-
-sed -e '1,$s/^CUPS_VERSION=.*/CUPS_VERSION='$version'/' \
-       -e '1,$s/^CUPS_REVISION=.*/CUPS_REVISION='$revision'/' \
-       <cups-common.m4 >cups-common.m4.new
-mv cups-common.m4.new cups-common.m4
-cd ..
-
-echo Configuring...
-autoconf -f
-rm -rf autom4te*.cache
-rm -rf everywhere
-rm -rf tools
-cd ..
-
-echo $ac_n Archiving...gz$ac_c
-sed -e '1,$s/@CUPS_VERSION@/'$version'/' \
-       -e '1,$s/^Release:.*/Release: '$rev'/' \
-       -e '1,$s/^Source:.*/Source: '$fileurl'gz/' \
-       <cups-$version/packaging/cups.spec.in \
-       >cups-$version/packaging/cups.spec
-tar czf cups-$fileversion-source.tar.gz cups-$version
-
-echo $ac_n ...bz2$ac_c
+echo Preparing files...
+cd $TMPDIR/cups-$version
 sed -e '1,$s/@CUPS_VERSION@/'$version'/' \
-       -e '1,$s/^Release:.*/Release: '$rev'/' \
-       -e '1,$s/^Source:.*/Source: '$fileurl'bz2/' \
+       -e '1,$s/^Source:.*/Source: '$fileurl'/' \
        <cups-$version/packaging/cups.spec.in \
        >cups-$version/packaging/cups.spec
-tar cjf cups-$fileversion-source.tar.bz2 cups-$version
-echo "..."
-
-if test -x /usr/bin/md5sum; then
-       md5sum cups-$fileversion-source.tar.{bz2,gz} | awk '{print $1, "'$fileversion' '$fileversion'/" $2}'
-elif test -x /sbin/md5; then
-       md5 cups-$fileversion-source.tar.{bz2,gz} | awk '{print $4, "'$fileversion' '$fileversion'/" substr($2, 2, length($2) - 2)}'
-fi
+rm -rf tools
+cd ..
 
-for file in cups-$fileversion-source.tar.{bz2,gz}; do
-       test -f $file.sig && rm -f $file.sig
-       gpg --detach-sign $file
-done
+echo Archiving...
+tar czf cups-$fileversion-source.tar.gz cups-$version
 
 echo Removing temporary files...
 rm -rf cups-$version
 
 echo "Done - files in $TMPDIR."
-
-#
-# End of "$Id: makesrcdist 12998 2015-12-02 15:09:04Z msweet $".
-#