Skip to content

Commit a3632d5

Browse files
author
Federico Fissore
committed
Windows: launch4j gets downloaded at build time
1 parent 36b4248 commit a3632d5

File tree

188 files changed

+23
-14269
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

+23
-14269
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ build/windows/jre.zip
1818
build/windows/libastylej*
1919
build/windows/arduino-*.zip
2020
build/windows/dist/gcc-*.tar.gz
21+
build/windows/launch4j-*
22+
build/windows/launcher/launch4j
23+
build/windows/WinAVR-*.zip
2124
build/macosx/arduino-*.zip
2225
build/macosx/dist/gcc-*.tar.gz
2326
build/macosx/libastylej*
@@ -30,5 +33,5 @@ test-bin
3033
.idea
3134

3235
hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h
36+
.DS_Store
3337

34-
hardware/arduino/avr/libraries/Bridge/examples/.DS_Store

build/build.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
2828
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux64" /></condition>
2929

30+
<condition property="launch4j-download-unpack-target-name" value="launch4j-windows"><os family="windows" /></condition>
31+
<property name="launch4j-download-unpack-target-name" value="launch4j-linux"/>
32+
3033
<condition property="arch-bits" value="32">
3134
<equals arg1="${platform}" arg2="linux32"/>
3235
</condition>
@@ -636,6 +639,20 @@
636639
<fail message="wrong platform (${os.name})" />
637640
</target>
638641

642+
<target name="download-launch4j-windows">
643+
<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" />
644+
<unzip dest="windows/launcher/" src="windows/launch4j-3.0.2-win32.zip" overwrite="true"/>
645+
</target>
646+
647+
<target name="download-launch4j-linux">
648+
<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" />
649+
650+
<exec executable="tar" dir="windows/launcher">
651+
<arg value="-xzf"/>
652+
<arg value="../launch4j-3.0.2-linux.tgz"/>
653+
</exec>
654+
</target>
655+
639656
<target name="windows-build"
640657
depends="revision-check, windows-checkos, subprojects-build"
641658
description="Build windows version">
@@ -689,6 +706,8 @@
689706
<param name="target.path" value="windows/work" />
690707
</antcall>
691708

709+
<antcall target="download-${launch4j-download-unpack-target-name}" />
710+
692711
<property name="launch4j.dir" value="windows/launcher/launch4j/" />
693712
<taskdef name="launch4j"
694713
classname="net.sf.launch4j.ant.Launch4jTask"

build/windows/launcher/launch4j/.classpath

Lines changed: 0 additions & 15 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)