◐ Shell
reader mode source ↗
Skip to content
Merged

Simplify font situation to make it possible to use vanilla JRE trees #4639

Show file tree
Hide file tree
Changes from all commits
File filter
Conversations
Jump to
Diff view
Apply and reload
Show whitespace
Diff view
Apply and reload
22 changes: 3 additions & 19 deletions build/build.xml
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 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" />
Expand Down Expand Up @@ -756,7 +749,7 @@
<copy todir="linux/work">
<fileset dir=".." includes="core/library/**" />
<fileset dir="shared" includes="launch4j/**" />
<fileset dir="shared" includes="lib/**" excludes="lib/fonts/**" />
<fileset dir="shared" includes="modes/**" />
<fileset file="shared/revisions.txt" />
</copy>
Expand Down Expand Up @@ -857,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"
Expand Down Expand Up @@ -1053,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="modes/**" />
<fileset file="shared/revisions.txt" />
</copy>
Expand Down Expand Up @@ -1119,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"
Expand Down
Toggle all file notes Toggle all file annotations