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

tfry at users.sourceforge.net tfry at users.sourceforge.net
Sat May 1 12:02:05 UTC 2010


Revision: 2852
          http://rkward.svn.sourceforge.net/rkward/?rev=2852&view=rev
Author:   tfry
Date:     2010-05-01 12:02:04 +0000 (Sat, 01 May 2010)

Log Message:
-----------
Move scripts to a subdirectory

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

Added Paths:
-----------
    trunk/rkward/scripts/
    trunk/rkward/scripts/makedist.sh
    trunk/rkward/scripts/makeppa_upload.sh
    trunk/rkward/scripts/set_dist_version.sh

Removed Paths:
-------------
    trunk/rkward/makedist.sh
    trunk/rkward/makeppa_upload.sh
    trunk/rkward/set_dist_version.sh

Deleted: trunk/rkward/makedist.sh
===================================================================
--- trunk/rkward/makedist.sh	2010-05-01 11:55:37 UTC (rev 2851)
+++ trunk/rkward/makedist.sh	2010-05-01 12:02:04 UTC (rev 2852)
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-VERSION=${1}
-cd `dirname $0`
-BASEDIR=`pwd`
-mkdir $BASEDIR/disttemp
-DISTDIRREL=rkward-$VERSION
-DISTDIR=$BASEDIR/disttemp/$DISTDIRREL
-mkdir $DISTDIR
-
-$BASEDIR/set_dist_version.sh $VERSION
-
-cp -a AUTHORS CMakeLists.txt COPYING ChangeLog TODO INSTALL NOTES README configure $DISTDIR
-mkdir $DISTDIR/doc
-mkdir $DISTDIR/po
-mkdir $DISTDIR/rkward
-mkdir $DISTDIR/tests
-
-rsync -a --exclude '*~' --exclude '*.svn*' $EXCLUDES $BASEDIR/doc/* $DISTDIR/doc
-rsync -a --exclude '*~' --exclude '*.svn*' $EXCLUDES $BASEDIR/po/* $DISTDIR/po
-rsync -a --exclude '*~' --exclude '*.svn*' --exclude 'templates' $EXCLUDES $BASEDIR/rkward/* $DISTDIR/rkward
-rsync -a --exclude '*~' --exclude '*.svn*' $EXCLUDES $BASEDIR/tests/* $DISTDIR/tests
-
-# make messages
-cd $DISTDIR/po
-./Messages.sh
-# clean up test-results
-cd $DISTDIR/tests
-find . -mindepth 2 -name 'RKTestStandard.*' -o -exec rm {} \;
-
-cd $BASEDIR/disttemp
-tar -czf rkward-$VERSION.tar.gz $DISTDIRREL
-mv rkward-$VERSION.tar.gz $BASEDIR/
-
-cd $BASEDIR
-rm -rf $BASEDIR/disttemp

Deleted: trunk/rkward/makeppa_upload.sh
===================================================================
--- trunk/rkward/makeppa_upload.sh	2010-05-01 11:55:37 UTC (rev 2851)
+++ trunk/rkward/makeppa_upload.sh	2010-05-01 12:02:04 UTC (rev 2852)
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-## begin: These may need adjusting!
-TARGETS="lucid karmic jaunty intrepid hardy"
-PPAVERSIONSTRING="experimental1ppa1"
-PPAID="rkward-devel"
-AUTHOR="Thomas Friedrichsmeier <tfry at users.sourceforge.net>"
-## end: These may need adjusting!
-
-VERSION=${1}
-cd `dirname $0`
-BASEDIR=`pwd`
-PPATEMPDIR=$BASEDIR/ppatemp
-mkdir $PPATEMPDIR
-
-# first create source snapshot
-${BASEDIR}/makedist.sh $VERSION
-cp ${BASEDIR}/rkward-$VERSION.tar.gz $PPATEMPDIR/rkward_$VERSION.orig.tar.gz
-
-function doSourceUpload {
-	TARGET=${1}
-	PACKAGEVERSION="${VERSION}-1${PPAVERSIONSTRING}~${TARGET}"
-
-	echo "----------------------"
-	echo "Now packaging: ${PACKAGEVERSION}"
-	echo "----------------------"
-
-	# unpack
-	cd $PPATEMPDIR
-	tar -xzf rkward_$VERSION.orig.tar.gz
-	PPASOURCEDIR=`pwd`/rkward-$VERSION/
-	cp -a $BASEDIR/debian $PPASOURCEDIR
-
-	# prepare changelog
-	cd $PPASOURCEDIR/debian
-	mv changelog changelog_old
-	echo "rkward (${PACKAGEVERSION}) ${TARGET}; urgency=low" > changelog
-	echo "  * new upstream development release" >> changelog
-	echo -n " -- ${AUTHOR}  " >> changelog
-	date -R >> changelog
-	echo "" >> changelog
-	cat changelog_old >> changelog
-	rm changelog_old
-
-	# build source package
-	cd $PPASOURCEDIR
-	dpkg-buildpackage -S
-
-	# upload
-	cd $PPATEMPDIR
-	echo "[rkward-devel-scripted]" > dput.cf
-	echo "fqdn = ppa.launchpad.net" >> dput.cf
-	echo "method = ftp" >> dput.cf
-	echo "incoming = ~rkward-devel/${PPAID}/ubuntu/" >> dput.cf
-	echo "login = anonymous" >> dput.cf
-	echo "allow_unsigned_uploads = 0" >> dput.cf
-
-	dput --config ${PPATEMPDIR}/dput.cf rkward-devel-scripted rkward_${PACKAGEVERSION}_source.changes
-	rm -rf rkward_${PACKAGEVERSION}*
-	rm -rf $PPASOURCEDIR
-}
-
-for TARGET in ${TARGETS}
-do
-	doSourceUpload ${TARGET}
-done

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R	2010-05-01 11:55:37 UTC (rev 2851)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R	2010-05-01 12:02:04 UTC (rev 2852)
@@ -1 +1 @@
-".rk.app.version" <- "0.5.3"
+".rk.app.version" <- "0.5.4-test0"

Modified: trunk/rkward/rkward/resource.ver
===================================================================
--- trunk/rkward/rkward/resource.ver	2010-05-01 11:55:37 UTC (rev 2851)
+++ trunk/rkward/rkward/resource.ver	2010-05-01 12:02:04 UTC (rev 2852)
@@ -1 +1 @@
-0.5.3
+0.5.4-test0

Modified: trunk/rkward/rkward/version.h
===================================================================
--- trunk/rkward/rkward/version.h	2010-05-01 11:55:37 UTC (rev 2851)
+++ trunk/rkward/rkward/version.h	2010-05-01 12:02:04 UTC (rev 2852)
@@ -1,2 +1,2 @@
 /* Version number of package */
-#define VERSION "0.5.3"
+#define VERSION "0.5.4-test0"

Copied: trunk/rkward/scripts/makedist.sh (from rev 2850, trunk/rkward/makedist.sh)
===================================================================
--- trunk/rkward/scripts/makedist.sh	                        (rev 0)
+++ trunk/rkward/scripts/makedist.sh	2010-05-01 12:02:04 UTC (rev 2852)
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+VERSION=${1}
+cd `dirname $0`/..
+BASEDIR=`pwd`
+mkdir $BASEDIR/disttemp
+DISTDIRREL=rkward-$VERSION
+DISTDIR=$BASEDIR/disttemp/$DISTDIRREL
+mkdir $DISTDIR
+
+$BASEDIR/set_dist_version.sh $VERSION
+
+cp -a AUTHORS CMakeLists.txt COPYING ChangeLog TODO INSTALL NOTES README configure $DISTDIR
+mkdir $DISTDIR/doc
+mkdir $DISTDIR/po
+mkdir $DISTDIR/rkward
+mkdir $DISTDIR/tests
+
+rsync -a --exclude '*~' --exclude '*.svn*' $EXCLUDES $BASEDIR/doc/* $DISTDIR/doc
+rsync -a --exclude '*~' --exclude '*.svn*' $EXCLUDES $BASEDIR/po/* $DISTDIR/po
+rsync -a --exclude '*~' --exclude '*.svn*' --exclude 'templates' $EXCLUDES $BASEDIR/rkward/* $DISTDIR/rkward
+rsync -a --exclude '*~' --exclude '*.svn*' $EXCLUDES $BASEDIR/tests/* $DISTDIR/tests
+
+# make messages
+cd $DISTDIR/po
+./Messages.sh
+# clean up test-results
+cd $DISTDIR/tests
+find . -mindepth 2 -name 'RKTestStandard.*' -o -exec rm {} \;
+
+cd $BASEDIR/disttemp
+tar -czf rkward-$VERSION.tar.gz $DISTDIRREL
+mv rkward-$VERSION.tar.gz $BASEDIR/
+
+cd $BASEDIR
+rm -rf $BASEDIR/disttemp

Copied: trunk/rkward/scripts/makeppa_upload.sh (from rev 2850, trunk/rkward/makeppa_upload.sh)
===================================================================
--- trunk/rkward/scripts/makeppa_upload.sh	                        (rev 0)
+++ trunk/rkward/scripts/makeppa_upload.sh	2010-05-01 12:02:04 UTC (rev 2852)
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+## begin: These may need adjusting!
+TARGETS="lucid karmic jaunty intrepid hardy"
+PPAVERSIONSTRING="experimental1ppa1"
+PPAID="rkward-devel"
+AUTHOR="Thomas Friedrichsmeier <tfry at users.sourceforge.net>"
+## end: These may need adjusting!
+
+VERSION=${1}
+cd `dirname $0`/..
+BASEDIR=`pwd`
+PPATEMPDIR=$BASEDIR/ppatemp
+mkdir $PPATEMPDIR
+
+# first create source snapshot
+${BASEDIR}/makedist.sh $VERSION
+cp ${BASEDIR}/rkward-$VERSION.tar.gz $PPATEMPDIR/rkward_$VERSION.orig.tar.gz
+
+function doSourceUpload {
+	TARGET=${1}
+	PACKAGEVERSION="${VERSION}-1${PPAVERSIONSTRING}~${TARGET}"
+
+	echo "----------------------"
+	echo "Now packaging: ${PACKAGEVERSION}"
+	echo "----------------------"
+
+	# unpack
+	cd $PPATEMPDIR
+	tar -xzf rkward_$VERSION.orig.tar.gz
+	PPASOURCEDIR=`pwd`/rkward-$VERSION/
+	cp -a $BASEDIR/debian $PPASOURCEDIR
+
+	# prepare changelog
+	cd $PPASOURCEDIR/debian
+	mv changelog changelog_old
+	echo "rkward (${PACKAGEVERSION}) ${TARGET}; urgency=low" > changelog
+	echo "  * new upstream development release" >> changelog
+	echo -n " -- ${AUTHOR}  " >> changelog
+	date -R >> changelog
+	echo "" >> changelog
+	cat changelog_old >> changelog
+	rm changelog_old
+
+	# build source package
+	cd $PPASOURCEDIR
+	dpkg-buildpackage -S
+
+	# upload
+	cd $PPATEMPDIR
+	echo "[rkward-devel-scripted]" > dput.cf
+	echo "fqdn = ppa.launchpad.net" >> dput.cf
+	echo "method = ftp" >> dput.cf
+	echo "incoming = ~rkward-devel/${PPAID}/ubuntu/" >> dput.cf
+	echo "login = anonymous" >> dput.cf
+	echo "allow_unsigned_uploads = 0" >> dput.cf
+
+	dput --config ${PPATEMPDIR}/dput.cf rkward-devel-scripted rkward_${PACKAGEVERSION}_source.changes
+	rm -rf rkward_${PACKAGEVERSION}*
+	rm -rf $PPASOURCEDIR
+}
+
+for TARGET in ${TARGETS}
+do
+	doSourceUpload ${TARGET}
+done

Copied: trunk/rkward/scripts/set_dist_version.sh (from rev 2850, trunk/rkward/set_dist_version.sh)
===================================================================
--- trunk/rkward/scripts/set_dist_version.sh	                        (rev 0)
+++ trunk/rkward/scripts/set_dist_version.sh	2010-05-01 12:02:04 UTC (rev 2852)
@@ -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

Deleted: trunk/rkward/set_dist_version.sh
===================================================================
--- trunk/rkward/set_dist_version.sh	2010-05-01 11:55:37 UTC (rev 2851)
+++ trunk/rkward/set_dist_version.sh	2010-05-01 12:02:04 UTC (rev 2852)
@@ -1,13 +0,0 @@
-#!/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


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




More information about the rkward-tracker mailing list