From edf2251aca60a970e822079d23933e5b70b26571 Mon Sep 17 00:00:00 2001
From: ctrlaltca <>
Date: Wed, 2 Jan 2013 14:42:24 +0000
Subject: backported all related changes up to 3229 to branch/3.2

---
 phing | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'phing')

diff --git a/phing b/phing
index c2930e4c..a2f05a15 100644
--- a/phing
+++ b/phing
@@ -1,5 +1,13 @@
 #!/bin/sh
-PHING_HOME=`pwd`/buildscripts/phing
-export PHING_HOME
-php -d html_errors=off -qC buildscripts/phing/bin/phing.php $@
 
+# Old version: call phing directly (still working)
+#PHING_HOME=`pwd`/buildscripts/phing
+#export PHING_HOME
+
+#PHP_CLASSPATH=$PHING_HOME/classes
+#export PHP_CLASSPATH
+
+#php -d html_errors=off -qC buildscripts/phing/bin/phing.php $@
+
+# New version: let phing's wrapper do the dirty job
+./buildscripts/phing/bin/phing $@
\ No newline at end of file
-- 
cgit v1.2.3