ASSIGNED - # 8942: make build.xml work with phing 2.6.*
authorLars Kneschke <l.kneschke@metaways.de>
Wed, 25 Sep 2013 07:12:37 +0000 (09:12 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 26 Sep 2013 09:07:02 +0000 (11:07 +0200)
https://forge.tine20.org/mantisbt/view.php?id=8942

Change-Id: I56031c595e0cb0df998f106293ee6ba61955640f
Reviewed-on: https://gerrit.tine20.org/tine20/2355
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
scripts/packaging/build-tine20-packages.sh
tine20/build.xml
tine20/composer.json
tine20/composer.lock
tine20/library/jsb2tk/jsb2tk.php

index 69a917e..0ee59cd 100755 (executable)
@@ -163,7 +163,7 @@ function buildLangStats()
 function buildClient()
 {
     echo -n "building javascript clients ... "
-    phing -f $TEMPDIR/tine20/build.xml build
+    $TEMPDIR/tine20/vendor/bin/phing -f $TEMPDIR/tine20/build.xml build
     echo "done"
 }
 
index 7df30ba..65e4266 100644 (file)
         <foreach param="name" absparam="path" target="build-module">
             <fileset dir=".">
                 <type type="dir" />
-                <include name="*/*" />
-                <exclude name=".tx/*" />
-                <exclude name="build/*" />
-                <exclude name="docs/*" />
-                <exclude name="fonts/*" />
-                <exclude name="images/*" />
-                <exclude name="library/*" />
-                <exclude name="styles/*" />
-                <exclude name="themes/*" />
-                <exclude name="vendor/*" />
-                <exclude name="Tool/*" />
-                <exclude name="Zend/*" />
+                <include name="*" />
+                <exclude name="/" />
+                <exclude name="*.*" />
+                <exclude name=".tx" />
+                <exclude name="build" />
+                <exclude name="docs" />
+                <exclude name="fonts" />
+                <exclude name="images" />
+                <exclude name="library" />
+                <exclude name="styles" />
+                <exclude name="themes" />
+                <exclude name="vendor" />
+                <exclude name="Tool" />
+                <exclude name="Zend" />
             </fileset>
         </foreach>
     </target>
     
     <!-- ============================================  -->
+    <!-- Target: unit-test                                 -->
+    <!-- ============================================  -->
+    <target name="unit-test">
+        <copy file="${configPath}" tofile="../tests/tine20/config.inc.php" overwrite="true"/>
+        <phpunit configuration="../tests/tine20/phpunit.xml">
+            <formatter type="plain" usefile="false"/>
+            <batchtest>
+                <fileset dir="../tests/tine20">
+                  <include name="AllTests.php"/>
+                </fileset>
+            </batchtest>
+        </phpunit>
+    </target>
+    
+    <!-- ============================================  -->
     <!-- Target: build-module                          -->
     <!-- ============================================  -->
     <target name="build-module" description="build single module" depends="prepare">
index debae05..1b69a3b 100644 (file)
@@ -21,7 +21,8 @@
         "metaways/timezoneconvert": "dev-master"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.*"
+        "phpunit/phpunit": "3.7.*",
+        "phing/phing": "2.6.*"
     },
     "autoload": {
         "files": ["Tinebase/Helper.php"],
index 38382eb..c5523ca 100644 (file)
@@ -3,7 +3,7 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "f0d9456e791e80c320634762a5db04e3",
+    "hash": "bab208dc427673aa76ed0ff17e5b476d",
     "packages": [
         {
             "name": "codeplex/phpexcel",
     ],
     "packages-dev": [
         {
+            "name": "phing/phing",
+            "version": "2.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phingofficial/phing.git",
+                "reference": "3f7d71bf561bafea39087250f777b349438cc32e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phingofficial/phing/zipball/3f7d71bf561bafea39087250f777b349438cc32e",
+                "reference": "3f7d71bf561bafea39087250f777b349438cc32e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.0"
+            },
+            "bin": [
+                "bin/phing"
+            ],
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "classes/phing/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "classes"
+            ],
+            "license": [
+                "LGPL3"
+            ],
+            "authors": [
+                {
+                    "name": "Michiel Rook",
+                    "email": "mrook@php.net"
+                },
+                {
+                    "name": "Phing Community",
+                    "homepage": "http://www.phing.info/trac/wiki/Development/Contributors"
+                }
+            ],
+            "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.",
+            "homepage": "http://www.phing.info/",
+            "keywords": [
+                "build",
+                "task",
+                "tool"
+            ],
+            "time": "2013-08-26 21:13:03"
+        },
+        {
             "name": "phpunit/php-code-coverage",
             "version": "1.2.13",
             "source": {
index c9b89f5..e3e0111 100755 (executable)
@@ -459,7 +459,7 @@ class jsb2tk
     {
         // NOTE: it's a shame, that jsb2bin does not do the path rewrite!
         //       as it interprets the jsb2 file it would be the ultimate instance to do so!
-        `java -jar {$this->_jsb2bin} --projectFile {$_modul->jsb2file} --homeDir {$this->getHomeDir()}`;
+        `java -jar "{$this->_jsb2bin}" --projectFile "{$_modul->jsb2file}" --homeDir "{$this->getHomeDir()}"`;
     }
     
     public function adoptPath()