diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-07-13 13:12:10 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-07-13 13:12:10 -0400 |
| commit | 9a486539c3abcf927aabd1fa48c141a0aee1014d (patch) | |
| tree | f34c6c91b90d2ac0959346ca4f84cdab2f18f8b4 | |
| parent | 9d57c9635cf7d5044c275dfc5dbe19939e0a81b9 (diff) | |
| parent | e0aef4b3202041335ff0a7b62d9ca8112bd61ce9 (diff) | |
| download | forums-9a486539c3abcf927aabd1fa48c141a0aee1014d.tar forums-9a486539c3abcf927aabd1fa48c141a0aee1014d.tar.gz forums-9a486539c3abcf927aabd1fa48c141a0aee1014d.tar.bz2 forums-9a486539c3abcf927aabd1fa48c141a0aee1014d.tar.xz forums-9a486539c3abcf927aabd1fa48c141a0aee1014d.zip | |
Merge remote-tracking branch 'github-bantu/ticket/11674' into prep-release-3.0.12
* github-bantu/ticket/11674:
[ticket/11674] Do not include vendor folder if there are no dependencies.
| -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 e4fe24005f..a418f40b53 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" /> |