makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse source 
Conflicts:
	build/build.xml
This commit is contained in:
Marc Alexander 2016-08-04 20:45:42 +02:00
commit c9ada4d201
1 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build/build.xml
View file

@ -49,7 +49,7 @@
--> -->
<target name="composer"> <target name="composer">
<exec dir="phpBB" <exec dir="phpBB"
command="php ../composer.phar install --dev" command="php ../composer.phar install"
checkreturn="true" checkreturn="true"
passthru="true" /> passthru="true" />
</target> </target>
@ -143,6 +143,7 @@
<phingcall target="export"> <phingcall target="export">
<property name="revision" value="release-${version}" /> <property name="revision" value="release-${version}" />
<property name="dir" value="build/old_versions/release-${version}" /> <property name="dir" value="build/old_versions/release-${version}" />
<property name="skip-composer" value="true" />
</phingcall> </phingcall>
<phingcall target="clean-diff-dir"> <phingcall target="clean-diff-dir">
@ -248,6 +249,9 @@
<equals arg1="${composer-has-dependencies}" arg2="1" trim="true" /> <equals arg1="${composer-has-dependencies}" arg2="1" trim="true" />
<then> <then>
<!-- We have non-dev composer dependencies --> <!-- We have non-dev composer dependencies -->
<if>
<not><isset property="skip-composer" /></not>
<then>
<exec dir="." <exec dir="."
command="git ls-tree ${revision} composer.phar" command="git ls-tree ${revision} composer.phar"
checkreturn="true" checkreturn="true"
@ -267,9 +271,15 @@
checkreturn="true" checkreturn="true"
passthru="true" /> passthru="true" />
<delete file="${dir}/composer.phar" /> <delete file="${dir}/composer.phar" />
<phingcall target="clean-vendor-dir">
<property name="dir" value="${dir}" />
</phingcall>
</else> </else>
</if> </if>
</then> </then>
</if>
</then>
<else> <else>
<!-- We do not have composer dependencies, do not ship composer files --> <!-- We do not have composer dependencies, do not ship composer files -->
<delete file="${dir}/composer.json" /> <delete file="${dir}/composer.json" />
@ -286,10 +296,6 @@
<delete dir="${dir}/config/development" /> <delete dir="${dir}/config/development" />
<delete dir="${dir}/config/test" /> <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}" /> <echo msg="Setting permissions for checkout of ${revision} in ${dir}" />
<!-- set permissions of all files to 644, directories to 755 --> <!-- set permissions of all files to 644, directories to 755 -->
<exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" /> <exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" />