summaryrefslogtreecommitdiff
path: root/phing
diff options
context:
space:
mode:
authorctrlaltca <>2013-01-02 14:42:24 +0000
committerctrlaltca <>2013-01-02 14:42:24 +0000
commitedf2251aca60a970e822079d23933e5b70b26571 (patch)
tree366b6688efbb03f20f47268bea57859cea673c70 /phing
parent8e5f2510bd577e15095e46afc7d0ba6808549bf8 (diff)
backported all related changes up to 3229 to branch/3.2
Diffstat (limited to 'phing')
-rw-r--r--phing14
1 files changed, 11 insertions, 3 deletions
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