update release howto, make phing create svntag

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@547 b3834d28-1941-0410-a4f8-b48e95affb8f

2 files changed, 36 insertions, 10 deletions

diff --git a/build.xml b/build.xml
index 54af6a0..85194ec 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project name="SemanticScuttle" default="dist" basedir=".">
+<project name="SemanticScuttle" default="zip" basedir=".">
   <!--
     SemanticScuttle phing build file.
     This script should provide a one-stop tool for all administrative
@@ -13,8 +13,9 @@
   <property name="distfile"   value="dist/${zipfile}" />
   <property name="sfproject"  value="SemanticScuttle" />
   <property name="sffilepath" value="s/se/semanticscuttle/" />
+  <property name="svnpath"    value="https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/" />
 
-  <target name="dist" depends="check"
+  <target name="zip" depends="check"
    description="Create zip file for release"
    >
     <!--
@@ -45,13 +46,21 @@
   </target>
 
 
+
+  <target name="release" depends="check,zip,deploy-sf,svntag"
+   description="Release the version on sourceforge"
+   >
+   <!-- meta-target -->
+  </target>
+
+
   <!--
   /home/frs/project/s/se/semanticscuttle/SemanticScuttle/v0.94/
   /home/frs/project/s/se/semanticscuttle/SemanticScuttle/v0.94/SemanticScuttle-v0.94.zip
   /home/frs/project/s/se/semanticscuttle/SemanticScuttle/v0.94/SemanticScuttle-v0.94.1.zip
   https://sourceforge.net/apps/trac/sourceforge/wiki/Release%20files%20for%20download
   -->
-  <target name="deploy-sf" depends="check,dist"
+  <target name="deploy-sf" depends="check,zip"
    description="Upload release to sourceforge"
    >
     <delete dir="dist/deploy-sf" /><!-- make empty -->
@@ -63,6 +72,18 @@
     -->
     <exec
      command="rsync -av -e ssh dist/deploy-sf/ ${sfuser},${sfproject}@frs.sourceforge.net:/home/frs/project/${sffilepath}/${sfproject}/"
+     escape="false" checkreturn="false"
+     />
+    <!-- rsync always returns code 23 on sourceforge releases, so we
+         can't check return values -->
+  </target>
+
+
+  <target name="svntag"
+   description="create the svn tag for the current version"
+   >
+    <exec
+     command="svn cp ${svnpath}trunk ${svnpath}/tags/${version}"
      escape="false" checkreturn="true"
      />
   </target>
diff --git a/doc/developers/release-new-version b/doc/developers/release-new-version
index 074e72f..3920690 100644
--- a/doc/developers/release-new-version
+++ b/doc/developers/release-new-version
@@ -4,14 +4,19 @@ How to release a new version of SemanticScuttle
 0. Run unit tests and verify that all of them pass
 1. Update doc/ChangeLog
 2. Update version in data/templates/about.tpl.php
-3. Create a zip file with all contents, and make sure
-   the zip file root directory is SemanticScuttle-$version/
-4. Make a test installtion from your zip file with a fresh
-   database, register, add bookmarks etc.
+3. Create a release zip file via the build script:
+   Just type "phing".
+4. Make a test installation from your zip file with a fresh
+   database. Register a user, add bookmarks etc.
+5. When all is fine, it's time to release.
+   The build script takes care for most of the
+   tasks.
+   Run "phing release", and it will upload the release to
+   sourceforge and create a svn tag.
 5. Tag the release in svn:
    svn cp https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/tags/$version
-6. Upload release to sourceforge
-7. Write announcement mail to the SemanticScuttle mailing list
+6. Write announcement mail to the SemanticScuttle mailing list
    semanticscuttle-devel@lists.sourceforge.net
-8. Announce the new release in the sourceforge project news
+7. Announce the new release in the sourceforge project news
+   https://sourceforge.net/apps/trac/sourceforge/wiki/News