diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-08-04 20:45:42 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-08-04 20:45:42 +0200 |
| commit | c9ada4d2019356e948c93b34a9c8530fd5a0f90d (patch) | |
| tree | d8a3e17cce3411e170716c74224c90e6f9e42655 | |
| parent | 6cc4d78ebf2ea0be14e39b32d1ab38ee05cfbd7f (diff) | |
| parent | 2dae36e3fbde62c73c0ea08f5acd4e1629ebae34 (diff) | |
| download | forums-c9ada4d2019356e948c93b34a9c8530fd5a0f90d.tar forums-c9ada4d2019356e948c93b34a9c8530fd5a0f90d.tar.gz forums-c9ada4d2019356e948c93b34a9c8530fd5a0f90d.tar.bz2 forums-c9ada4d2019356e948c93b34a9c8530fd5a0f90d.tar.xz forums-c9ada4d2019356e948c93b34a9c8530fd5a0f90d.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
build/build.xml
| -rw-r--r-- | build/build.xml | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/build/build.xml b/build/build.xml index 3f3d5147a0..061b3c7791 100644 --- a/build/build.xml +++ b/build/build.xml @@ -49,7 +49,7 @@ --> <target name="composer"> <exec dir="phpBB" - command="php ../composer.phar install --dev" + command="php ../composer.phar install" checkreturn="true" passthru="true" /> </target> @@ -143,6 +143,7 @@ <phingcall target="export"> <property name="revision" value="release-${version}" /> <property name="dir" value="build/old_versions/release-${version}" /> + <property name="skip-composer" value="true" /> </phingcall> <phingcall target="clean-diff-dir"> @@ -248,26 +249,35 @@ <equals arg1="${composer-has-dependencies}" arg2="1" trim="true" /> <then> <!-- We have non-dev composer dependencies --> - <exec dir="." - command="git ls-tree ${revision} composer.phar" - checkreturn="true" - outputProperty='composer-ls-tree-output' /> <if> - <equals arg1="${composer-ls-tree-output}" arg2="" trim="true" /> + <not><isset property="skip-composer" /></not> <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 --no-dev --optimize-autoloader" + command="git ls-tree ${revision} composer.phar" checkreturn="true" - passthru="true" /> - <delete file="${dir}/composer.phar" /> - </else> + 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 --no-dev --optimize-autoloader" + checkreturn="true" + passthru="true" /> + <delete file="${dir}/composer.phar" /> + + <phingcall target="clean-vendor-dir"> + <property name="dir" value="${dir}" /> + </phingcall> + </else> + </if> + </then> </if> </then> <else> @@ -286,10 +296,6 @@ <delete dir="${dir}/config/development" /> <delete dir="${dir}/config/test" /> - <phingcall target="clean-vendor-dir"> - <property name="dir" value="${dir}" /> - </phingcall> - <echo msg="Setting permissions for checkout of ${revision} in ${dir}" /> <!-- set permissions of all files to 644, directories to 755 --> <exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" /> |