remove jdt.compiler.jar as javac engine from subprojects

benfry · benfry · commit 37752a217c1d · 2021-07-04T21:21:39.000-04:00
diff --git a/build/shared/tools/MovieMaker/build.xml b/build/shared/tools/MovieMaker/build.xml
@@ -64,17 +64,14 @@
 
   <target name="compile" description="Compile sources">
     <mkdir dir="bin" />
-    <javac target="1.8"
-           source="1.8"
+    <javac target="11"
+           source="11"
            srcdir="src"
            destdir="bin"
            encoding="UTF-8"
            includeAntRuntime="false"
            classpath="../../../../app/bin"
-           nowarn="true">
-      <compilerclasspath path="../../../../java/mode/org.eclipse.jdt.core.jar;
-                               ../../../../java/mode/jdtCompilerAdapter.jar" />
-    </javac>
+           nowarn="true" />
   </target>
 
   <target name="build" depends="compile, prepare-ffmpeg" description="Build Movie Maker Tool">
diff --git a/java/libraries/io/build.xml b/java/libraries/io/build.xml
@@ -6,24 +6,22 @@
     <delete file="library/io.jar" />
   </target>
 
+  <property name="core.path" location="../../../core/library/core.jar" />
+
   <target name="compile" description="Compile sources">
     <condition property="core-built">
-      <available file="../../../core/library/core.jar" />
+      <available file="${core.path}" />
     </condition>
-    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
+    <fail unless="core-built" message="Please build the core library first and make sure it is located at ${core.path}" />
 
     <mkdir dir="bin" />
     <javac source="11"
-	   target="11"
-	   srcdir="src" destdir="bin"
-	   encoding="UTF-8"
-	   includeAntRuntime="false"
-	   classpath="../../../core/library/core.jar"
-	   nowarn="true"
-	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
-      <compilerclasspath path="../../mode/org.eclipse.jdt.core.jar;
-                               ../../mode/jdtCompilerAdapter.jar" />
-    </javac>
+	         target="11"
+	         srcdir="src" destdir="bin"
+	         encoding="UTF-8"
+	         includeAntRuntime="false"
+	         classpath="${core.path}"
+	         nowarn="true" />
   </target>
 
   <target name="build" depends="compile" description="Build I/O library">
diff --git a/java/libraries/io/library/.gitignore b/java/libraries/io/library/.gitignore
@@ -0,0 +1 @@
+io.jar
diff --git a/todo.txt b/todo.txt
@@ -8,6 +8,9 @@ X Editor.applyPreferences() was protected, now public
 X remove compound key actions (which were undocumented and not in use)
 X   clears up a lot of complexity in DefaultInputHandler
 X   if someone wants this, they could recreate it in a subclass
+X remove jdt.compiler.jar from subprojects
+X   no longer using JRE (doesn't exist), so it's not needed
+o   can we remove it altogether, or is it used by the PDE?
 
 readme
 X was fixed in the source for 4.0a5, but may not have been included in the dist
@@ -62,9 +65,6 @@ _ move ISSUE_TEMPLATE to .github subfolder
 _ lots more cleanup to do in javafx/build.xml
 _ only export 'tool' subfolder for Movie Maker (and Theme Engine?)
 
-_ remove jdt.compiler.jar from subprojects
-_   no longer using JRE (doesn't exist), so it's not needed
-_   can we remove it altogether, or is it used by the PDE?
 
 _ startup is so incredibly slow
 _   the splash screen comes up fairly quickly, so what gives?
