Skip to content

Commit

Permalink
Merge branch '6.5' into 7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed Sep 8, 2018
2 parents 80d7d6c + 85d78be commit fa36266
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@

<copy file="${basedir}/phpunit.xsd" tofile="${basedir}/build/phar/phpunit.xsd"/>

<exec executable="${basedir}/build/phar-manifest.php" output="${basedir}/build/phar/manifest.txt"/>
<exec executable="${basedir}/build/phar-manifest.php" output="${basedir}/build/phar/manifest.txt" failonerror="true"/>

<copy file="${basedir}/vendor/phpunit/php-code-coverage/LICENSE" tofile="${basedir}/build/phar/php-code-coverage/LICENSE"/>
<copy todir="${basedir}/build/phar/php-code-coverage">
Expand Down Expand Up @@ -326,12 +326,12 @@
</fileset>
</copy>

<exec executable="${basedir}/build/phar-version.php" outputproperty="_version">
<exec executable="${basedir}/build/phar-version.php" outputproperty="_version" failonerror="true">
<arg value="${version}"/>
<arg value="${type}"/>
</exec>

<exec executable="${basedir}/build/tools/phpab" taskname="phpab">
<exec executable="${basedir}/build/tools/phpab" taskname="phpab" failonerror="true">
<arg value="--all" />
<arg value="--static" />
<arg value="--once" />
Expand All @@ -348,7 +348,7 @@
<copy file="${basedir}/build/binary-phar-autoload.php.in" tofile="${basedir}/build/binary-phar-autoload.php"/>
<replace file="${basedir}/build/binary-phar-autoload.php" token="X.Y.Z" value="${_version}"/>

<exec executable="${basedir}/build/tools/phpab" taskname="phpab">
<exec executable="${basedir}/build/tools/phpab" taskname="phpab" failonerror="true">
<arg value="--all" />
<arg value="--nolower" />
<arg value="--static" />
Expand All @@ -369,7 +369,7 @@
</target>

<target name="-phar-determine-version">
<exec executable="${basedir}/build/version.php" outputproperty="version" />
<exec executable="${basedir}/build/version.php" outputproperty="version" failonerror="true" />
</target>

<target name="generate-project-documentation" depends="-phploc,-checkstyle,-phpunit">
Expand Down

0 comments on commit fa36266

Please sign in to comment.