diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-07-13 13:12:28 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-07-13 13:12:28 -0400 |
| commit | 1783134217830223edfe9bde616e424c4974b6af (patch) | |
| tree | 2d1aa39fe7e4c379b33798474b9512dbc22934b7 /build | |
| parent | c39d3b56a7ceff219ea75392bf22e18e98142288 (diff) | |
| parent | 4b8126585deb74bf9c9e4dbbcf22a66a4ed588a9 (diff) | |
| download | forums-1783134217830223edfe9bde616e424c4974b6af.tar forums-1783134217830223edfe9bde616e424c4974b6af.tar.gz forums-1783134217830223edfe9bde616e424c4974b6af.tar.bz2 forums-1783134217830223edfe9bde616e424c4974b6af.tar.xz forums-1783134217830223edfe9bde616e424c4974b6af.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11674] Do not include vendor folder if there are no dependencies.
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/build/build.xml b/build/build.xml index 02518ac441..5b4cf8b496 100644 --- a/build/build.xml +++ b/build/build.xml @@ -169,26 +169,42 @@ command="git archive ${revision} | tar -xf - -C ../${dir}" checkreturn="true" /> - <!-- - If composer.phar exists in this version of the tree, also export - it into ${dir}, install dependencies, then delete it again. - --> + <!-- Install composer dependencies, if there are any. --> <exec dir="." - command="git ls-tree ${revision} composer.phar" + command='php -r "\$j = json_decode(file_get_contents("composer.json")); echo isset(\$j->require);"' checkreturn="true" - outputProperty='composer-ls-tree-output' /> + outputProperty='composer-has-dependencies' /> <if> - <not><equals arg1="${composer-ls-tree-output}" arg2="" trim="true" /></not> + <equals arg1="${composer-has-dependencies}" arg2="1" trim="true" /> <then> + <!-- We have non-dev composer dependencies --> <exec dir="." - command="git archive ${revision} composer.phar | tar -xf - -C ${dir}" - checkreturn="true" /> - <exec dir="${dir}" - command="php composer.phar install" + command="git ls-tree ${revision} composer.phar" checkreturn="true" - passthru="true" /> - <delete file="${dir}/composer.phar" /> + outputProperty='composer-ls-tree-output' /> + <if> + <equals arg1="${composer-ls-tree-output}" arg2="" trim="true" /> + <then> + <fail message="There are composer dependencies, but composer.phar is missing." /> + </then> + <else> + <!-- Export the phar, install dependencies, delete phar. --> + <exec dir="." + command="git archive ${revision} composer.phar | tar -xf - -C ${dir}" + checkreturn="true" /> + <exec dir="${dir}" + command="php composer.phar install" + checkreturn="true" + passthru="true" /> + <delete file="${dir}/composer.phar" /> + </else> + </if> </then> + <else> + <!-- We do not have composer dependencies, do not ship composer files --> + <delete file="${dir}/composer.json" /> + <delete file="${dir}/composer.lock" /> + </else> </if> <delete file="${dir}/config.php" /> |