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

[ticket/14731] Skip composer when exporting old versions

Browse source 
PHPBB3-14731
This commit is contained in:
Oliver Schramm 2016-08-04 04:29:01 +02:00
parent 5330ea0f09
commit 6fd507f60d
1 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
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">
@ -251,6 +252,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"
@ -270,9 +274,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" />
@ -287,10 +297,6 @@
<delete dir="${dir}/develop" /> <delete dir="${dir}/develop" />
<delete dir="${dir}/install/data" /> <delete dir="${dir}/install/data" />
<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" />
@ -307,6 +313,7 @@
<delete dir="${dir}/vendor/lusitanian/oauth/examples" /> <delete dir="${dir}/vendor/lusitanian/oauth/examples" />
<delete dir="${dir}/vendor/lusitanian/oauth/tests" /> <delete dir="${dir}/vendor/lusitanian/oauth/tests" />
<delete file="${dir}/vendor/lusitanian/oauth/.gitignore" /> <delete file="${dir}/vendor/lusitanian/oauth/.gitignore" />
<delete file="${dir}/vendor/lusitanian/oauth/.scrutinizer.yml" />
<delete file="${dir}/vendor/lusitanian/oauth/.travis.yml" /> <delete file="${dir}/vendor/lusitanian/oauth/.travis.yml" />
<delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" /> <delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" />
<delete file="${dir}/vendor/lusitanian/oauth/README.md" /> <delete file="${dir}/vendor/lusitanian/oauth/README.md" />
@ -381,10 +388,9 @@
<delete file="${dir}/vendor/twig/twig/.editorconfig" /> <delete file="${dir}/vendor/twig/twig/.editorconfig" />
<delete file="${dir}/vendor/twig/twig/.gitignore" /> <delete file="${dir}/vendor/twig/twig/.gitignore" />
<delete file="${dir}/vendor/twig/twig/.travis.yml" /> <delete file="${dir}/vendor/twig/twig/.travis.yml" />
<delete file="${dir}/vendor/twig/twig/AUTHORS" />
<delete file="${dir}/vendor/twig/twig/CHANGELOG" /> <delete file="${dir}/vendor/twig/twig/CHANGELOG" />
<delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" /> <delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" />
<delete file="${dir}/vendor/twig/twig/README.markdown" /> <delete file="${dir}/vendor/twig/twig/README.rst" />
</target> </target>
<target name="clean-diff-dir"> <target name="clean-diff-dir">