update DSL and general project setup

This commit is contained in:
Eyck Jentzsch 2021-07-11 14:47:58 +02:00
parent 8bcb23628b
commit 4d4d150758
3 changed files with 37 additions and 84 deletions

View File

@ -32,12 +32,31 @@
filter="(osgi.os=macosx)"/> filter="(osgi.os=macosx)"/>
<requirement <requirement
name="com.eclipserunner.feature.feature.group"/> name="com.eclipserunner.feature.feature.group"/>
<requirement
name="de.jcup.basheditor.feature.group"
filter="(osgi.os=linux)"/>
<requirement
name="de.jcup.yamleditor.feature.group"/>
<requirement
name="de.jcup.hijson.feature.group"/>
<requirement
name="net.mihai-nita.ansicon.feature.group"/>
<requirement
name="org.eclipse.tm.terminal.feature.feature.group"/>
<repository <repository
url="${oomph.update.url}"/> url="${oomph.update.url}"/>
<repository <repository
url="https://erp.nllk.net/p2/com.eclipserunner.p2_site/latest/"/> url="https://erp.nllk.net/p2/com.eclipserunner.p2_site/latest/"/>
<repository <repository
url="https://resheim.net/p2/eclipse-launcher/"/> url="https://resheim.net/p2/eclipse-launcher/"/>
<repository
url="https://de-jcup.github.io/update-site-eclipse-bash-editor/update-site"/>
<repository
url="https://de-jcup.github.io/update-site-eclipse-yaml-editor/update-site"/>
<repository
url="https://de-jcup.github.io/update-site-eclipse-hijson-editor/update-site"/>
<repository
url="https://www.mihai-nita.net/eclipse"/>
</setupTask> </setupTask>
<setupTask <setupTask
xsi:type="setup:CompoundTask" xsi:type="setup:CompoundTask"
@ -375,30 +394,13 @@
<requirement <requirement
name="com.cthing.cmakeed.feature.feature.group"/> name="com.cthing.cmakeed.feature.feature.group"/>
<requirement <requirement
name="net.mihai-nita.ansicon.feature.group"/> name="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group"/>
<requirement
name="org.eclipse.tm.terminal.feature.feature.group"/>
<requirement
name="de.jcup.basheditor.feature.group"
filter="(osgi.os=linux)"/>
<requirement
name="de.jcup.yamleditor.feature.group"/>
<requirement
name="de.jcup.hijson.feature.group"/>
<repository
url="http://www.mihai-nita.net/eclipse"/>
<repository <repository
url="https://raw.githubusercontent.com/15knots/cmake4eclipse/master/releng/comp-update/"/> url="https://raw.githubusercontent.com/15knots/cmake4eclipse/master/releng/comp-update/"/>
<repository <repository
url="https://raw.githubusercontent.com/15knots/cmakeed/master/cmakeed-update/"/> url="https://raw.githubusercontent.com/15knots/cmakeed/master/cmakeed-update/"/>
<repository <repository
url="http://www.janua.fr/update/"/> url="http://www.janua.fr/update/"/>
<repository
url="https://de-jcup.github.io/update-site-eclipse-bash-editor/update-site"/>
<repository
url="https://de-jcup.github.io/update-site-eclipse-yaml-editor/update-site"/>
<repository
url="https://de-jcup.github.io/update-site-eclipse-hijson-editor/update-site"/>
</setupTask> </setupTask>
<version <version
name="latest" name="latest"
@ -1552,10 +1554,6 @@
name="org.eclipse.mylyn_feature.feature.group"/> name="org.eclipse.mylyn_feature.feature.group"/>
<requirement <requirement
name="org.eclipse.rse.feature.group"/> name="org.eclipse.rse.feature.group"/>
<requirement
name="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group"/>
<requirement
name="org.eclipse.tm.terminal.feature.feature.group"/>
<requirement <requirement
name="org.eclipse.tracecompass.gdbtrace.feature.group"/> name="org.eclipse.tracecompass.gdbtrace.feature.group"/>
<requirement <requirement
@ -1592,32 +1590,15 @@
<requirement <requirement
name="com.cthing.cmakeed.feature.feature.group"/> name="com.cthing.cmakeed.feature.feature.group"/>
<requirement <requirement
name="net.mihai-nita.ansicon.feature.group"/> name="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group"/>
<requirement
name="org.eclipse.tm.terminal.feature.feature.group"/>
<requirement
name="de.jcup.basheditor.feature.group"
filter="(osgi.os=linux)"/>
<requirement
name="de.jcup.yamleditor.feature.group"/>
<requirement
name="de.jcup.hijson.feature.group"/>
<repository <repository
url="http://www.pydev.org/updates"/> url="http://www.pydev.org/updates"/>
<repository
url="http://www.mihai-nita.net/eclipse"/>
<repository <repository
url="https://raw.githubusercontent.com/15knots/cmake4eclipse/master/releng/comp-update/"/> url="https://raw.githubusercontent.com/15knots/cmake4eclipse/master/releng/comp-update/"/>
<repository <repository
url="https://raw.githubusercontent.com/15knots/cmakeed/master/cmakeed-update/"/> url="https://raw.githubusercontent.com/15knots/cmakeed/master/cmakeed-update/"/>
<repository <repository
url="http://www.janua.fr/update/"/> url="http://www.janua.fr/update/"/>
<repository
url="https://de-jcup.github.io/update-site-eclipse-bash-editor/update-site"/>
<repository
url="https://de-jcup.github.io/update-site-eclipse-yaml-editor/update-site"/>
<repository
url="https://de-jcup.github.io/update-site-eclipse-hijson-editor/update-site"/>
</setupTask> </setupTask>
<version <version
name="latest" name="latest"
@ -2540,27 +2521,6 @@
<setupTask <setupTask
xsi:type="setup.p2:P2Task" xsi:type="setup.p2:P2Task"
label="${scope.product.label} (${scope.product.version.label})"> label="${scope.product.label} (${scope.product.version.label})">
<requirement
name="org.codehaus.groovy.eclipse.feature.feature.group"/>
<requirement
name="org.codehaus.groovy.m2eclipse.feature.feature.group"/>
<requirement
name="org.codehaus.groovy40.feature.feature.group"
optional="true"/>
<requirement
name="org.codehaus.groovy30.feature.feature.group"/>
<requirement
name="org.codehaus.groovy25.feature.feature.group"
optional="true"/>
<requirement
name="org.codehaus.groovy.jdt.patch.feature.group"
optional="true"/>
<requirement
name="org.codehaus.groovy.compilerless.feature.feature.group"
optional="true"/>
<requirement
name="org.codehaus.groovy.headless.feature.feature.group"
optional="true"/>
<requirement <requirement
name="org.eclipse.linuxtools.javadocs.feature.feature.group"/> name="org.eclipse.linuxtools.javadocs.feature.feature.group"/>
<requirement <requirement
@ -2591,8 +2551,6 @@
name="org.eclipse.sirius.runtime.feature.group"/> name="org.eclipse.sirius.runtime.feature.group"/>
<requirement <requirement
name="org.eclipse.sirius.runtime.ide.eef.feature.group"/> name="org.eclipse.sirius.runtime.ide.eef.feature.group"/>
<requirement
name="org.eclipse.sirius.runtime.ide.xtext.feature.group"/>
<requirement <requirement
name="org.eclipse.sirius.properties.feature.feature.group"/> name="org.eclipse.sirius.properties.feature.feature.group"/>
<requirement <requirement
@ -2651,8 +2609,6 @@
name="org.eclipse.m2e.feature.feature.group"/> name="org.eclipse.m2e.feature.feature.group"/>
<requirement <requirement
name="org.eclipse.m2e.logback.feature.feature.group"/> name="org.eclipse.m2e.logback.feature.feature.group"/>
<requirement
name="org.eclipse.tm.terminal.feature.feature.group"/>
<repository <repository
url="https://ecd-plugin.github.io/update"/> url="https://ecd-plugin.github.io/update"/>
</setupTask> </setupTask>

View File

@ -3,7 +3,7 @@
xmi:version="2.0" xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI" xmlns:xmi="http://www.omg.org/XMI"
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0" xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
name="index" name="MINRES Setups"
label="MINRES Tooling"> label="MINRES Tooling">
<discoverablePackage <discoverablePackage
href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore#/"/>
@ -37,9 +37,6 @@
href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore#/"/>
<productCatalog <productCatalog
href="com.minres.products.setup#/"/> href="com.minres.products.setup#/"/>
<projectCatalog
href="com.minres.projects.setup#/"/>
<productCatalog <productCatalog
href="catalog:/self-product-catalog.setup#/"/> href="catalog:/self-product-catalog.setup#/"/>
<productCatalog <productCatalog
@ -50,6 +47,8 @@
href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/org.eclipse.applications.setup#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/org.eclipse.applications.setup#/"/>
<productCatalog <productCatalog
href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/redirectable.products.setup#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/redirectable.products.setup#/"/>
<projectCatalog
href="com.minres.projects.setup#/"/>
<projectCatalog <projectCatalog
href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/org.eclipse.projects.setup#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/org.eclipse.projects.setup#/"/>
<projectCatalog <projectCatalog

View File

@ -52,10 +52,22 @@
<setupTask <setupTask
xsi:type="setup:ResourceCreationTask" xsi:type="setup:ResourceCreationTask"
excludedTriggers="STARTUP MANUAL" excludedTriggers="STARTUP MANUAL"
content="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;section name=&quot;Workbench&quot;>&#xD;&#xA;&#x9;&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>&#xD;&#xA;&#x9;&lt;/section>&#xD;&#xA;&lt;/section>&#xD;&#xA;"
targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml" targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"
encoding="UTF-8"> encoding="UTF-8">
<description>Initialize JDT's package explorer to show working sets as its root objects</description> <description>Initialize JDT's package explorer to show working sets as its root objects</description>
<content>
&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>
&lt;section name=&quot;Workbench&quot;>
&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>
&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>
&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>
&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>
&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>
&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>
&lt;/section>
&lt;/section>
</content>
</setupTask> </setupTask>
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
@ -69,20 +81,6 @@
name="org.eclipse.pde.feature.group"/> name="org.eclipse.pde.feature.group"/>
<requirement <requirement
name="org.eclipse.e4.core.tools.feature.feature.group"/> name="org.eclipse.e4.core.tools.feature.feature.group"/>
<requirement
name="org.codehaus.groovy.eclipse.feature.feature.group"/>
<requirement
name="org.codehaus.groovy.jdt.patch.feature.group"/>
<requirement
name="org.codehaus.groovy25.feature.feature.group"/>
<requirement
name="org.codehaus.groovy30.feature.feature.group"/>
<requirement
name="org.codehaus.groovy.compilerless.feature.feature.group"/>
<requirement
name="org.codehaus.groovy.headless.feature.feature.group"/>
<requirement
name="org.codehaus.groovy.m2eclipse.feature.feature.group"/>
<description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description> <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
</setupTask> </setupTask>
<setupTask <setupTask