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

[tfry at users.sourceforge.net]

Revision: 2532
          http://rkward.svn.sourceforge.net/rkward/?rev=2532&view=rev
Author:   tfry
Date:     2009-06-12 15:14:43 +0000 (Fri, 12 Jun 2009)

Log Message:
-----------
split out the version setting from makedist.sh, since the version may sometimes need to be increased, even if there is no new source release

Modified Paths:
--------------
    trunk/rkward/makedist.sh
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R
    trunk/rkward/rkward/resource.ver
    trunk/rkward/rkward/version.h

Added Paths:
-----------
    trunk/rkward/set_dist_version.sh

Modified: trunk/rkward/makedist.sh
===================================================================
--- trunk/rkward/makedist.sh	2009-06-12 15:01:38 UTC (rev 2531)
+++ trunk/rkward/makedist.sh	2009-06-12 15:14:43 UTC (rev 2532)
@@ -1,17 +1,14 @@
 #!/bin/bash
 
 VERSION=${1}
+cd `dirname $0`
 BASEDIR=`pwd`
 mkdir $BASEDIR/disttemp
 DISTDIRREL=rkward-$VERSION
 DISTDIR=$BASEDIR/disttemp/$DISTDIRREL
 mkdir $DISTDIR
 
-#prepare version information
-echo "/* Version number of package */" > $BASEDIR/rkward/version.h
-echo "#define VERSION \"$VERSION\"" >> $BASEDIR/rkward/version.h
-echo "\".rk.app.version\" <- \"$VERSION\"" > $BASEDIR/rkward/rbackend/rpackages/rkward/R/ver.R
-echo "$VERSION" > $BASEDIR/rkward/resource.ver
+$BASEDIR/set_dist_version.sh $VERSION
 
 cp -a AUTHORS CMakeLists.txt COPYING ChangeLog TODO INSTALL NOTES README configure $DISTDIR
 mkdir $DISTDIR/doc

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R	2009-06-12 15:01:38 UTC (rev 2531)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R	2009-06-12 15:14:43 UTC (rev 2532)
@@ -1 +1 @@
-".rk.app.version" <- "0.5.1-pre1"
+".rk.app.version" <- "0.5.1-pre2"

Modified: trunk/rkward/rkward/resource.ver
===================================================================
--- trunk/rkward/rkward/resource.ver	2009-06-12 15:01:38 UTC (rev 2531)
+++ trunk/rkward/rkward/resource.ver	2009-06-12 15:14:43 UTC (rev 2532)
@@ -1 +1 @@
-0.5.1-pre1
+0.5.1-pre2

Modified: trunk/rkward/rkward/version.h
===================================================================
--- trunk/rkward/rkward/version.h	2009-06-12 15:01:38 UTC (rev 2531)
+++ trunk/rkward/rkward/version.h	2009-06-12 15:14:43 UTC (rev 2532)
@@ -1,2 +1,2 @@
 /* Version number of package */
-#define VERSION "0.5.1-pre1"
+#define VERSION "0.5.1-pre2"

Added: trunk/rkward/set_dist_version.sh
===================================================================
--- trunk/rkward/set_dist_version.sh	                        (rev 0)
+++ trunk/rkward/set_dist_version.sh	2009-06-12 15:14:43 UTC (rev 2532)
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Update the version information in the various places around the source
+#
+
+VERSION=${1}
+cd `dirname $0`
+BASEDIR=`pwd`
+
+echo "/* Version number of package */" > $BASEDIR/rkward/version.h
+echo "#define VERSION \"$VERSION\"" >> $BASEDIR/rkward/version.h
+echo "\".rk.app.version\" <- \"$VERSION\"" > $BASEDIR/rkward/rbackend/rpackages/rkward/R/ver.R
+echo "$VERSION" > $BASEDIR/rkward/resource.ver


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


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