Commit ad634fd2 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Oomph: Fixup jfx version declaration



Also, remove the JRE definition (11 cannot be configured by oomph, yet).
Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
parent 1ad3819b
......@@ -3,8 +3,8 @@
xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:com.github.maybeec.oomph.task="http://maybeec.github.io/oomph-task-unzip/1.0"
xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
xmlns:mylyn="http://www.eclipse.org/oomph/setup/mylyn/1.0"
xmlns:pde="http://www.eclipse.org/oomph/setup/pde/1.0"
xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
......@@ -12,16 +12,9 @@
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
xsi:schemaLocation="http://maybeec.github.io/oomph-task-unzip/1.0 https://raw.githubusercontent.com/maybeec/oomph-task-unzip/master/task-unzip-updatesite/model/Oomph-task-unzip.ecore http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
name="autofocus3"
label="AutoFOCUS 3 (Developer, 2018-12)">
<setupTask
xsi:type="jdt:JRETask"
version="JavaSE-11"
location="${jre.location-11}"
name="JRE for JavaSE-11">
<description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}.</description>
</setupTask>
<setupTask
xsi:type="setup:EclipseIniTask"
option="-Xmx"
......@@ -141,7 +134,6 @@
encoding="UTF-8">
<description>Subclipse preference configuration for using SVNKit provider.</description>
</setupTask>
<setupTask
xsi:type="setup:CompoundTask"
id="jfx.installation"
......@@ -149,9 +141,10 @@
<setupTask
xsi:type="setup:VariableTask"
id="jfx.installation.version"
name="JavaFX version"
value="11.0.2"
defaultValue="11.0.2"/>
name="jfx.installation.version"
defaultValue="11.0.2"
storageURI="scope://Installation"
label=""/>
<setupTask
xsi:type="setup:CompoundTask"
id="jfx.installation.win32"
......@@ -166,7 +159,7 @@
<setupTask
xsi:type="com.github.maybeec.oomph.task:unzipTask"
id="jfx.installation.unzip"
zipFile="${installation.location/javafx-sdk.zip}"
zipFile="${installation.location}/javafx-sdk.zip"
destinationDir="${installation.location}"/>
<setupTask
xsi:type="setup:PreferenceTask"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment