From 016fd2bd14195dea57ae3c5f0ba5d7e3cb95d1b4 Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Wed, 14 Nov 2018 13:48:04 +0100
Subject: [PATCH] Include JavaFX in the distribution zips
Since JavaFX will not be shipped with the JRE/JDK form Java 11 on, we
include it in the distribution zips. The latest JavaFX is built with
Java 10, so we set that as runtime, too.
---
.classpath | 6 +-
.settings/org.eclipse.jdt.core.prefs | 6 +-
build.sh | 6 +
pom.xml | 275 ++++++++++++++++++---------
4 files changed, 197 insertions(+), 96 deletions(-)
create mode 100755 build.sh
diff --git a/.classpath b/.classpath
index 0f3dcb1f..7416a696 100644
--- a/.classpath
+++ b/.classpath
@@ -11,7 +11,11 @@
-
+
+
+
+
+
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 8445b6b1..94eecc7b 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=10
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -10,4 +10,4 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=10
diff --git a/build.sh b/build.sh
new file mode 100755
index 00000000..adc3ce4e
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+mvn clean
+mvn -Djavafx.platform=win package verify
+mvn -Djavafx.platform=linux package verify
+mvn -Djavafx.platform=mac package verify
diff --git a/pom.xml b/pom.xml
index e0c984d2..25e5ea19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,32 +9,32 @@
UTF-8
- 1.8
- 1.8
+ 10
+ 10
${project.artifactId}-${project.version}-final
-
- src/main/resources
- false
-
-
- src/main/java
- false
-
- **/*.css
-
-
-
- src/main/resources
- true
-
- version
-
-
-
+
+ src/main/resources
+ false
+
+
+ src/main/java
+ false
+
+ **/*.css
+
+
+
+ src/main/resources
+ true
+
+ version
+
+
+
maven-assembly-plugin
@@ -54,72 +54,6 @@
-
- zip
- verify
-
- single
-
-
-
- src/assembly/win64.xml
- src/assembly/win64-jre.xml
- src/assembly/win32-jre.xml
- src/assembly/linux.xml
- src/assembly/macos-jre.xml
-
-
-
-
-
-
- com.akathist.maven.plugins.launch4j
- launch4j-maven-plugin
- 1.7.22
-
-
- l4j-win
- package
-
- launch4j
-
-
- gui
- target/ctbrec.exe
- ${name.final}.jar
- true
- src/main/resources/icon.ico
- ctbrec
-
- ctbrec.ui.Launcher
- false
- anything
-
-
- jre
- true
- 1.8.0
- 512
-
-
- ${project.version}.0
- ${project.version}
- Recorder for Charturbate streams
- 2018 0xboobface
- ${project.version}.0
- ${project.version}
- CTB Recorder
- ctbrec
- ctbrec.exe
-
-
- src/main/resources/splash.bmp
- true
- 60
- true
-
-
-
@@ -178,16 +112,173 @@
0.2.3
- junit
- junit
- 4.12
- test
+ org.openjfx
+ javafx-controls
+ 11
+
+
+ org.openjfx
+ javafx-web
+ 11
-
com.google.guava
guava
17.0
+
+ junit
+ junit
+ 4.12
+ test
+
+
+
+
+ win
+
+
+ javafx.platform
+ win
+
+
+
+
+
+ com.akathist.maven.plugins.launch4j
+ launch4j-maven-plugin
+ 1.7.22
+
+
+ l4j-win
+ package
+
+ launch4j
+
+
+ gui
+ target/ctbrec.exe
+ ${name.final}.jar
+ true
+ src/main/resources/icon.ico
+ ctbrec
+
+ ctbrec.ui.Launcher
+ false
+ anything
+
+
+ jre
+ true
+ 1.8.0
+ 512
+
+
+ ${project.version}.0
+ ${project.version}
+ Recorder for Charturbate streams
+ 2018 0xboobface
+ ${project.version}.0
+ ${project.version}
+ CTB Recorder
+ ctbrec
+ ctbrec.exe
+
+
+ src/main/resources/splash.bmp
+ true
+ 60
+ true
+
+
+
+
+
+
+ maven-assembly-plugin
+ 3.1.0
+
+
+ zip
+ verify
+
+ single
+
+
+
+ src/assembly/win64.xml
+ src/assembly/win64-jre.xml
+ src/assembly/win32-jre.xml
+
+
+
+
+
+
+
+
+
+ linux
+
+
+ javafx.platform
+ linux
+
+
+
+
+
+ maven-assembly-plugin
+ 3.1.0
+
+
+ zip
+ verify
+
+ single
+
+
+
+ src/assembly/linux.xml
+
+
+
+
+
+
+
+
+
+ macos
+
+
+ javafx.platform
+ mac
+
+
+
+
+
+ maven-assembly-plugin
+ 3.1.0
+
+
+ zip
+ verify
+
+ single
+
+
+
+ src/assembly/macos-jre.xml
+
+
+
+
+
+
+
+
+