Skip to content

Commit 271a2c5

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 a78cbf1 commit 271a2c5

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
@@ -54,6 +54,8 @@
5454
</java>
5555
</target>
5656

57+
<target name="test" depends="subprojects-test"/>
58+
5759
<!-- - - - - - - - - - - - - - - - - - -->
5860
<!-- Subprojects: Core, App, Libraries -->
5961
<!-- - - - - - - - - - - - - - - - - - -->
@@ -68,6 +70,9 @@
6870
<subant buildpath="../app" target="build"/>
6971
</target>
7072

73+
<target name="subprojects-test">
74+
<subant buildpath="../app" target="test"/>
75+
</target>
7176

7277
<!-- - - - - - - - - -->
7378
<!-- Basic Assembly -->
@@ -352,7 +357,7 @@
352357
<echo>
353358
=======================================================
354359
Arduino for Mac OS X was built. Grab the image from
355-
360+
356361
macosx/arduino-${version}-${platform}.zip
357362
=======================================================
358363
</echo>
@@ -591,7 +596,7 @@
591596
<echo>
592597
=======================================================
593598
Arduino for Linux was built. Grab the archive from
594-
599+
595600
build/linux/arduino-${version}-${platform}.tgz
596601
=======================================================
597602
</echo>
@@ -759,20 +764,20 @@
759764
-->
760765

761766
<zip destfile="windows/arduino-${version}-${platform}.zip" level="9">
762-
<zipfileset dir="windows/work"
767+
<zipfileset dir="windows/work"
763768
prefix="arduino-${version}" />
764769
</zip>
765770

766771
<zip destfile="windows/arduino-${version}-${platform}-expert.zip" level="9">
767-
<zipfileset dir="windows/work"
768-
prefix="arduino-${version}"
772+
<zipfileset dir="windows/work"
773+
prefix="arduino-${version}"
769774
excludes="java/**" />
770775
</zip>
771776

772777
<echo>
773778
=======================================================
774779
Arduino for Windows was built. Grab the archive from
775-
780+
776781
windows/arduino-${version}-${platform}.zip
777782
windows/arduino-${version}-${platform}-expert.zip
778783
=======================================================

0 commit comments

Comments
 (0)