mirror of
https://github.com/processing/processing4.git
synced 2026-01-27 10:21:26 +01:00
removing JavaFX (in progress)
This commit is contained in:
Ben Fry
1
.idea/modules.xml
generated
1
.idea/modules.xml
generated
@@ -15,7 +15,6 @@
|
||||
<module fileurl="file://$PROJECT_DIR$/java/libraries/serial/processing4-serial.iml" filepath="$PROJECT_DIR$/java/libraries/serial/processing4-serial.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/java/libraries/svg/processing4-svg.iml" filepath="$PROJECT_DIR$/java/libraries/svg/processing4-svg.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/build/shared/tools/MovieMaker/processing4-tools-moviemaker.iml" filepath="$PROJECT_DIR$/build/shared/tools/MovieMaker/processing4-tools-moviemaker.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/build/shared/tools/ThemeEngine/processing4-tools-theme.iml" filepath="$PROJECT_DIR$/build/shared/tools/ThemeEngine/processing4-tools-theme.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
@@ -1,17 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/adoptopenjdk-11">
|
||||
<attributes>
|
||||
<attribute name="module" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="lib" path="library/macosx/modules/javafx.base.jar"/>
|
||||
<classpathentry kind="lib" path="library/macosx/modules/javafx.controls.jar"/>
|
||||
<classpathentry kind="lib" path="library/macosx/modules/javafx.fxml.jar"/>
|
||||
<classpathentry kind="lib" path="library/macosx/modules/javafx.graphics.jar"/>
|
||||
<classpathentry kind="lib" path="library/macosx/modules/javafx.media.jar"/>
|
||||
<classpathentry kind="lib" path="library/macosx/modules/javafx.swing.jar"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/processing4-core"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
5
java/libraries/javafx/.gitignore
vendored
5
java/libraries/javafx/.gitignore
vendored
@@ -1,5 +0,0 @@
|
||||
# ignore the sdk download files
|
||||
javafx-*.zip
|
||||
|
||||
# everything is downloaded from online
|
||||
/library
|
||||
@@ -1,17 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>processing4-javafx</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
@@ -1,15 +0,0 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
||||
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
||||
org.eclipse.jdt.core.compiler.compliance=11
|
||||
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
|
||||
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
||||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=11
|
||||
@@ -1,181 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<project name="Processing JavaFX renderer" default="build">
|
||||
|
||||
<!-- 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" />
|
||||
<!-- 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}" />
|
||||
</target>
|
||||
|
||||
<condition property="fx.unavailable" value="true">
|
||||
<or>
|
||||
<equals arg1="${os.arch}" arg2="arm" />
|
||||
<equals arg1="${os.arch}" arg2="aarch64" />
|
||||
</or>
|
||||
</condition>
|
||||
|
||||
<condition property="jfx.available" value="true">
|
||||
<and>
|
||||
<not><equals arg1="${os.arch}" arg2="arm" /></not>
|
||||
</and>
|
||||
</condition>
|
||||
|
||||
<available file="${gluon.base}.zip" property="javafx.present" />
|
||||
|
||||
<!-- ok to ignore failed downloads if we at least have a version that's local -->
|
||||
<condition property="javafx.ignorable" value="false" else="true">
|
||||
<isset property="javafx.present" />
|
||||
</condition>
|
||||
|
||||
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
|
||||
|
||||
<!--
|
||||
https://gluonhq.com/products/javafx/
|
||||
# use the download file specified by the server
|
||||
wget -\-content-disposition 'https://gluonhq.com/download/javafx-16-sdk-mac'
|
||||
wget -\-content-disposition 'https://gluonhq.com/download/javafx-16-sdk-windows'
|
||||
wget -\-content-disposition 'https://gluonhq.com/download/javafx-16-sdk-linux'
|
||||
|
||||
src (and therefore .jar files?) appear to be identical except for com.sun.javafx.runtime.VersionInfo which has a BUILD_TIMESTAMP variable
|
||||
|
||||
https://gluonhq.com/download/javafx-16-sdk-mac
|
||||
https://gluonhq.com/download/javafx-16-sdk-windows
|
||||
https://gluonhq.com/download/javafx-16-sdk-linux
|
||||
-->
|
||||
|
||||
<!-- JavaFX was removed from the Oracle 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/
|
||||
|
||||
The links for the Apple Silicon and ARM Linux versions:
|
||||
https://gluonhq.com/download/javafx-17-ea-sdk-mac-aarch64
|
||||
https://gluonhq.com/download/javafx-17-ea-sdk-linux-aarch64
|
||||
https://gluonhq.com/download/javafx-17-ea-sdk-linux-arm32
|
||||
|
||||
These could be better than nothing, but it's a different set of .jar files
|
||||
(that would be identical across these three), but different from the main
|
||||
versions. Not a good way to mix, unless have unique JARs for each platform,
|
||||
which would be ~60 MB extra (for platforms that are < 2% usage). -->
|
||||
|
||||
<!--
|
||||
https://download2.gluonhq.com/openjfx/17.0.0.1/openjfx-17.0.0.1_linux-x64_bin-sdk.zip
|
||||
https://download2.gluonhq.com/openjfx/17.0.0.1/openjfx-17.0.0.1_osx-x64_bin-sdk.zip
|
||||
-->
|
||||
<target name="retrieve-gluon">
|
||||
<get src="https://download2.gluonhq.com/openjfx/${gluon.version}/openjfx-${gluon.version}_${platform.name}-x64_bin-sdk.zip"
|
||||
dest="${gluon.base}.zip"
|
||||
ignoreerrors="${javafx.ignorable}"
|
||||
usetimestamp="true" />
|
||||
|
||||
<antcall target="unzip-gluon-jars" />
|
||||
<antcall target="unzip-gluon-natives" />
|
||||
</target>
|
||||
|
||||
<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 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'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>
|
||||
<include name="**/*.jar" />
|
||||
<!-- These two aren't supported/used -->
|
||||
<!-- <exclude name="**/javafx.web.jar" /> -->
|
||||
<exclude name="**/javafx-swt.jar" />
|
||||
</patternset>
|
||||
|
||||
<!-- remove prefixes from folder paths when extracting -->
|
||||
<mapper type="flatten" />
|
||||
</unzip>
|
||||
</target>
|
||||
|
||||
<target name="unzip-gluon-natives">
|
||||
<echo message="Extracting native libs from ${gluon.base}.zip to ${platform.path}" />
|
||||
|
||||
<unzip dest="${platform.path}" src="${gluon.base}.zip" overwrite="true">
|
||||
<patternset>
|
||||
<include name="**/*.dll" />
|
||||
<include name="**/*.dylib" />
|
||||
<include name="**/*.so" />
|
||||
<!-- 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 it -->
|
||||
<!-- <exclude name="**/src.zip" /> -->
|
||||
</patternset>
|
||||
|
||||
<!-- Ignore folder structure, which also helps because as of 210620,
|
||||
the Windows build has a different folder for the binaries. -->
|
||||
<mapper type="flatten" />
|
||||
</unzip>
|
||||
</target>
|
||||
|
||||
<target name="download-javafx">
|
||||
<property name="gluon.version" value="17.0.1" />
|
||||
<!-- current Early Access version, includes support for other architectures -->
|
||||
<!-- <property name="gluon.version" value="17-ea" /> -->
|
||||
|
||||
<!-- http://ant.apache.org/manual/Tasks/tempfile.html -->
|
||||
<!-- <tempfile property="temp.zip" destDir="${java.io.tmpdir}" suffix=".zip" /> -->
|
||||
|
||||
<!-- javafx-${gluon.version}-sdk-${gluon.platform} -->
|
||||
<antcall target="retrieve-gluon">
|
||||
<param name="gluon.base" value="javafx-${gluon.version}-macos" />
|
||||
<param name="platform.name" value="osx" />
|
||||
<param name="platform.path" value="${library.path}/macosx" />
|
||||
</antcall>
|
||||
|
||||
<antcall target="retrieve-gluon">
|
||||
<param name="gluon.base" value="javafx-${gluon.version}-windows" />
|
||||
<param name="platform.name" value="windows" />
|
||||
<param name="platform.path" value="${library.path}/windows64" />
|
||||
</antcall>
|
||||
|
||||
<antcall target="retrieve-gluon">
|
||||
<param name="gluon.base" value="javafx-${gluon.version}-linux" />
|
||||
<param name="platform.name" value="linux" />
|
||||
<param name="platform.path" value="${library.path}/linux64" />
|
||||
</antcall>
|
||||
</target>
|
||||
|
||||
<target name="compile" depends="download-javafx" description="Compile sources">
|
||||
<condition property="core-built">
|
||||
<available file="${core.path}" />
|
||||
</condition>
|
||||
<fail unless="core-built"
|
||||
message="Please build the core library first: expecting core.jar at ${core.path}" />
|
||||
|
||||
<!-- just pick a platform; any should be sufficient for building -->
|
||||
<property name="javafx.jar.path" value="library/macosx/modules" />
|
||||
|
||||
<mkdir dir="bin" />
|
||||
<javac source="11" target="11"
|
||||
srcdir="src" destdir="bin"
|
||||
encoding="UTF-8"
|
||||
includeAntRuntime="false"
|
||||
classpath="${core.path};
|
||||
${javafx.jar.path}/javafx.base.jar;
|
||||
${javafx.jar.path}/javafx.controls.jar;
|
||||
${javafx.jar.path}/javafx.fxml.jar;
|
||||
${javafx.jar.path}/javafx.graphics.jar;
|
||||
${javafx.jar.path}/javafx.media.jar;
|
||||
${javafx.jar.path}/javafx.swing.jar"
|
||||
nowarn="true" />
|
||||
</target>
|
||||
|
||||
<target name="build" depends="compile" description="Build JavaFX renderer">
|
||||
<jar basedir="bin" destfile="library/javafx.jar" />
|
||||
</target>
|
||||
</project>
|
||||
@@ -1,2 +0,0 @@
|
||||
name = JavaFX
|
||||
version = 1
|
||||
@@ -1,35 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="EclipseModuleManager">
|
||||
<libelement value="jar://$MODULE_DIR$/library/javafx.base.jar!/" />
|
||||
<libelement value="jar://$MODULE_DIR$/library/javafx.controls.jar!/" />
|
||||
<libelement value="jar://$MODULE_DIR$/library/javafx.fxml.jar!/" />
|
||||
<libelement value="jar://$MODULE_DIR$/library/javafx.graphics.jar!/" />
|
||||
<libelement value="jar://$MODULE_DIR$/library/javafx.jar!/" />
|
||||
<libelement value="jar://$MODULE_DIR$/library/javafx.media.jar!/" />
|
||||
<libelement value="jar://$MODULE_DIR$/library/javafx.swing.jar!/" />
|
||||
<src_description expected_position="1">
|
||||
<src_folder value="file://$MODULE_DIR$/src" expected_position="1" />
|
||||
</src_description>
|
||||
</component>
|
||||
<component name="NewModuleRootManager">
|
||||
<output url="file://$MODULE_DIR$/bin" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="processing4-core" />
|
||||
<orderEntry type="module-library">
|
||||
<library>
|
||||
<CLASSES>
|
||||
<root url="file://$MODULE_DIR$/library/macosx/modules" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
<jarDirectory url="file://$MODULE_DIR$/library/macosx/modules" recursive="false" />
|
||||
</library>
|
||||
</orderEntry>
|
||||
</component>
|
||||
</module>
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user