arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00
Code Activity

Fix Windows build

Browse Source 
Fix Windows build.
According to official Arduino build process now it is required to install JDK and point JAVA_HOME to it's location
This commit is contained in:
Toshik
2015-04-25 23:58:20 +03:00
parent eb2bbfa8f6
commit 05c08a78f5
1 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
build/build.xml
View File

@ -47,6 +47,9 @@
<condition property="launch4j-download-unpack-target-name" value="launch4j-windows"><os family="windows" /></condition>
<property name="launch4j-download-unpack-target-name" value="launch4j-linux"/>
<property name="MACOSX_BUNDLED_JVM" value="${java.home}/../"/>
<property name="WINDOWS_BUNDLED_JVM" value="${java.home}"/>
<!-- Libraries required for running arduino -->
<fileset dir=".." id="runtime.jars">
<include name="arduino-core/arduino-core.jar" />
@ -729,30 +732,6 @@
<target name="linux-dist" depends="build"
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}" />
<exec executable="tar" dir="linux">
@ -935,15 +914,21 @@
dir="windows/work" spawn="true"/>
</target>
<target name="windows-dist" depends="windows-build"
description="Create .zip files of windows version">
<target name="windows-dist" depends="windows-build" description="Create .zip files of windows version">
<antcall target="unzip">
<param name="archive_file" value="windows/jre-8u31.zip" />
<param name="archive_url" value="http://arduino.cc/download.php?f=/jre-8u31.zip" />
<param name="final_folder" value="${staging_folder}/work/java" />
<param name="dest_folder" value="${staging_folder}/work/" />
</antcall>
<loadproperties srcfile="${WINDOWS_BUNDLED_JVM}/../release" prefix="windows"/>
<fail message="It looks like ${WINDOWS_BUNDLED_JVM} does not contain a Windows JVM">
<condition>
<not>
<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">
<zipfileset dir="windows/work"