diff options
| author | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-02-22 16:59:36 +0000 |
|---|---|---|
| committer | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-02-22 16:59:36 +0000 |
| commit | ecdc06282a65bd04f801c877d2ceb83106d737e1 (patch) | |
| tree | cd00fed2f725d8c7b193bb566974e4d4da30740f /tools | |
| parent | bd7854cb4d663bb0e561eaf5b01bbd47baa71d22 (diff) | |
| download | cups-ecdc06282a65bd04f801c877d2ceb83106d737e1.tar.gz | |
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@63 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/makesrcdist | 3 | ||||
| -rwxr-xr-x | tools/testosx | 4 | ||||
| -rwxr-xr-x | tools/testrpm | 8 |
3 files changed, 9 insertions, 6 deletions
diff --git a/tools/makesrcdist b/tools/makesrcdist index 50858a921..fdd0516ef 100755 --- a/tools/makesrcdist +++ b/tools/makesrcdist @@ -19,6 +19,7 @@ if test $# = 0; then svn up rev=`svnversion . | sed -e '1,$s/[a-zA-Z]//g'` version="1.2svn" + revision="-r$rev" fileversion="1.2svn-r$rev" fileurl="ftp://ftp.easysw.com/pub/cups/test/cups-$fileversion-source.tar.bz2" url="." @@ -26,6 +27,7 @@ else echo Creating tag for release... rev="1" version=$1 + revision="" fileversion=$1 fileurl="ftp://ftp.easysw.com/pub/cups/$version/cups-$fileversion-source.tar.bz2" url="https://svn.easysw.com/public/cups/tags/release-$version" @@ -42,6 +44,7 @@ echo Updating version information... cd /tmp/cups-$version/config-scripts sed -e '1,$s/^CUPS_VERSION=.*/CUPS_VERSION='$fileversion'/' \ + -e '1,$s/^CUPS_REVISION=.*/CUPS_REVISION='$revision'/' \ <cups-common.m4 >cups-common.m4.new mv cups-common.m4.new cups-common.m4 cd .. diff --git a/tools/testosx b/tools/testosx index 58aa52160..98891cb25 100755 --- a/tools/testosx +++ b/tools/testosx @@ -63,10 +63,6 @@ sed -e '1,$s/@CUPS_VERSION@/1.2svn-r'$rev'/g' \ sed -e '1,$s/@CUPS_VERSION@/1.2svn-r'$rev'/g' \ -e '1,$s/@CUPS_RELEASE@/1.2.'$rev'/g' \ <packaging/cups-info.plist.in >packaging/cups-info.plist -sed -e '1,$s/@CUPS_VERSION@/1.2svn-r'$rev'/g' \ - <doc/index.html.in >doc/index.html -sed -e '1,$s/@CUPS_VERSION@/1.2svn-r'$rev'/g' \ - <templates/header.tmpl.in >templates/header.tmpl # Install CUPS into the Package directory... #make INSTALL=$topdir/install-sh BUILDROOT=$pkgdir/Package install diff --git a/tools/testrpm b/tools/testrpm index 047200ef7..74d1449e4 100755 --- a/tools/testrpm +++ b/tools/testrpm @@ -9,11 +9,15 @@ if test ! -f tools/testrpm; then echo "Run this script from the top-level CUPS source directory, e.g.:" echo "" - echo " tools/testrpm" + echo " tools/testrpm [rpmbuild options]" echo "" exit 1 fi +# Strip command-line arguments so we don't create a release tag... +args="$*" +shift $# + # Get a snapshot of the current source... . tools/makesrcdist @@ -21,7 +25,7 @@ fi echo Building rpm... rm -f /usr/src/redhat/RPMS/i386/cups*.rpm rm -f /usr/src/redhat/SRPMS/cups*.rpm -rpmbuild -ta cups-$fileversion-source.tar.bz2 +rpmbuild -ta $args cups-$fileversion-source.tar.bz2 # # End of "$Id$". |