move version into build.xml

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

diff --git a/.gitignore b/.gitignore
index 7a48689188aa31349ca74ba1b74bc24a19175742..3895c5b429e5b44166fe91255f8e95e95107b7a0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-SemanticScuttle-*
+dist/
+build.properties

diff --git a/build.properties.dist b/build.properties.dist
index 8f619b0778bbc30a53c3ba24a71cbfd9a4797869..b50ad08731b081d7e860cff33dd2435d8b32d0f6 100644 (file)
--- a/build.properties.dist
+++ b/build.properties.dist
@@ -1,2 +1 @@
-version=0.95
 sfuser=FIXME

diff --git a/build.xml b/build.xml
index 3fe2799efd135f55ccf2117239019b6592f5946e..f878eae074a8b7ca6839189c1dc108dfd83fc159 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -6,18 +6,26 @@
     tasks around SemanticScuttle, like creating a release version,
     tagging a release, running unit tests etc.
   -->
-  <property name="version" value="0.95.0"/>
+  <property file="build.properties" />
 
-  <target name="dist"><!-- depends="build">-->
+  <property name="version"    value="0.95" />
+  <property name="distfile"   value="dist/${phing.project.name}-${version}.zip" />
+  <property name="sfproject"  value="SemanticScuttle" />
+  <property name="sffilepath" value="s/se/semanticscuttle/" />
+
+  <target name="dist" depends="check"
+   description="Create zip file for release"
+   >
     <!--
       The release file is for end users, so it is safe to
       remove anything developer-related.
 
       Test your zip with: unzip -l SemanticScuttle-0.95.0.zip
     -->
+    <mkdir dir="dist" />
     <echo msg="Creating distribution zip for SemanticScuttle ${version}"/>
-    <delete file="SemanticScuttle-${version}.zip" failonerror="false"/>
-    <zip destfile="SemanticScuttle-${version}.zip" prefix="SemanticScuttle-${version}/">
+    <delete file="${distfile}" failonerror="false"/>
+    <zip destfile="${distfile}" prefix="${phing.project.name}-${version}/">
       <fileset dir=".">
         <include name="**"/>
         <exclude name="**/.gitignore"/>
@@ -38,4 +46,36 @@
     </zip>
   </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
+  -->
+  <target name="deploy-sf" depends="check,dist"
+   description="Upload release to sourceforge"
+   >
+    <delete dir="dist/deploy-sf" /><!-- make empty -->
+    <mkdir dir="dist/deploy-sf" />
+    <mkdir dir="dist/deploy-sf/v${version}" />
+    <copy file="${distfile}" tofile="dist/deploy-sf/v${version}/${distfile}"/>
+    <!-- test
+    <exec command="rsync -av dist/deploy-sf/ /tmp/test/" escape="false" />
+    -->
+    <exec
+     command="rsync -av -e ssh dist/deploy-sf/ ${sfuser},${sfproject}@frs.sourceforge.net:/home/frs/project/${sffilepath}/${sfproject}/"
+     escape="false" checkreturn="true"
+     />
+  </target>
+
+
+  <target name="check"
+   description="Check variables"
+   >
+    <fail unless="version" message="Version not defined!" />
+    <fail unless="sfuser" message="Sourceforge username not defined!" />
+    <fail unless="sfproject" message="Sourceforge project name not defined!" />
+    <fail unless="sffilepath" message="Sourceforge project file path not defined!" />
+  </target>
+
 </project>
\ No newline at end of file