Skip to content

Commit 5a60f6b

Browse files
author
Federico Fissore
committed
Windows: launch4j gets downloaded at build time
1 parent 994f0d7 commit 5a60f6b

File tree

188 files changed

+25
-14272
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+25
-14272
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ build/linux/dist/*.tar.gz
1919
build/linux/*.tgz
2020
test-bin
2121
*.iml
22+
build/windows/launch4j-*
23+
build/windows/launcher/launch4j
24+
build/windows/WinAVR-*.zip

build/build.xml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<condition property="platform"
2121
value="linux64"><os family="unix" arch="amd64" /></condition>
2222

23+
<condition property="launch4j-download-unpack-target-name" value="launch4j-windows"><os family="windows" /></condition>
24+
<property name="launch4j-download-unpack-target-name" value="launch4j-linux"/>
25+
2326
<!-- Libraries required for running arduino -->
2427
<fileset dir=".." id="runtime.jars">
2528
<include name="core/core.jar" />
@@ -457,8 +460,22 @@
457460

458461
<fail message="wrong platform (${os.name})" />
459462
</target>
460-
461-
<target name="windows-build"
463+
464+
<target name="download-launch4j-windows">
465+
<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" />
466+
<unzip dest="windows/launcher/" src="windows/launch4j-3.0.2-win32.zip" overwrite="true"/>
467+
</target>
468+
469+
<target name="download-launch4j-linux">
470+
<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" />
471+
472+
<exec executable="tar" dir="windows/launcher">
473+
<arg value="-xzf"/>
474+
<arg value="../launch4j-3.0.2-linux.tgz"/>
475+
</exec>
476+
</target>
477+
478+
<target name="windows-build"
462479
depends="revision-check, windows-checkos, subprojects-build"
463480
description="Build windows version">
464481
<mkdir dir="windows/work" />
@@ -492,7 +509,9 @@
492509
<antcall target="assemble">
493510
<param name="target.path" value="windows/work" />
494511
</antcall>
495-
512+
513+
<antcall target="download-${launch4j-download-unpack-target-name}" />
514+
496515
<property name="launch4j.dir" value="windows/launcher/launch4j/" />
497516
<taskdef name="launch4j"
498517
classname="net.sf.launch4j.ant.Launch4jTask"

build/windows/launcher/launch4j/.classpath

Lines changed: 0 additions & 16 deletions
This file was deleted.

build/windows/launcher/launch4j/.project

Lines changed: 0 additions & 17 deletions
This file was deleted.

build/windows/launcher/launch4j/.settings/org.eclipse.jdt.core.prefs

Lines changed: 0 additions & 12 deletions
This file was deleted.

build/windows/launcher/launch4j/LICENSE.txt

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)