Skip to content

Commit

Permalink
Working PDE / example sketch in win64 for AdoptOpenJDK.
Browse files Browse the repository at this point in the history
As part of processing#5750 and processing#5753, have the development environment and example sketch working in Windows 64 bit with some display issues in the IDE in particular. This is using AdoptOpenJDK 11 with Windows 10.
  • Loading branch information
sampottinger committed Jan 17, 2019
1 parent 7701402 commit 99002c7
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 10 deletions.
32 changes: 26 additions & 6 deletions build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,16 @@

<property name="jre.tgz.path" value="${platform}/jre-${jdk.short}.tgz" />

<condition property="jre.tgz.path" value="${platform}/jre-${jdk.short}.tgz">
<not>
<equals arg1="${platform}" arg2="windows" />
</not>
</condition>

<condition property="jre.tgz.path" value="${platform}/jre-${jdk.short}.zip">
<equals arg1="${platform}" arg2="windows" />
</condition>

<target name="jre-check">
<available file="${jre.tgz.path}" property="jre.tgz.downloaded" />
</target>
Expand Down Expand Up @@ -248,7 +258,7 @@
<downloader train="${jdk.train}"
version="${jdk.version}"
openJdk="true"
platform="linux64"
platform="${platform}${sun.arch.data.model}"
update="${jdk.update}"
build="${jdk.build}"
hash="${jdk.hash}"
Expand Down Expand Up @@ -898,7 +908,7 @@
</and>
</condition>

<!-- Force full JDK when not on train 1 (force when on java 11) -->
<!-- Force full JDK when not on train 1 (starts with java 11) -->
<condition property="jre.dir" value="jdk-${jdk.esoteric}+${jdk.build}/">
<not>
<equals arg1="${jdk.train}" arg2="1" />
Expand Down Expand Up @@ -1171,12 +1181,22 @@
-->
<!-- Hopefully this is OK with the permissions (unlike Linux),
since those shouldn't matter on Windows. -->
<untar compression="gzip"
dest="windows/work"
<unzip dest="windows/work"
src="${jre.tgz.path}"
overwrite="false" />
<move file="windows/work/jre${jdk.esoteric}"
tofile="windows/work/java" />

<condition property="jre.dir" value="windows/work/jre${jdk.esoteric}">
<equals arg1="${jdk.train}" arg2="1" />
</condition>

<!-- Force full JDK when not on train 1 (starts with java 11) -->
<condition property="jre.dir" value="windows/work/jdk-${jdk.esoteric}+${jdk.build}/">
<not>
<equals arg1="${jdk.train}" arg2="1" />
</not>
</condition>

<move file="${jre.dir}" tofile="windows/work/java" />

<!-- Remove unused JRE bloat. -->
<delete failonerror="true">
Expand Down
2 changes: 1 addition & 1 deletion build/windows/config-cmd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<jre>
<path>java</path>
<!-- Deal with jokers who install JOGL, ANTLR, etc system-wide -->
<opt>-Djava.ext.dirs="%EXEDIR%\\java\\lib\\ext"</opt>
<!-- <opt>-Djava.ext.dirs="%EXEDIR%\\java\\lib\\ext"</opt> -->
<!-- Prevent a user-installed JNA from conflicting with our version.
https://github.com/processing/processing/issues/2239 -->
<opt>-Djna.nosys=true</opt>
Expand Down
6 changes: 3 additions & 3 deletions build/windows/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
<jre>
<path>java</path>
<!-- Deal with jokers who install JOGL, ANTLR, etc system-wide -->
<opt>-Djava.ext.dirs="%EXEDIR%\\java\\lib\\ext"</opt>
<!-- <opt>-Djava.ext.dirs="%EXEDIR%\\java\\lib\\ext"</opt> -->
<!-- https://github.com/processing/processing/issues/2239 -->
<opt>-Djna.nosys=true</opt>
<!-- Because nosys is set to true, the DLL in the current working
directory won't be considered. And we can't specify the user's
<!-- Because nosys is set to true, the DLL in the current working
directory won't be considered. And we can't specify the user's
directory here because that'll get us into encoding trouble.
(See https://github.com/processing/processing/issues/3624)
Instead, set this so that Native.loadNativeLibrary() will use
Expand Down

0 comments on commit 99002c7

Please sign in to comment.