[pisa-src] r953 - in trunk: . test/packaging

From: Thomas Jansen <mithi@xxxxxxxxx>
To: pisa-src@xxxxxxxxxxxxx
Date: Tue, 08 Sep 2009 14:18:37 +0200
Author: Tjansen
Date: Tue Sep  8 14:18:37 2009
New Revision: 953

Log:
Fixed packaging script. Since the tarball has the SVN revision in the
filename, we no longer need a static release.version file. It is generated on
the fly now in the create-package.sh script. It depends on the PACKAGE_VERSION
in include/ac_config.h, which in turn is created by autotools.

Deleted:
   trunk/release.version
Modified:
   trunk/Makefile.am
   trunk/test/packaging/create-package.sh
   trunk/test/packaging/pisa-rpm.spec

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am   Mon Sep  7 17:22:50 2009        (r952)
+++ trunk/Makefile.am   Tue Sep  8 14:18:37 2009        (r953)
@@ -14,7 +14,6 @@
 EXTRA_DIST += tools/NokiaN810_BEX_Perf.sh tools/switch-ip
 EXTRA_DIST += tools/writeff.pl tools/tunnel/screamer.rb
 EXTRA_DIST += tools/tunnel/seteth1address
-EXTRA_DIST += release.version # autogen.sh
 EXTRA_DIST += include/arp.h include/conmgr.h include/nat.h
 EXTRA_DIST += include/uthash.h include/ctrlhandler.h
 

Modified: trunk/test/packaging/create-package.sh
==============================================================================
--- trunk/test/packaging/create-package.sh      Mon Sep  7 17:22:50 2009        
(r952)
+++ trunk/test/packaging/create-package.sh      Tue Sep  8 14:18:37 2009        
(r953)
@@ -25,23 +25,6 @@
 REPO_GROUP=pisa
 SPECFILE_DIR=$(mktemp -d)
 SPECFILE=$SPECFILE_DIR/pisa.spec 
-RELEASE_VERSION_FILE=$PKGROOT/release.version
-
-inc_release_number()
-{
-    TMPFILE=$(mktemp)
-    awk \
-    '{ \
-        if ($1 == "Release:") { \
-            print $1 " " ($2 + 1) \
-        } else {                  \
-            print              \
-        } \
-    }' < $RELEASE_VERSION_FILE >$TMPFILE
-    mv $TMPFILE $RELEASE_VERSION_FILE
-    echo "Now type:"
-    echo "tla replay; tla commit -s 'Increased release version number'"
-}
 
 die()
 {
@@ -172,7 +155,8 @@
 
 set -e
 
-cp $RELEASE_VERSION_FILE $SPECFILE
+echo "Version: $(grep PACKAGE_VERSION $PKGROOT/include/ac_config.h|cut -d\" 
-f2)" > $SPECFILE
+echo "Release: 1" >> $SPECFILE
 
 # Set architecture, distro and repo details
 if test -r /etc/debian_version
@@ -216,10 +200,6 @@
 then
     syncrepo
     exit
-elif test x"$1" = x"increl"
-then
-    inc_release_number
-    exit
 elif test x"$1" = x"bin"
 then
     if test x"$DISTROBASE" = x"redhat"

Modified: trunk/test/packaging/pisa-rpm.spec
==============================================================================
--- trunk/test/packaging/pisa-rpm.spec  Mon Sep  7 17:22:50 2009        (r952)
+++ trunk/test/packaging/pisa-rpm.spec  Tue Sep  8 14:18:37 2009        (r953)
@@ -1,6 +1,6 @@
 Name: pisa
 Summary: Peer-to-Peer Wi-Fi Internet Sharing System
-# Note: Version and Release are read automatically from topdir release.version
+# Note: Version and Release are created automatically from include/ac_config.h
 URL: http://ds.informatik.rwth-aachen.de/
 Source: 
http://ds.informatik.rwth-aachen.de/pisa/release/sources/%{version}/pisa-%{version}.tar.gz
 Packager: pisa@xxxxxxxxxxxxx
[pisa-src] r953 - in trunk: . test/packaging

Other related posts:
