X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/ba893ee7ce9fb4bd5676dd475cc0ff6649ece7e5..b4c4e7fa6d27e42bd96e48dc2d844eab49778de3:/build.xml?ds=sidebyside

diff --git a/build.xml b/build.xml
index 78722f3..32b4f33 100644
--- a/build.xml
+++ b/build.xml
@@ -8,39 +8,31 @@
   -->
   <property file="build.properties" />
 
-  <property name="version-m"  value="0.4" />
-  <property name="version"    value="0.4.0" />
-  <property name="stability"  value="alpha" />
+  <property name="version-m"  value="0.5" />
+  <property name="version"    value="0.5.0" />
+  <property name="stability"  value="beta" />
   <property name="releasenotes" value="
-Version 0.3.1 - 2012-09-27
+Version 0.5.0 - 2015-01-29
 --------------------------
-* Check for OpenID package in SetupCheck
-* Fix bug #24: setupcheck: verify geshi installation
-* Fix bug #25: setupcheck: verify markdown
-
-Version 0.3.0 - 2012-09-27
---------------------------
-
-* Fix bug #10: error when nothing submitted [cweiske]
-* Fix bug #11: do not index edit, delete and tool pages [cweiske]
-* Fix bug #20: elasticsearch error on deletion [cweiske]
-* Fix bug #22: Edited pastes not in 'recently created' [cweiske]
-* Fix bug #23: 'work dir not found' on failed remote fork [cweiske]
-* Implement request #5: Add OpenID authentication [jnovack]
-* Implement request #9: autodetect file type [cweiske]
-* Implement request #12: DOAP and rel='vcs-git' support [cweiske]
-* Implement request #13: remote forking support [cweiske]
-* Hide additional file fields by default, button to toggle their visibility
-  [cweiske]
-* Markdown support [jnovack]
-* Added nginx rewrite rules to README [skl]
+* 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
 " />
   <property name="libdir"      value="${phing.dir}/lib"/>
+
   <property name="zipfile"     value="${phing.project.name}-${version}.tar.bz2" />
-  <property name="pharfile"    value="${phing.dir}/dist/${phing.project.name}-${version}.phar" />
+  <property name="pharfile"    value="${phing.project.name}-${version}.phar" />
   <property name="pkgfile"     value="${phing.project.name}-${version}.tgz" />
+
+  <property name="pharpath"    value="${phing.dir}/dist/${pharfile}" />
   <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/" />
 
@@ -55,8 +47,11 @@ Version 0.3.0 - 2012-09-27
    <include name="NEWS.rst"/>
    <include name="README.rst"/>
 
+   <exclude name="**/.git/"/>
    <exclude name="**/.gitignore/"/>
    <exclude name="data/config.php"/>
+   <exclude name="www/**/.phar"/>
+   <exclude name="www/repos"/>
   </fileset>
 
   <fileset id="fs.phar" dir="${phing.dir}">
@@ -70,8 +65,10 @@ Version 0.3.0 - 2012-09-27
    <include name="README.rst"/>
 
    <exclude name="data/config.php"/>
-   <exclude name="**/.gitignore/"/>
    <exclude name="**/.git/"/>
+   <exclude name="**/.gitignore/"/>
+   <exclude name="www/**/.phar"/>
+   <exclude name="www/repos"/>
   </fileset>
 
   <fileset id="fs.doc" dir=".">
@@ -85,10 +82,10 @@ Version 0.3.0 - 2012-09-27
   <target name="phar" depends="preparedirs,collectdeps"
           description="Create phar file for release"
   >
-   <delete file="${pharfile}"/>
+   <delete file="${pharpath}"/>
    <exec command="php scripts/build-rewritemap.php" dir="${phing.dir}"/>
    <pharpackage basedir="${phing.dir}"
-                destfile="${pharfile}"
+                destfile="${pharpath}"
                 stub="${phing.dir}/src/stub-phar.php"
                 alias="phorkie.phar"
    >
@@ -97,7 +94,7 @@ Version 0.3.0 - 2012-09-27
 
    <exec executable="bzip2" dir="${phing.dir}/dist">
     <arg value="-kf"/>
-    <arg file="${pharfile}"/>
+    <arg file="${pharpath}"/>
    </exec>
   </target>
 
@@ -108,7 +105,9 @@ Version 0.3.0 - 2012-09-27
 
    <!-- requires phing >= 2.8.0 -->
    <copy todir="${libdir}">
+    <pearPackageFileset package="pear.php.net/Cache_Lite"/><!-- OpenID -->
     <pearPackageFileset package="pear.php.net/Console_Getopt"/>
+    <pearPackageFileset package="pear.php.net/Crypt_DiffieHellman"/><!-- OpenID -->
     <pearPackageFileset package="pear.php.net/Date_HumanDiff"/>
     <pearPackageFileset package="pear.geshi.org/geshi">
      <!-- remove files that are probably not needed to save space in the .phar -->
@@ -134,8 +133,10 @@ Version 0.3.0 - 2012-09-27
     </pearPackageFileset>
     <pearPackageFileset package="pear.php.net/Services_Libravatar"/>
     <pearPackageFileset package="pear2.php.net/PEAR2_Services_Linkback"/>
+    <pearPackageFileset package="pear.php.net/Services_Yadis"/>
     <pearPackageFileset package="pear.php.net/System_Command"/>
     <pearPackageFileset package="pear.twig-project.org/Twig"/>
+    <pearPackageFileset package="pear.php.net/Validate"/>
     <pearPackageFileset package="pear.php.net/VersionControl_Git"/>
    </copy>
   </target>
@@ -161,7 +162,7 @@ Version 0.3.0 - 2012-09-27
 
 
 
-  <target name="package" depends="check"
+  <target name="pear" depends="check"
    description="Creates the pear package"
   >
    <d51pearpkg2 dir="." baseinstalldir="/">
@@ -201,6 +202,10 @@ Version 0.3.0 - 2012-09-27
                 channel="pear.php.net"
                 minimum_version="2.4.8"
                 />
+       <package name="PEAR2_Services_Linkback"
+                channel="pear2.php.net"
+                minimum_version="0.2.1"
+                />
        <package name="Services_Libravatar"
                 channel="pear.php.net"
                 minimum_version="0.2.2"
@@ -317,7 +322,7 @@ Version 0.3.0 - 2012-09-27
   </target>
 
 
-  <target name="release" depends="check,zip,package,deploy-sf"
+  <target name="release" depends="check,zip,pear,deploy-sf"
    description="Release the version on sourceforge"
    >
    <!-- meta-target -->
@@ -330,13 +335,14 @@ Version 0.3.0 - 2012-09-27
   /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"
+  <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" />
     -->