diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-06-18 21:24:16 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-06-18 21:24:16 -0400 |
| commit | bb3942d86bbe619d718654e12f6754833bed3a9d (patch) | |
| tree | 1271d6f228befa57b8b076fcead59bb82ca5aead | |
| parent | e7da931d3a5c5e4e6b00283c26e62535032cc9b5 (diff) | |
| parent | 171d661765afaeb34213bfa8e049891e7661137c (diff) | |
| download | forums-bb3942d86bbe619d718654e12f6754833bed3a9d.tar forums-bb3942d86bbe619d718654e12f6754833bed3a9d.tar.gz forums-bb3942d86bbe619d718654e12f6754833bed3a9d.tar.bz2 forums-bb3942d86bbe619d718654e12f6754833bed3a9d.tar.xz forums-bb3942d86bbe619d718654e12f6754833bed3a9d.zip | |
Merge PR #837 branch 'naderman/ticket/10932' into develop
* naderman/ticket/10932:
[ticket/10932] Use included composer.phar in build process
[ticket/10932] Adding composer.phar to the repository to version it
| -rw-r--r-- | build/build.xml | 16 | ||||
| -rwxr-xr-x | composer.phar | bin | 0 -> 499053 bytes |
2 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" /> diff --git a/composer.phar b/composer.phar Binary files differnew file mode 100755 index 0000000000..3572477546 --- /dev/null +++ b/composer.phar |