eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-05-03 17:35:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove lots of dead/unused parts of javafx/build.xml

Browse Source
This commit is contained in:
Ben Fry
2021-07-04 21:28:58 -04:00
parent 37752a217c
commit 47e9afe499
2 changed files with 7 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

232
java/libraries/javafx/build.xml
View File

@@ -1,13 +1,12 @@
<?xml version="1.0"?>
<project name="Processing JavaFX renderer" default="build">
<!-- using 'location' here will resolve to an absolute path -->
<!-- Using 'location' here to resolve to an absolute path -->
<property name="core.path" location="../../../core/library/core.jar" />
<property name="library.path" location="./library" />
<target name="clean" description="Clean the build directories">
<delete dir="bin" />
<!-- <delete file="${library.path}/javafx.jar" /> -->
<!-- Remove everything, which includes javafx.jar and files extracted from
GluonHQ downloads, but those can be reproduced from the downloaded zips. -->
<delete dir="${library.path}" />
@@ -20,35 +19,12 @@
</or>
</condition>
<!-- JavaFX got removed from the Oracle's JDK for arm and Java 11 -->
<condition property="jfx.available" value="true">
<and>
<not><equals arg1="${os.arch}" arg2="arm" /></not>
</and>
</condition>
<!-- - - - - - -->
<!-- As of 210117, Gluon has 11.0.8 available for commercial clients
as an LTS release, but 11.0.2 is the latest free/public version -->
<!--
<property name="jfx.train" value="11" />
<property name="jfx.version" value="0" />
<property name="jfx.update" value="2" />
<property name="jfx.build" value="0" />
<property name="jfx.name" value="${jfx.train}.${jfx.version}.${jfx.update}" />
-->
<!-- with 16, there's no 16.0.3 it's just "16" -->
<!-- <property name="jfx.name" value="16" /> -->
<!-- Before 4.0a5, these included longer lists of files to remove in order
to keep downloads and exported applications smaller. With Java 11,
it's a losing battle, so we're only removing the worst offenders.
https://github.com/processing/processing/issues/3288 -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!--
@@ -65,7 +41,7 @@
https://gluonhq.com/download/javafx-16-sdk-linux
-->
<!-- JavaFX got removed from the Oracle's JDK for ARM and Java 11.
<!-- JavaFX was removed from the Oracle's JDK for ARM and Java 11.
There are arm32 and aarch64 builds for Linux (compatible with the Pi?)
but they're Early Access releases of JavaFX 17.
Downloads page is at https://gluonhq.com/products/javafx/
@@ -85,24 +61,19 @@
dest="${gluon.base}.zip"
usetimestamp="true" />
<!-- <available file="${library.path}/javafx.base.jar"
property="javafx.jars.exist" />
-->
<antcall target="unzip-gluon-jars" />
<antcall target="unzip-gluon-natives" />
</target>
<!-- extract the .jar files from the first javafx we run across -->
<!-- <target name="unzip-gluon-jars" unless="${javafx.jars.exist}"> -->
<target name="unzip-gluon-jars">
<property name="modules.path" value="${platform.path}/modules" />
<echo message="Extracting jars from ${gluon.base}.zip to ${modules.path}" />
<!-- should javafx.properties be copyed? is it used for anything? [fry 210620] -->
<!-- should javafx.properties be copied? is it used for anything? [fry 210620] -->
<!-- https://ant.apache.org/manual/Tasks/unzip.html -->
<!-- <unzip dest="${library.path}" src="${gluon.base}.zip" overwrite="true"> -->
<!-- !#($*#! the builds have *slightly* different classes in each release
(WinPlatformFactory not in macOS .jar... FFS it 1100 bytes of glue code)
(WinPlatformFactory not in macOS .jar... FFS it's 1100 bytes of glue code)
So the .jar files go into the native subdirectories as well. -->
<unzip dest="${modules.path}" src="${gluon.base}.zip" overwrite="true">
<patternset>
@@ -125,11 +96,11 @@
<include name="**/*.dll" />
<include name="**/*.dylib" />
<include name="**/*.so" />
<!-- The web library isn't included because this library is massive.
<!-- The webkit library isn't included because this library is massive.
Remove libjfxwebkit.dylib, libjfxwebkit.so, jfxwebkit.dll -->
<exclude name="**/*jfxwebkit.*" />
<!-- Not using this either, but since we're using include, no need for this -->
<!-- Not using this either, but since we're using 'include', no need for it -->
<!-- <exclude name="**/src.zip" /> -->
</patternset>
@@ -139,12 +110,6 @@
</unzip>
</target>
<!--
<target name="clean-javafx">
<delete dir="." includes="**/javafx-*-sdk*.zip" />
</target>
-->
<target name="download-javafx">
<property name="gluon.version" value="16" />
<!-- current Early Access version, includes support for other architectures -->
@@ -170,177 +135,6 @@
</antcall>
</target>
<!--
<antcall target="gluon-download">
</antcall>
<get src="https://gluonhq.com/download/javafx-${gluon.version}-sdk-mac"
dest="${temp.zip}"
usetimestamp="true" />
<antcall target="unzip-gluon-natives">
<param name="source.zip" value="${temp.zip}" />
<param name="target.path" value="${library.path}/macosx" />
</antcall>
<get src="https://gluonhq.com/download/javafx-${gluon.version}-sdk-windows"
dest="${temp.zip}"
usetimestamp="true" />
-->
<!-- <tempfile property="temp.file" destDir="${java.io.tmpdir}" prefix="build"/> -->
<!--
<antcall target="gluon-download">
<param name="gluon.version" value="16" />
<param name="gluon.version" value="16" />
</antcall>
-->
<!--
<target name="jfx-download" depends="jfx-check, downloader-setup"
unless="jfx.zip.downloaded">
<condition property="jfx.platform" value="linux">
<equals arg1="${target-platform}" arg2="linux" />
</condition>
<condition property="jfx.platform" value="mac">
<equals arg1="${target-platform}" arg2="macosx" />
</condition>
<condition property="jfx.platform" value="windows">
<equals arg1="${target-platform}" arg2="windows" />
</condition>
<property name="jfx.url"
value="https://gluonhq.com/download/javafx-${jfx.name}-sdk-${jfx.platform}" />
<echo message="${jfx.platform} ${jfx.name} ${jfx.url}" />
<get src="${jfx.url}"
dest="${jfx.path.zip}"
usetimestamp="true" />
</target>
-->
<!--
<downloader component="jfx"
train="${jfx.train}"
version="${jfx.version}"
platform="${target-platform}${jdk.data.model}"
update="${jfx.update}"
build="1"
flavor="${target-platform}${jdk.data.model}.zip"
path="${jfx.path.zip}" />
-->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!--
<macrodef name="preparejfx">
<sequential>
<if>
<equals arg1="${jfx.available}" arg2="true" />
<then>
<!- - Extract JavaFX - ->
<echo message="Target jfx: ${jfx.path.zip}"/>
<unzip dest="${target-platform}" src="${jfx.path.zip}" overwrite="true">
<patternset>
<!- - These two aren't supported/used anyway - ->
<!- - javafx.web.jar, javafx-swt.jar - ->
<exclude name="**/javafx.web.jar" />
<exclude name="**/javafx-swt.jar" />
<!- - The web library isn't included because this library is massive.
Remove libjfxwebkit.dylib, libjfxwebkit.so, jfxwebkit.dll - ->
<exclude name="**/*jfxwebkit.*" />
<!- - Not using this either - ->
<exclude name="**/src.zip" />
</patternset>
</unzip>
<!- - <fail message="should be clean inside ${target-platform}" /> - ->
</then>
</if>
</sequential>
</macrodef>
-->
<!-- Use native copy command due to binary file corruption.
See https://ant.apache.org/manual/Tasks/copy.html#encoding.
Extraneous files removed later. -->
<!--
<macrodef name="nativecopy">
<attribute name="src"/>
<attribute name="dest"/>
<sequential>
<local name="src-abs"/>
<local name="dest-abs"/>
<local name="src-local"/>
<local name="dest-local"/>
<property name="src-abs" value="${basedir}/@{src}"/>
<property name="dest-abs" value="${basedir}/@{dest}"/>
<if>
<equals arg1="${host-platform}" arg2="windows" />
<then>
<propertyregex property="src-local"
input="${src-abs}"
regexp="/"
replace="\\\\"
global="true" />
<propertyregex property="dest-local"
input="${dest-abs}"
regexp="/"
replace="\\\\"
global="true" />
<echo message="Native copy of ${src-local} to ${dest-local}" />
<exec executable="cmd">
<arg line="/C xcopy /s/Y ${src-local} ${dest-local}" />
</exec>
</then>
</if>
<if>
<not><equals arg1="${host-platform}" arg2="windows" /></not>
<then>
<echo message="Native copy of ${src-abs} to ${dest-abs}" />
<exec executable="sh">
<arg line="-c 'cp ${src-abs} ${dest-abs}'"/>
</exec>
</then>
</if>
</sequential>
</macrodef>
-->
<!-- Pull in OpenJFX (separated from mainline Java in JDK 11). -->
<!--
<if>
<equals arg1="${jfx.available}" arg2="true" />
<then>
<nativecopy
src="${jfx.path.lib}/*.jar"
dest="windows/work/core/library" />
<nativecopy
src="${jfx.path.dist}/bin/*.dll"
dest="windows/work/core/library" />
<mkdir dir="windows/work/java/legal/openjfx" />
<copy todir="windows/work/java/legal/openjfx" overwrite="true">
<fileset dir="${jfx.path.dist}/legal" includes="**"/>
</copy>
<delete failonerror="false" dir="${jfx.path.dist}" />
</then>
</if>
-->
<target name="compile" depends="download-javafx" description="Compile sources">
<condition property="core-built">
<available file="${core.path}" />
@@ -348,20 +142,6 @@
<fail unless="core-built"
message="Please build the core library first: expecting core.jar at ${core.path}" />
<!--
<condition property="javafx.jar.path" value="library/linux64">
<equals arg1="${target-platform}" arg2="linux" />
</condition>
<condition property="javafx.jar.path" value="library/macosx">
<equals arg1="${target-platform}" arg2="macosx" />
</condition>
<condition property="javafx.jar.path" value="library/windows64">
<equals arg1="${target-platform}" arg2="windows" />
</condition>
-->
<!-- just pick a platform; any should be sufficient for building -->
<property name="javafx.jar.path" value="library/macosx/modules" />