[rkward-cvs] SF.net SVN: rkward:[2928] trunk/rkward/scripts

[tfry at users.sourceforge.net]

Revision: 2928
          http://rkward.svn.sourceforge.net/rkward/?rev=2928&view=rev
Author:   tfry
Date:     2010-07-02 08:43:31 +0000 (Fri, 02 Jul 2010)

Log Message:
-----------
Some tweaks to version-handling in the scripts

Modified Paths:
--------------
    trunk/rkward/scripts/makedist.sh
    trunk/rkward/scripts/makeosc_upload.sh
    trunk/rkward/scripts/makeppa_upload.sh

Added Paths:
-----------
    trunk/rkward/scripts/getversion.sh

Added: trunk/rkward/scripts/getversion.sh
===================================================================
--- trunk/rkward/scripts/getversion.sh	                        (rev 0)
+++ trunk/rkward/scripts/getversion.sh	2010-07-02 08:43:31 UTC (rev 2928)
@@ -0,0 +1,19 @@
+#!/bin/bash
+#
+# Update the version information in the various places around the source
+#
+
+SPECIFIEDVERSION=${1}
+cd `dirname $0`/..
+BASEDIR=`pwd`
+
+if [ -z ${SPECIFIEDVERSION} ]; then
+	awk '{ printf "%s", $0; next }' rkward/resource.ver
+elif [ ${SPECIFIEDVERSION} = "SVN" ]; then
+	VERSION=`${BASEDIR}/scripts/getversion.sh`
+	cd ${BASEDIR}
+	REVISION=`svn info | grep "Revision:" | sed -e "s/Revision: //"`
+	echo -n "${VERSION}-SVN${REVISION}"
+else
+	echo -n ${SPECIFIEDVERSION}
+fi


Property changes on: trunk/rkward/scripts/getversion.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/rkward/scripts/makedist.sh
===================================================================
--- trunk/rkward/scripts/makedist.sh	2010-07-02 06:30:57 UTC (rev 2927)
+++ trunk/rkward/scripts/makedist.sh	2010-07-02 08:43:31 UTC (rev 2928)
@@ -1,8 +1,10 @@
 #!/bin/bash
 
-VERSION=${1}
 cd `dirname $0`/..
 BASEDIR=`pwd`
+OLDVERSION=`${BASEDIR}/scripts/getversion.sh`
+VERSION=`${BASEDIR}/scripts/getversion.sh ${1}`
+
 mkdir $BASEDIR/disttemp
 DISTDIRREL=rkward-$VERSION
 DISTDIR=$BASEDIR/disttemp/$DISTDIRREL
@@ -34,3 +36,5 @@
 
 cd $BASEDIR
 rm -rf $BASEDIR/disttemp
+
+$BASEDIR/scripts/set_dist_version.sh $OLDVERSION

Modified: trunk/rkward/scripts/makeosc_upload.sh
===================================================================
--- trunk/rkward/scripts/makeosc_upload.sh	2010-07-02 06:30:57 UTC (rev 2927)
+++ trunk/rkward/scripts/makeosc_upload.sh	2010-07-02 08:43:31 UTC (rev 2928)
@@ -4,11 +4,11 @@
 OSCREPOS="home:tfry-suse:rkward-devel"
 ## end: These may need adjusting!
 
-VERSION=${1}
+cd `dirname $0`/..
+BASEDIR=`pwd`
+VERSION=`${BASEDIR}/scripts/getversion.sh ${1}`
 # RPM does not accept dashes in the version name...
 VERSION=`echo -n ${VERSION} | sed -e 's/-/_/g'`
-cd `dirname $0`/..
-BASEDIR=`pwd`
 OSCTEMPDIR=${BASEDIR}/osctemp
 rm -rf ${OSCTEMPDIR}
 mkdir ${OSCTEMPDIR}

Modified: trunk/rkward/scripts/makeppa_upload.sh
===================================================================
--- trunk/rkward/scripts/makeppa_upload.sh	2010-07-02 06:30:57 UTC (rev 2927)
+++ trunk/rkward/scripts/makeppa_upload.sh	2010-07-02 08:43:31 UTC (rev 2928)
@@ -7,9 +7,9 @@
 AUTHOR="Thomas Friedrichsmeier <tfry at users.sourceforge.net>"
 ## end: These may need adjusting!
 
-VERSION=${1}
 cd `dirname $0`/..
 BASEDIR=`pwd`
+VERSION=`${BASEDIR}/scripts/getversion.sh ${1}`
 PPATEMPDIR=$BASEDIR/ppatemp
 mkdir $PPATEMPDIR
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.