X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/2a665e0f4eeb45c9d57df7dc7f9d853465b5fea9..81019df2b6d03e732b00e66913546af75bc4d560:/build.xml

diff --git a/build.xml b/build.xml
index 32b4f33..8237c65 100644
--- a/build.xml
+++ b/build.xml
@@ -6,22 +6,13 @@
     tasks around phorkie, like creating a release version,
     tagging a release
   -->
-  <property file="build.properties" />
-
-  <property name="version-m"  value="0.5" />
-  <property name="version"    value="0.5.0" />
+  <property name="version"    value="0.7.0" />
   <property name="stability"  value="beta" />
   <property name="releasenotes" value="
-Version 0.5.0 - 2015-01-29
+Version 0.7.0 - 2015-11-05
 --------------------------
-* Implement paste embedding via JavaScript
-* Implement paste embedding via oEmbed
-* Implement single file editing
-* Implement automatic login
-* Implement Elasticsearch 1.3 compatibility
-* Work around PHP bug #68347 to parse ini files correctly
-* Move clone URLs to sidebar
-* Move additional button into text field
+* Add support for elasticsearch 2.0
+* Add text file detection for unknown file extensions
 " />
   <property name="libdir"      value="${phing.dir}/lib"/>
 
@@ -33,9 +24,6 @@ Version 0.5.0 - 2015-01-29
   <property name="distfile"    value="dist/${zipfile}" />
   <property name="distpkgfile" value="dist/pear/${pkgfile}" />
 
-  <property name="sfproject"   value="phorkie" />
-  <property name="sffilepath"  value="p/ph/phorkie/" />
-
   <fileset id="fs.zip" dir=".">
    <include name="data/**"/>
    <include name="scripts/**"/>
@@ -49,6 +37,7 @@ Version 0.5.0 - 2015-01-29
 
    <exclude name="**/.git/"/>
    <exclude name="**/.gitignore/"/>
+   <exclude name="data/cache/**"/>
    <exclude name="data/config.php"/>
    <exclude name="www/**/.phar"/>
    <exclude name="www/repos"/>
@@ -64,9 +53,10 @@ Version 0.5.0 - 2015-01-29
    <include name="ChangeLog"/>
    <include name="README.rst"/>
 
-   <exclude name="data/config.php"/>
    <exclude name="**/.git/"/>
    <exclude name="**/.gitignore/"/>
+   <exclude name="data/cache/**"/>
+   <exclude name="data/config.php"/>
    <exclude name="www/**/.phar"/>
    <exclude name="www/repos"/>
   </fileset>
@@ -310,7 +300,7 @@ Version 0.5.0 - 2015-01-29
   </target>
 
 
-  <target name="build-docs" description="render documentation">
+  <target name="docs" description="render documentation">
    <rST format="html" uptodate="true">
     <fileset refid="fs.doc"/>
     <mapper type="regexp" from="^(.+?).rst$" to="dist/docs/\1.html"/>
@@ -322,39 +312,13 @@ Version 0.5.0 - 2015-01-29
   </target>
 
 
-  <target name="release" depends="check,zip,pear,deploy-sf"
-   description="Release the version on sourceforge"
+  <target name="release" depends="check,zip,pear"
+   description="Package the new version"
    >
    <!-- meta-target -->
   </target>
 
 
-  <!--
-  /home/frs/project/p/ph/phorkie/phorkie/v0.1/
-  /home/frs/project/p/ph/phorkie/phorkie/v0.1/phorkie-v0.1.0.zip
-  /home/frs/project/p/ph/phorkie/phorkie/v0.1/phorkie-v0.1.1.zip
-  https://sourceforge.net/apps/trac/sourceforge/wiki/Release%20files%20for%20download
-  -->
-  <target name="deploy-sf" depends="check,zip,phar"
-   description="Upload release to sourceforge"
-   >
-    <delete dir="dist/deploy-sf" /><!-- make empty -->
-    <mkdir dir="dist/deploy-sf" />
-    <mkdir dir="dist/deploy-sf/v${version-m}" />
-    <copy file="${distfile}" tofile="dist/deploy-sf/v${version-m}/${zipfile}"/>
-    <copy file="${pharpath}" tofile="dist/deploy-sf/v${version-m}/${pharfile}"/>
-    <!-- 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="false"
-     />
-    <!-- rsync always returns code 23 on sourceforge releases, so we
-         can't check return values -->
-  </target>
-
-
   <target name="preparedirs">
     <mkdir dir="dist" />
   </target>
@@ -363,9 +327,6 @@ Version 0.5.0 - 2015-01-29
    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>