remove JOGL from the repo, switch it to auto-download

benfry · benfry · commit ff3fe5918d18 · 2020-01-18T19:42:39.000-05:00
diff --git a/core/.gitignore b/core/.gitignore
@@ -1,3 +1,6 @@
 bin
 bin-test
 .idea
+
+/library/gluegen-rt*.jar
+/library/jogl-all*.jar
diff --git a/core/build.xml b/core/build.xml
@@ -7,6 +7,11 @@
     <delete dir="bin" />
     <delete dir="bin-test" />
     <delete file="library/core.jar" />
+
+    <delete>
+      <fileset dir="library" includes="gluegen-rt*.jar" />
+      <fileset dir="library" includes="jogl-all*.jar" />
+    </delete>
   </target>
 
   <target name="methods-check">
@@ -17,6 +22,39 @@
     <subant buildpath="methods" target="dist" />
   </target>
 
+  <!-- Base URL for the current version of JOGL. This should probably be changed to
+       a location on download.processing.org so that we know it's available forever. -->
+  <property name="jogl.url"
+            value="https://jogamp.org/deployment/archive/rc/v2.4.0-rc-20200115/jar" />
+
+  <available file="library/jogl-all.jar" property="jogl.present" />
+
+  <!-- ok to ignore failed downloads if we at least have a version that's local -->
+  <condition property="jogl.ignorable" value="false" else="true">
+    <isset property="jogl.present" />
+  </condition>
+
+  <target name="download-jogl" unless="jogl.present">
+    <get dest="library" usetimestamp="true" ignoreerrors="${jogl.ignorable}">
+      <url url="${jogl.url}/gluegen-rt-natives-linux-aarch64.jar" />
+      <url url="${jogl.url}/gluegen-rt-natives-linux-amd64.jar" />
+      <url url="${jogl.url}/gluegen-rt-natives-linux-armv6hf.jar" />
+      <url url="${jogl.url}/gluegen-rt-natives-linux-i586.jar" />
+      <url url="${jogl.url}/gluegen-rt-natives-macosx-universal.jar" />
+      <url url="${jogl.url}/gluegen-rt-natives-windows-amd64.jar" />
+      <url url="${jogl.url}/gluegen-rt-natives-windows-i586.jar" />
+      <url url="${jogl.url}/gluegen-rt.jar" />
+      <url url="${jogl.url}/jogl-all-natives-linux-aarch64.jar" />
+      <url url="${jogl.url}/jogl-all-natives-linux-amd64.jar" />
+      <url url="${jogl.url}/jogl-all-natives-linux-armv6hf.jar" />
+      <url url="${jogl.url}/jogl-all-natives-linux-i586.jar" />
+      <url url="${jogl.url}/jogl-all-natives-macosx-universal.jar" />
+      <url url="${jogl.url}/jogl-all-natives-windows-amd64.jar" />
+      <url url="${jogl.url}/jogl-all-natives-windows-i586.jar" />
+      <url url="${jogl.url}/jogl-all.jar" />
+    </get>
+  </target>
+
   <path id="classpath.base">
     <pathelement location="library/jogl-all.jar" />
     <pathelement location="library/gluegen-rt.jar" />
@@ -112,7 +150,8 @@
     <compilecommon srcdir="src" destdir="bin" classpath="classpath.base" />
   </target>
 
-  <target name="build" depends="methods-build, compile" description="Build core library">
+  <target name="build" depends="download-jogl, methods-build, compile"
+          description="Build core library">
     <jar basedir="bin" destfile="library/core.jar" />
   </target>
 
diff --git a/todo.txt b/todo.txt
@@ -14,6 +14,7 @@ X selecting a sketch in the Sketch menu no longer opens its window
 X   https://github.com/processing/processing/issues/5882
 X streamlining the jdk downloader
 X   https://github.com/processing/processing4/issues/47
+X remove JOGL from the repo, switch it to auto-download
 
 cross-ported from 3.5.4
 X don't remove entries from Recent menu on Save As
@@ -117,6 +118,8 @@ X   https://github.com/processing/processing-docs/issues/766
 X   was just an issue with https vs http
 
 before final release
+_ Update graphics and visual design elements for 4.x
+_   https://github.com/processing/processing4/issues/48
 _ Welcome screen or not?
 _ change help menu links to go to newer FAQ and the rest
 
