Skip to content

Commit 16915f1

Browse files
committed
Merge pull request arduino#1899 from arduino/arduino_debug_master_backport
Windows: arduino_debug.exe
2 parents 4c8199e + 5a60f6b commit 16915f1

File tree

189 files changed

+68
-14276
lines changed

Some content is hidden

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

189 files changed

+68
-14276
lines changed

.gitignore

+3
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

+27-7
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,19 +509,22 @@
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"
499518
classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
500519

501520
<copy todir="windows/work">
502-
<fileset dir="windows/launcher"
503-
includes="about.bmp, application.ico, config.xml"/>
521+
<fileset dir="windows/launcher"
522+
includes="about.bmp, application.ico, config.xml, config_debug.xml"/>
504523
</copy>
505524
<launch4j configFile="windows/work/config.xml" />
506-
<delete dir="windows/work"
507-
includes="about.bmp, application.ico, config.xml" />
525+
<launch4j configFile="windows/work/config_debug.xml" />
526+
<delete dir="windows/work"
527+
includes="about.bmp, application.ico, config.xml, config_debug.xml" />
508528

509529
<!-- cygwin requires html, dll, and exe to have the +x flag -->
510530
<chmod perm="755">
+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<launch4jConfig>
2+
<dontWrapJar>true</dontWrapJar>
3+
<headerType>console</headerType>
4+
<jar>lib</jar>
5+
<outfile>arduino_debug.exe</outfile>
6+
<errTitle></errTitle>
7+
<cmdLine></cmdLine>
8+
<chdir>.</chdir>
9+
<priority>normal</priority>
10+
<downloadUrl>http://java.sun.com/javase/downloads/</downloadUrl>
11+
<supportUrl></supportUrl>
12+
<customProcName>false</customProcName>
13+
<stayAlive>false</stayAlive>
14+
<manifest></manifest>
15+
<icon>application.ico</icon>
16+
<classPath>
17+
<mainClass>processing.app.Base</mainClass>
18+
<cp>lib/pde.jar</cp>
19+
<cp>lib/core.jar</cp>
20+
<cp>lib/jna.jar</cp>
21+
<cp>lib/ecj.jar</cp>
22+
<cp>lib/RXTXcomm.jar</cp>
23+
</classPath>
24+
<jre>
25+
<path>java</path>
26+
<minVersion>1.5.0</minVersion>
27+
<maxVersion></maxVersion>
28+
<jdkPreference>preferJre</jdkPreference>
29+
<opt>-Xms128m -Xmx128m</opt>
30+
</jre>
31+
<messages>
32+
<startupErr>An error occurred while starting the application.</startupErr>
33+
<bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.</bundledJreErr>
34+
<jreVersionErr>This application requires at least Java Development Kit</jreVersionErr>
35+
<launcherErr>The registry refers to a nonexistent Java Development Kit installation or the runtime is corrupted.</launcherErr>
36+
<instanceAlreadyExistsMsg>An application instance is already running.</instanceAlreadyExistsMsg>
37+
</messages>
38+
</launch4jConfig>

build/windows/launcher/launch4j/.classpath

-16
This file was deleted.

build/windows/launcher/launch4j/.project

-17
This file was deleted.

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

-12
This file was deleted.

build/windows/launcher/launch4j/LICENSE.txt

-30
This file was deleted.

0 commit comments

Comments
 (0)