Skip to content

Commit 0a5053d

Browse files
committed
Use phive for tool dependencies
1 parent c2757c5 commit 0a5053d

File tree

2 files changed

+14
-32
lines changed

2 files changed

+14
-32
lines changed

build.xml

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,22 @@
44

55
<target name="clean" description="Clean up and create artifact directories">
66
<delete dir="${basedir}/build/api"/>
7-
<delete dir="${basedir}/build/code-browser"/>
87
<delete dir="${basedir}/build/coverage"/>
98
<delete dir="${basedir}/build/logs"/>
109
<delete dir="${basedir}/build/pdepend"/>
1110

1211
<mkdir dir="${basedir}/build/api"/>
13-
<mkdir dir="${basedir}/build/code-browser"/>
1412
<mkdir dir="${basedir}/build/coverage"/>
1513
<mkdir dir="${basedir}/build/logs"/>
1614
<mkdir dir="${basedir}/build/pdepend"/>
1715
</target>
1816

1917
<target name="phpab">
20-
<exec executable="phpab">
18+
<exec executable="${basedir}/tools/phpab">
2119
<arg line="--cache ${basedir}/build/phpab/autoload.cache -o src/autoload.php" />
2220
<arg path="src" />
2321
</exec>
24-
<exec executable="phpab">
22+
<exec executable="${basedir}/tools/phpab">
2523
<arg line="--cache ${basedir}/build/phpab/autoload.cache" />
2624
<arg line="-o src/vendor.php" />
2725
<arg line="-b vendor" />
@@ -33,33 +31,11 @@
3331
</target>
3432

3533
<target name="phpunit" description="Run unit tests using PHPUnit and generates junit.xml and clover.xml">
36-
<exec executable="phpunit" failonerror="true"/>
37-
</target>
38-
39-
<target name="parallelTasks"
40-
description="Run the pdepend, phpmd, phpcpd, phpcs and phploc tasks in parallel using a maximum of 2 threads.">
41-
<parallel threadCount="2">
42-
<sequential>
43-
<antcall target="pdepend"/>
44-
<antcall target="phpmd"/>
45-
</sequential>
46-
<antcall target="phpcpd"/>
47-
<antcall target="phpcs"/>
48-
<antcall target="phploc"/>
49-
</parallel>
50-
</target>
51-
52-
<target name="pdepend" description="Generate jdepend.xml and software metrics charts using PHP_Depend">
53-
<exec executable="pdepend">
54-
<arg line="--jdepend-xml=${basedir}/build/logs/jdepend.xml
55-
--jdepend-chart=${basedir}/build/pdepend/dependencies.svg
56-
--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg
57-
${source}"/>
58-
</exec>
34+
<exec executable="${basedir}/tools/phpunit" failonerror="true"/>
5935
</target>
6036

6137
<target name="phpmd" description="Generate pmd.xml using PHPMD">
62-
<exec executable="phpmd">
38+
<exec executable="${basedir}/tools/phpmd">
6339
<arg line="${source}
6440
xml
6541
codesize,design,naming,unusedcode
@@ -68,13 +44,13 @@
6844
</target>
6945

7046
<target name="phpcpd" description="Generate pmd-cpd.xml using PHPCPD">
71-
<exec executable="phpcpd">
47+
<exec executable="${basedir}/tools/phpcpd">
7248
<arg line="--log-pmd ${basedir}/build/logs/pmd-cpd.xml ${source}"/>
7349
</exec>
7450
</target>
7551

7652
<target name="phploc" description="Generate phploc.xml">
77-
<exec executable="phploc">
53+
<exec executable="${basedir}/tools/phploc">
7854
<arg line="--count-tests --log-xml ${basedir}/build/logs/phploc.xml ${source} tests"/>
7955
</exec>
8056
</target>
@@ -144,7 +120,7 @@
144120
</fileset>
145121
</delete>
146122

147-
<exec executable="phpab" failonerror="true">
123+
<exec executable="${basedir}/tools/phpab" failonerror="true">
148124
<arg value="--var"/>
149125
<arg value="VERSION=${version}"/>
150126
<arg value="--all"/>
@@ -163,5 +139,5 @@
163139
<delete dir="${basedir}/build/phar/_tmp"/>
164140
</target>
165141

166-
<target name="build" depends="clean,parallelTasks,phpunit"/>
142+
<target name="build" depends="clean,phpab,phpunit"/>
167143
</project>

phive.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phive xmlns="https://phar.io/phive">
3+
<phar name="phploc" version="^3.0.1" installed="3.0.1" location="./tools/phploc"/>
4+
<phar name="phpunit" version="^6.0" installed="6.0.10" location="./tools/phpunit"/>
5+
<phar name="phpab" version="^1.23.0" installed="1.23.0" location="./tools/phpab"/>
6+
</phive>

0 commit comments

Comments
 (0)