Commit 9f84fef8 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Ease version handling & egit/jgit update


Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
parent 95e57df7
......@@ -32,8 +32,7 @@
<setupTask
xsi:type="setup:VariableTask"
name="eclipse.target.platform"
defaultValue="2019-06"
storageURI="scope://Workspace"/>
value="2019-06"/>
<setupTask
xsi:type="setup.p2:P2Task"
label="Eclipse 2019-06 Update Site stuff">
......@@ -72,16 +71,18 @@
label="eGit jGit">
<requirement
name="org.eclipse.egit.feature.group"
versionRange="[5.4.0,5.5.0)"/>
versionRange="[5.4.2,5.5.0)"/>
<requirement
name="org.eclipse.jgit.feature.group"
versionRange="[5.4.0,5.5.0)"/>
versionRange="[5.4.3,5.5.0)"/>
<requirement
name="org.eclipse.egit.mylyn.feature.group"
versionRange="[5.4.0,5.5.0)"
versionRange="[5.4.2,5.5.0)"
filter=""/>
<repository
url="https://download.eclipse.org/egit/updates-5.4"/>
url="https://download.eclipse.org/egit/updates-5.4.2"/>
<repository
url="https://repo.eclipse.org/content/unzip/releases.unzip/org/eclipse/jgit/org.eclipse.jgit.repository/5.4.3.201909031940-r/org.eclipse.jgit.repository-5.4.3.201909031940-r.zip-unzip/"/>
<description>Install Git support for interacting with the AF3 repositories.</description>
</setupTask>
<setupTask
......@@ -141,10 +142,8 @@
<setupTask
xsi:type="setup:VariableTask"
id="jfx.installation.version"
excludedTriggers="STARTUP MANUAL"
name="jfx.installation.version"
defaultValue="11.0.2"
storageURI="scope://Installation"
label=""/>
<setupTask
xsi:type="setup:CompoundTask"
......@@ -153,36 +152,36 @@
<setupTask
xsi:type="setup:ResourceCopyTask"
id="jfx.installation.win32.download"
excludedTriggers="STARTUP MANUAL"
excludedTriggers="MANUAL"
filter="(osgi.os=win32)"
sourceURL="https://download2.gluonhq.com/openjfx/${jfx.installation.version}/openjfx-${jfx.installation.version}_windows-x64_bin-sdk.zip"
targetURL="${installation.location|uri}/javafx-sdk.zip"/>
targetURL="${installation.location|uri}/javafx-sdk-${jfx.installation.version}.zip"/>
<setupTask
xsi:type="setup:ResourceCopyTask"
id="jfx.installation.linux.download"
excludedTriggers="STARTUP MANUAL"
excludedTriggers="MANUAL"
filter="(osgi.os=linux)"
sourceURL="https://download2.gluonhq.com/openjfx/${jfx.installation.version}/openjfx-${jfx.installation.version}_linux-x64_bin-sdk.zip"
targetURL="${installation.location|uri}/javafx-sdk.zip"/>
targetURL="${installation.location|uri}/javafx-sdk-${jfx.installation.version}.zip"/>
<setupTask
xsi:type="setup:ResourceCopyTask"
id="jfx.installation.macos.download"
excludedTriggers="STARTUP MANUAL"
excludedTriggers="MANUAL"
filter="(osgi.os=macosx)"
sourceURL="https://download2.gluonhq.com/openjfx/${jfx.installation.version}/openjfx-${jfx.installation.version}_osx-x64_bin-sdk.zip"
targetURL="${installation.location|uri}/javafx-sdk.zip"/>
targetURL="${installation.location|uri}/javafx-sdk-${jfx.installation.version}.zip"/>
</setupTask>
<setupTask
xsi:type="com.github.maybeec.oomph.task:unzipTask"
id="jfx.installation.unzip"
excludedTriggers="STARTUP MANUAL"
zipFile="${installation.location}/javafx-sdk.zip"
excludedTriggers="MANUAL"
zipFile="${installation.location}/javafx-sdk-${jfx.installation.version}.zip"
destinationDir="${installation.location}"/>
<setupTask
xsi:type="setup:PreferenceTask"
id="jfx.installation.setting"
key="/instance/org.eclipse.fx.ide.ui/javafx-sdk"
value="${installation.location/javafx-sdk}-${jfx.installation.version}/lib/"/>
value="${installation.location}/javafx-sdk-${jfx.installation.version}/lib/"/>
</setupTask>
<setupTask
xsi:type="setup:CompoundTask"
......@@ -787,7 +786,7 @@
<setupTask
xsi:type="pde:TargetPlatformTask"
id="target.file"
name="Target-2019-06"/>
name="Target-${eclipse.target.platform}"/>
<stream name="master"
label="Development">
<description>Configure the stream / branch of source code.</description>
......
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