mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-01 22:40:39 +02:00
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
This commit is contained in:
@@ -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" />
|
||||
|
BIN
composer.phar
Executable file
BIN
composer.phar
Executable file
Binary file not shown.
Reference in New Issue
Block a user