mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-02 14:57:37 +02:00
Code Issues Releases Wiki Activity

Merge PR #837 branch 'naderman/ticket/10932' into develop

Browse Source 
* naderman/ticket/10932:
  [ticket/10932] Use included composer.phar in build process
  [ticket/10932] Adding composer.phar to the repository to version it
This commit is contained in:
Oleg Pudeyev
2012-06-18 21:24:16 -04:00
parent e7da931d3a 171d661765
commit bb3942d86b
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build/build.xml
View File

@@ -45,13 +45,7 @@
<target name="composer" depends="clean,prepare"> <target name="composer" depends="clean,prepare">
<exec dir="./phpBB/" <exec dir="./phpBB/"
command="curl -s http://getcomposer.org/installer | php" command="php ../composer.phar install"
passthru="true" />
<exec dir="./phpBB/"
command="php composer.phar install"
passthru="true" />
<exec dir="./phpBB/"
command="rm composer.phar"
passthru="true" /> passthru="true" />
</target> </target>
@@ -169,13 +163,7 @@
checkreturn="true" /> checkreturn="true" />
<exec dir="${dir}" <exec dir="${dir}"
command="curl -s http://getcomposer.org/installer | php" command="php ../composer.phar install"
passthru="true" />
<exec dir="${dir}"
command="php composer.phar install"
passthru="true" />
<exec dir="${dir}"
command="rm composer.phar"
passthru="true" /> passthru="true" />
<delete file="${dir}/config.php" /> <delete file="${dir}/config.php" />

BIN
composer.phar Executable file
View File

Binary file not shown.