rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-29 18:52:13 +01:00
Code Issues Releases Activity

Merge pull request #3414 from martinjos/windows-build-jdk-fix

Browse Source 
Windows build: look for JDK release file in parent dir.
This commit is contained in:
Federico Fissore 2015-06-25 10:39:48 +02:00
commit 4114ef2f27
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/build.xml
View File

@ -905,7 +905,9 @@
<fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" /> <fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" />
</chmod> </chmod>
<loadproperties srcfile="${WINDOWS_BUNDLED_JVM}/release" prefix="windows"/> <!-- For JVM within JDK, release file is in parent directory -->
<property file="${WINDOWS_BUNDLED_JVM}/release" prefix="windows"/>
<property file="${WINDOWS_BUNDLED_JVM}/../release" prefix="windows"/>
<fail message="It looks like ${WINDOWS_BUNDLED_JVM} does not contain a Windows JVM"> <fail message="It looks like ${WINDOWS_BUNDLED_JVM} does not contain a Windows JVM">
<condition> <condition>