aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2012-06-11 15:32:02 +0200
committerNils Adermann <naderman@naderman.de>2012-06-11 15:40:32 +0200
commit171d661765afaeb34213bfa8e049891e7661137c (patch)
treed09dcd5975605398920cecf0c444e615d5ab8f63
parentcffcef1e46f7502d679dcd489820e39bcf1f6709 (diff)
downloadforums-171d661765afaeb34213bfa8e049891e7661137c.tar
forums-171d661765afaeb34213bfa8e049891e7661137c.tar.gz
forums-171d661765afaeb34213bfa8e049891e7661137c.tar.bz2
forums-171d661765afaeb34213bfa8e049891e7661137c.tar.xz
forums-171d661765afaeb34213bfa8e049891e7661137c.zip
[ticket/10932] Use included composer.phar in build process
PHPBB3-10932
-rw-r--r--build/build.xml16
1 files changed, 2 insertions, 14 deletions
diff --git a/build/build.xml b/build/build.xml
index bc65cd0b38..1b8d42a660 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -45,13 +45,7 @@
<target name="composer" depends="clean,prepare">
<exec dir="./phpBB/"
- command="curl -s http://getcomposer.org/installer | php"
- passthru="true" />
- <exec dir="./phpBB/"
- command="php composer.phar install"
- passthru="true" />
- <exec dir="./phpBB/"
- command="rm composer.phar"
+ command="php ../composer.phar install"
passthru="true" />
</target>
@@ -169,13 +163,7 @@
checkreturn="true" />
<exec dir="${dir}"
- command="curl -s http://getcomposer.org/installer | php"
- passthru="true" />
- <exec dir="${dir}"
- command="php composer.phar install"
- passthru="true" />
- <exec dir="${dir}"
- command="rm composer.phar"
+ command="php ../composer.phar install"
passthru="true" />
<delete file="${dir}/config.php" />