Use fonts in lib/fonts instead of the JVM location for all OS

gohai · gohai · commit edd9ea36bb55 · 2016-08-28T16:31:15.000+02:00
diff --git a/build/build.xml b/build/build.xml
@@ -611,17 +611,10 @@
     <copy todir="macosx/work/Processing.app/Contents/Java">
       <fileset dir=".." includes="core/library/**" /> <!-- why this? -->
       <!--<fileset dir="shared" includes="launch4j/**" />-->
-      <fileset dir="shared" includes="lib/**" excludes="lib/fonts/**" />
+      <fileset dir="shared" includes="lib/**" />
       <fileset file="shared/revisions.txt" />
     </copy>
 
-    <!--
-    Processing.app/Contents/PlugIns/jdk1.7.0_40.jdk/Contents/Home/jre/lib/fonts
-    -->
-    <copy todir="macosx/work/Processing.app/Contents/PlugIns/jdk${jdk.esoteric}.jdk/Contents/Home/jre/lib/fonts">
-      <fileset dir="shared/lib/fonts" includes="*" />
-    </copy>
-
     <antcall target="assemble">
       <param name="target.path" 
              value="macosx/work/Processing.app/Contents/Java" />
@@ -756,9 +749,6 @@
     <copy todir="linux/work">
       <fileset dir=".." includes="core/library/**" />
       <fileset dir="shared" includes="launch4j/**" />
-      <!-- this used to excludes="lib/fonts/**", but instead, ship a second -->
-      <!-- copy of the font files on Linux, so that users can experiment with -->
-      <!-- drop-in or globally installed JVM versions -->
       <fileset dir="shared" includes="lib/**"  />
       <fileset dir="shared" includes="modes/**" />
       <fileset file="shared/revisions.txt" />
@@ -860,11 +850,6 @@
       -->
       <fileset refid="jre-optional-linux" />
     </delete>
-
-    <copy todir="linux/work/java/lib/fonts">
-      <fileset dir="shared/lib/fonts" includes="*" />
-    </copy>
-
   </target>
   
   <target name="linux-run" depends="linux-build" 
@@ -1056,7 +1041,7 @@
     <copy todir="windows/work">
       <fileset dir=".." includes="core/library/**" />
       <fileset dir="shared" includes="launch4j/**" />
-      <fileset dir="shared" includes="lib/**" excludes="lib/fonts/**" />
+      <fileset dir="shared" includes="lib/**" />
       <fileset dir="shared" includes="modes/**" />
       <fileset file="shared/revisions.txt" />
     </copy>
@@ -1122,10 +1107,6 @@
       -->
       <fileset refid="jre-optional-windows" />
     </delete>
-
-    <copy todir="windows/work/java/lib/fonts">
-      <fileset dir="shared/lib/fonts" includes="*" />
-    </copy>
   </target>
   
   <target name="windows-run" depends="windows-build" 
