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

Merge branch 'prep-release-3.1.10' into 3.1.x

Browse source 
* prep-release-3.1.10:
  [ticket/14805] Ignore platform requirements while building packages
This commit is contained in:
Tristan Darricau 2016-10-02 17:14:49 +02:00
commit 165e0edb2a
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
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" command="php ../composer.phar install --ignore-platform-reqs"
checkreturn="true" checkreturn="true"
passthru="true" /> passthru="true" />
</target> </target>
@ -270,7 +270,7 @@
command="git archive ${revision} composer.phar | tar -xf - -C ${dir}" command="git archive ${revision} composer.phar | tar -xf - -C ${dir}"
checkreturn="true" /> checkreturn="true" />
<exec dir="${dir}" <exec dir="${dir}"
command="php composer.phar install --no-dev --optimize-autoloader" command="php composer.phar install --no-dev --optimize-autoloader --ignore-platform-reqs"
checkreturn="true" checkreturn="true"
passthru="true" /> passthru="true" />
<delete file="${dir}/composer.phar" /> <delete file="${dir}/composer.phar" />