improve build process
authorLars Kneschke <l.kneschke@metaways.de>
Mon, 23 Sep 2013 08:39:18 +0000 (10:39 +0200)
committerLars Kneschke <l.kneschke@metaways.de>
Tue, 24 Sep 2013 04:14:47 +0000 (06:14 +0200)
- removed phing from composer again, as building packages did not work
as expected any more
- download composer and put it into search path

Change-Id: I65ba2e9c1dc5e9f94f89e40ad3de3a28a3c4a03f

scripts/packaging/build-tine20-packages.sh
tine20/composer.json
tine20/composer.lock

index 7916ee3..0d45726 100755 (executable)
@@ -18,6 +18,8 @@ RELEASE=""
 GITBRANCH=""
 PACKAGEDIR=""
 
+PATH=$PATH:$MISCPACKAGESDIR:$TEMPDIR/tine20/vendor/bin
+
 #
 # checkout url to local directory
 #
@@ -285,6 +287,15 @@ function createSpecialArchives()
     (cd $TEMPDIR/voip; zip -qr ../../packages/tine20/$RELEASE/tine20-voip_$RELEASE.zip     .)
 }
 
+function setupComposer()
+{
+    wget -O $MISCPACKAGESDIR/composer.phar https://getcomposer.org/composer.phar
+    chmod ugo+x $MISCPACKAGESDIR/composer.phar
+    ln -sf composer $MISCPACKAGESDIR/composer.phar
+    
+    composer install -d $TEMPDIR/tine20 --no-dev
+}
+
 function setupPackageDir()
 {
     PACKAGEDIR="$BASEDIR/packages/tine20/$RELEASE"
@@ -384,6 +395,7 @@ getOptions "$@"
 
 createDirectories
 checkout "$GITURL" "$GITBRANCH"
+setupComposer
 setupPackageDir
 activateReleaseMode
 buildLangStats
index 12ae63d..debae05 100644 (file)
@@ -21,8 +21,7 @@
         "metaways/timezoneconvert": "dev-master"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.*",
-        "phing/phing": "2.5.*"
+        "phpunit/phpunit": "3.7.*"
     },
     "autoload": {
         "files": ["Tinebase/Helper.php"],
index 42cb0fc..38382eb 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": "61b79e3d8faa2a50f06dd953cfe1db60",
+    "hash": "f0d9456e791e80c320634762a5db04e3",
     "packages": [
         {
             "name": "codeplex/phpexcel",
     ],
     "packages-dev": [
         {
-            "name": "phing/phing",
-            "version": "2.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phingofficial/phing.git",
-                "reference": "62b6e0e03c093b8b18084a0994be1146b753a267"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phingofficial/phing/zipball/62b6e0e03c093b8b18084a0994be1146b753a267",
-                "reference": "62b6e0e03c093b8b18084a0994be1146b753a267",
-                "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-02-16 14:23:57"
-        },
-        {
             "name": "phpunit/php-code-coverage",
             "version": "1.2.13",
             "source": {