diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-09-28 22:40:47 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-09-28 22:40:47 +0000 |
| commit | 9b66acc5997aef82618b7333c4df665fbea9ba90 (patch) | |
| tree | e254087307e81cc9dfcff0d5e38773357174eec7 /tools | |
| parent | 10ddcf65af43ef5d23a6256bf30403eb5e71bd8a (diff) | |
| download | cups-9b66acc5997aef82618b7333c4df665fbea9ba90.tar.gz | |
Merge changes from CUPS 1.6svn-r10024.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3438 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/makeipptoolpkg | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/makeipptoolpkg b/tools/makeipptoolpkg index 46fdf2fa6..ba471ca06 100644 --- a/tools/makeipptoolpkg +++ b/tools/makeipptoolpkg @@ -27,11 +27,9 @@ if test $# = 0; then echo Updating to get snapshot version... svn up rev=`svnversion . | sed -e '1,$s/[a-zA-Z]//g'` - fileversion="1.5svn-r$rev" - version=snapshots + fileversion="`date '+%Y%m%d'`-r$rev" else fileversion=$1 - version=$1 fi if (svn st | grep -qv '^\?'); then @@ -47,13 +45,19 @@ test -d $pkgdir && rm -r $pkgdir mkdir $pkgdir || exit 1 echo Copying package files -cp IPPTOOL.txt LICENSE.txt $pkgdir +cp CHANGES-IPPTOOL.txt IPPTOOL.txt LICENSE.txt $pkgdir cp doc/help/man-ipptool*.html $pkgdir +cp test/color.jpg $pkgdir cp test/create-printer-subscription.test $pkgdir +cp test/document-*.pdf $pkgdir +cp test/document-*.ps $pkgdir cp test/get-completed-jobs.test test/get-jobs.test $pkgdir cp test/get-printer-attributes.test $pkgdir +cp test/gray.jpg $pkgdir cp test/ipp-[12].*.test $pkgdir cp test/ipptool-static $pkgdir/ipptool +cp test/onepage-*.pdf $pkgdir +cp test/onepage-*.ps $pkgdir cp test/testfile.* $pkgdir if test `uname` = Darwin; then @@ -69,9 +73,9 @@ else fi if test -x /usr/bin/md5sum; then - (md5sum $pkgfile | awk '{print $1, "'$fileversion' cups/'$version'/" $2}') + (md5sum $pkgfile | awk '{print $1, "'$fileversion' cups/ipptool/" $2}') elif test -x /sbin/md5; then - (md5 $pkgfile | awk '{print $4, "'$fileversion' cups/'$version'/" substr($2, 2, length($2) - 2)}') + (md5 $pkgfile | awk '{print $4, "'$fileversion' cups/ipptool/" substr($2, 2, length($2) - 2)}') fi echo Removing temporary files... |