diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-07-14 10:55:32 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-07-14 10:55:32 -0700 |
| commit | 8d8a0602d6670764ccd01b2082b9d085f773f8e0 (patch) | |
| tree | 2b528d2b421be26c2f6f5784f9ae1d1756091540 /build | |
| parent | b0905cc1d20e0e30d4decabc5bb82a68aa34baa1 (diff) | |
| parent | da1ee75140608220b13908c74f5157033689db8c (diff) | |
| download | forums-8d8a0602d6670764ccd01b2082b9d085f773f8e0.tar forums-8d8a0602d6670764ccd01b2082b9d085f773f8e0.tar.gz forums-8d8a0602d6670764ccd01b2082b9d085f773f8e0.tar.bz2 forums-8d8a0602d6670764ccd01b2082b9d085f773f8e0.tar.xz forums-8d8a0602d6670764ccd01b2082b9d085f773f8e0.zip | |
Merge pull request #1567 from bantu/ticket/11704
[ticket/11704] phing build script does not include vendor folder, even if there are dependencies
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index a418f40b53..bb88bd3cfa 100644 --- a/build/build.xml +++ b/build/build.xml @@ -170,8 +170,8 @@ checkreturn="true" /> <!-- Install composer dependencies, if there are any. --> - <exec dir="." - command='php -r "\$j = json_decode(file_get_contents("composer.json")); echo isset(\$j->require);"' + <exec dir="${dir}" + command='php -r "\$j = json_decode(file_get_contents(\"composer.json\")); echo isset(\$j->require);"' checkreturn="true" outputProperty='composer-has-dependencies' /> <if> |