Skip to content

Commit

Permalink
Windows: launch4j gets downloaded at build time
Browse files Browse the repository at this point in the history
  • Loading branch information
Federico Fissore committed Mar 4, 2014
1 parent 994f0d7 commit 5a60f6b
Show file tree
Hide file tree
Showing 188 changed files with 25 additions and 14,272 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ build/linux/dist/*.tar.gz
build/linux/*.tgz
test-bin
*.iml
build/windows/launch4j-*
build/windows/launcher/launch4j
build/windows/WinAVR-*.zip
25 changes: 22 additions & 3 deletions build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
<condition property="platform"
value="linux64"><os family="unix" arch="amd64" /></condition>

<condition property="launch4j-download-unpack-target-name" value="launch4j-windows"><os family="windows" /></condition>
<property name="launch4j-download-unpack-target-name" value="launch4j-linux"/>

<!-- Libraries required for running arduino -->
<fileset dir=".." id="runtime.jars">
<include name="core/core.jar" />
Expand Down Expand Up @@ -457,8 +460,22 @@

<fail message="wrong platform (${os.name})" />
</target>

<target name="windows-build"

<target name="download-launch4j-windows">
<get src="http://switch.dl.sourceforge.net/project/launch4j/launch4j-3/3.0.2/launch4j-3.0.2-win32.zip" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />
<unzip dest="windows/launcher/" src="windows/launch4j-3.0.2-win32.zip" overwrite="true"/>
</target>

<target name="download-launch4j-linux">
<get src="http://switch.dl.sourceforge.net/project/launch4j/launch4j-3/3.0.2/launch4j-3.0.2-linux.tgz" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />

<exec executable="tar" dir="windows/launcher">
<arg value="-xzf"/>
<arg value="../launch4j-3.0.2-linux.tgz"/>
</exec>
</target>

<target name="windows-build"
depends="revision-check, windows-checkos, subprojects-build"
description="Build windows version">
<mkdir dir="windows/work" />
Expand Down Expand Up @@ -492,7 +509,9 @@
<antcall target="assemble">
<param name="target.path" value="windows/work" />
</antcall>


<antcall target="download-${launch4j-download-unpack-target-name}" />

<property name="launch4j.dir" value="windows/launcher/launch4j/" />
<taskdef name="launch4j"
classname="net.sf.launch4j.ant.Launch4jTask"
Expand Down
16 changes: 0 additions & 16 deletions build/windows/launcher/launch4j/.classpath

This file was deleted.

17 changes: 0 additions & 17 deletions build/windows/launcher/launch4j/.project

This file was deleted.

This file was deleted.

30 changes: 0 additions & 30 deletions build/windows/launcher/launch4j/LICENSE.txt

This file was deleted.

Loading

0 comments on commit 5a60f6b

Please sign in to comment.