noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows: JRE is chosen at build time via WINDOWS_BUNDLED_JVM property

This commit is contained in:
Federico Fissore 2015-04-13 16:28:17 +02:00
parent 818dc19553
commit 34d2f08118
2 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
build/build.xml
View File

@ -47,6 +47,7 @@
<property name="launch4j-download-unpack-target-name" value="launch4j-linux"/> <property name="launch4j-download-unpack-target-name" value="launch4j-linux"/>
<property name="MACOSX_BUNDLED_JVM" value="${java.home}/../"/> <property name="MACOSX_BUNDLED_JVM" value="${java.home}/../"/>
<property name="WINDOWS_BUNDLED_JVM" value="${java.home}"/>
<!-- Libraries required for running arduino --> <!-- Libraries required for running arduino -->
<fileset dir=".." id="runtime.jars"> <fileset dir=".." id="runtime.jars">
@ -693,30 +694,6 @@
<target name="linux-dist" depends="build" <target name="linux-dist" depends="build"
description="Build .tar.xz of linux version"> description="Build .tar.xz of linux version">
<!--get src="http://dev.processing.org/build/jre-tools-6u18-linux-i586.tgz"
dest="linux/jre.tgz"
usetimestamp="true" />
<untar compression="gzip"
dest="linux/work"
src="linux/jre.tgz"
overwrite="false"/-->
<!--
<tar compression="gzip" basedir="linux/work"
destfile="linux/arduino-${version}.tgz" />
<tar compression="gzip" destfile="linux/arduino-${version}-linux.tgz">
<tarfileset dir="linux/work"
prefix="arduino-${version}"
excludes="arduino,
hardware/tools/avrdude,
java/**"
/>
<tarfileset file="linux/work/arduino" filemode="755" prefix="arduino-${version}" />
<tarfileset file="linux/work/hardware/tools/avrdude" filemode="755"
prefix="arduino-${version}/hardware/tools" />
</tar>
-->
<move file="linux/work" tofile="linux/arduino-${version}" /> <move file="linux/work" tofile="linux/arduino-${version}" />
<exec executable="tar" dir="linux" failonerror="true"> <exec executable="tar" dir="linux" failonerror="true">
@ -876,15 +853,21 @@
<exec executable="windows/work/arduino.exe" dir="windows/work" spawn="true" failonerror="true"/> <exec executable="windows/work/arduino.exe" dir="windows/work" spawn="true" failonerror="true"/>
</target> </target>
<target name="windows-dist" depends="windows-build" <target name="windows-dist" depends="windows-build" description="Create .zip files of windows version">
description="Create .zip files of windows version">
<antcall target="unzip"> <loadproperties srcfile="${WINDOWS_BUNDLED_JVM}/release" prefix="windows"/>
<param name="archive_file" value="windows/jre-8u31.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/jre-8u31.zip" /> <fail message="It looks like ${WINDOWS_BUNDLED_JVM} does not contain a Windows JVM">
<param name="final_folder" value="${staging_folder}/work/java" /> <condition>
<param name="dest_folder" value="${staging_folder}/work/" /> <not>
</antcall> <equals arg1="${windows.OS_NAME}" arg2="&quot;Windows&quot;"/>
</not>
</condition>
</fail>
<copy todir="${staging_folder}/work/java" includeemptydirs="true" preservelastmodified="true" overwrite="true" failonerror="true">
<fileset dir="${WINDOWS_BUNDLED_JVM}" includes="*/**"/>
</copy>
<zip destfile="windows/arduino-${version}-${platform}.zip" level="9"> <zip destfile="windows/arduino-${version}-${platform}.zip" level="9">
<zipfileset dir="windows/work" prefix="arduino-${version}"/> <zipfileset dir="windows/work" prefix="arduino-${version}"/>

1
build/windows/jre-8u31.zip.sha
View File

@ -1 +0,0 @@
17bf4f25babaf70bdb68fd3464be163eb769c074