Skip to content

Commit ab5314d

Browse files
author
Federico Fissore
committed
moved tests in a separater ant target so that they can run AFTER assets like nodejs and the compiler are unpacked and ready to be used
1 parent 4ed0a6b commit ab5314d

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

app/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100

101101
</target>
102102

103-
<target name="build" depends="test" description="Build PDE">
103+
<target name="build" depends="compile" description="Build PDE">
104104
<jar basedir="bin" destfile="pde.jar" />
105105
</target>
106106
</project>

build/build.xml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
</java>
7070
</target>
7171

72+
<target name="test" depends="subprojects-test"/>
73+
7274
<!-- - - - - - - - - - - - - - - - - - -->
7375
<!-- Subprojects: Core, App, Libraries -->
7476
<!-- - - - - - - - - - - - - - - - - - -->
@@ -83,6 +85,9 @@
8385
<subant buildpath="../app" target="build"/>
8486
</target>
8587

88+
<target name="subprojects-test">
89+
<subant buildpath="../app" target="test"/>
90+
</target>
8691

8792
<!-- - - - - - - - - -->
8893
<!-- Basic Assembly -->
@@ -403,7 +408,7 @@
403408
<echo>
404409
=======================================================
405410
Arduino for Mac OS X was built. Grab the image from
406-
411+
407412
macosx/arduino-${version}-${platform}.zip
408413
=======================================================
409414
</echo>
@@ -678,7 +683,7 @@
678683
<echo>
679684
=======================================================
680685
Arduino for Linux was built. Grab the archive from
681-
686+
682687
build/linux/arduino-${version}-${platform}.tgz
683688
=======================================================
684689
</echo>
@@ -892,20 +897,20 @@
892897
-->
893898

894899
<zip destfile="windows/arduino-${version}-${platform}.zip" level="9">
895-
<zipfileset dir="windows/work"
900+
<zipfileset dir="windows/work"
896901
prefix="arduino-${version}" />
897902
</zip>
898903

899904
<zip destfile="windows/arduino-${version}-${platform}-expert.zip" level="9">
900-
<zipfileset dir="windows/work"
901-
prefix="arduino-${version}"
905+
<zipfileset dir="windows/work"
906+
prefix="arduino-${version}"
902907
excludes="java/**" />
903908
</zip>
904909

905910
<echo>
906911
=======================================================
907912
Arduino for Windows was built. Grab the archive from
908-
913+
909914
windows/arduino-${version}-${platform}.zip
910915
windows/arduino-${version}-${platform}-expert.zip
911916
=======================================================

0 commit comments

Comments
 (0)