Detect text files for unknown file types
[phorkie.git] / build.xml
index dbf828d8f8d234ba4a3203fbff8f25ee091f38d7..6a864ce5f6073c428530d0852a783f64b5d15123 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -8,39 +8,25 @@
   -->
   <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.6" />
+  <property name="version"    value="0.6.1" />
+  <property name="stability"  value="beta" />
   <property name="releasenotes" value="
-Version 0.3.1 - 2012-09-27
+Version 0.6.1 - 2015-07-15
 --------------------------
-* 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]
+* Fix crash when renaming file
+* Fix jumping to file anchor after file rename
 " />
   <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 +41,12 @@ Version 0.3.0 - 2012-09-27
    <include name="NEWS.rst"/>
    <include name="README.rst"/>
 
+   <exclude name="**/.git/"/>
    <exclude name="**/.gitignore/"/>
+   <exclude name="data/cache/**"/>
    <exclude name="data/config.php"/>
+   <exclude name="www/**/.phar"/>
+   <exclude name="www/repos"/>
   </fileset>
 
   <fileset id="fs.phar" dir="${phing.dir}">
@@ -69,9 +59,12 @@ Version 0.3.0 - 2012-09-27
    <include name="ChangeLog"/>
    <include name="README.rst"/>
 
-   <exclude name="data/config.php"/>
-   <exclude name="**/.gitignore/"/>
    <exclude name="**/.git/"/>
+   <exclude name="**/.gitignore/"/>
+   <exclude name="data/cache/**"/>
+   <exclude name="data/config.php"/>
+   <exclude name="www/**/.phar"/>
+   <exclude name="www/repos"/>
   </fileset>
 
   <fileset id="fs.doc" dir=".">
@@ -82,13 +75,13 @@ Version 0.3.0 - 2012-09-27
   <taskdef name="d51pearpkg2" classname="phing.tasks.ext.d51PearPkg2Task" />
 
 
-  <target name="phar" depends="collectdeps"
+  <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 +90,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 +101,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 -->
@@ -133,15 +128,17 @@ Version 0.3.0 - 2012-09-27
      <include name="System.php"/>
     </pearPackageFileset>
     <pearPackageFileset package="pear.php.net/Services_Libravatar"/>
-    <pearPackageFileset package="pear2.php.net/Services_Linkback"/>
+    <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>
 
 
-  <target name="zip" depends="check"
+  <target name="zip" depends="preparedirs"
    description="Create zip file for release"
    >
     <!--
@@ -161,7 +158,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 +198,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 +318,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 +331,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" />
     -->
@@ -349,15 +351,17 @@ Version 0.3.0 - 2012-09-27
   </target>
 
 
-  <target name="check"
+  <target name="preparedirs">
+    <mkdir dir="dist" />
+  </target>
+
+  <target name="check" depends="preparedirs"
    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!" />
-
-    <mkdir dir="dist" />
   </target>
 
 </project>