sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #733 from eclipse/kth_issue732

Browse source 
Include Orbit repo & bundles in target definition
This commit is contained in:
Karsten Thoms 2018-05-09 00:07:25 +02:00 committed by GitHub
commit 6d7610562f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 117 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/org.xtext.example.full.target.target vendored
View file

@ -21,5 +21,13 @@
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="6.1.1.v20180414-0329"/>
<unit id="org.objectweb.asm.tree" version="6.1.1.v20180414-0329"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180504181223/repository"/>
</location>
</locations>
</target>

8
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/org.xtext.example.lsMavenTychoApp.target/org.xtext.example.lsMavenTychoApp.target.target vendored
View file

@ -21,5 +21,13 @@
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="6.1.1.v20180414-0329"/>
<unit id="org.objectweb.asm.tree" version="6.1.1.v20180414-0329"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180504181223/repository"/>
</location>
</locations>
</target>

8
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.target/org.xtext.example.lsMavenTychoFatjar.target.target vendored
View file

@ -21,5 +21,13 @@
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="6.1.1.v20180414-0329"/>
<unit id="org.objectweb.asm.tree" version="6.1.1.v20180414-0329"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180504181223/repository"/>
</location>
</locations>
</target>

8
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/org.xtext.example.mavenTycho.target.target vendored
View file

@ -21,5 +21,13 @@
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="6.1.1.v20180414-0329"/>
<unit id="org.objectweb.asm.tree" version="6.1.1.v20180414-0329"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180504181223/repository"/>
</location>
</locations>
</target>

8
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.target/org.xtext.example.mavenTychoJ9.target.target vendored
View file

@ -21,5 +21,13 @@
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="6.1.1.v20180414-0329"/>
<unit id="org.objectweb.asm.tree" version="6.1.1.v20180414-0329"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180504181223/repository"/>
</location>
</locations>
</target>

8
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/org.xtext.example.mavenTychoP2.target.target vendored
View file

@ -21,5 +21,13 @@
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="6.1.1.v20180414-0329"/>
<unit id="org.objectweb.asm.tree" version="6.1.1.v20180414-0329"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180504181223/repository"/>
</location>
</locations>
</target>

18
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
View file

@ -8,6 +8,7 @@
package org.eclipse.xtext.xtext.wizard
import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
import org.eclipse.xtext.util.JUnitVersion
@FinalFieldsConstructor
class TargetPlatformProject extends ProjectDescriptor {
@ -77,6 +78,23 @@ class TargetPlatformProject extends ProjectDescriptor {
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/«config.xtextVersion»/"/>
«ENDIF»
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
«IF config.junitVersion == JUnitVersion.JUNIT_5»
<unit id="org.junit.jupiter.api" version="5.1.0.v20180327-1502"/>
<unit id="org.junit.jupiter.engine" version="5.1.0.v20180327-1502"/>
<unit id="org.junit.platform.commons" version="1.1.0.v20180327-1502"/>
<unit id="org.junit.platform.engine" version="1.1.0.v20180327-1502"/>
<unit id="org.junit.platform.launcher" version="1.1.0.v20180327-1502"/>
<unit id="org.junit.platform.runner" version="1.1.0.v20180327-1502"/>
<unit id="org.opentest4j" version="1.0.0.v20180327-1502"/>
«ENDIF»
<unit id="org.objectweb.asm" version="6.1.1.v20180414-0329"/>
<unit id="org.objectweb.asm.tree" version="6.1.1.v20180414-0329"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180504181223/repository"/>
</location>
</locations>
</target>
'''

51
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
View file

@ -7,12 +7,14 @@
*/
package org.eclipse.xtext.xtext.wizard;
import com.google.common.base.Objects;
import com.google.common.collect.Iterables;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Set;
import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor;
import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.util.JUnitVersion;
import org.eclipse.xtext.util.XtextVersion;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.ObjectExtensions;
@ -147,6 +149,55 @@ public class TargetPlatformProject extends ProjectDescriptor {
}
_builder.append("</location>");
_builder.newLine();
_builder.append("<location includeAllPlatforms=\"false\" includeConfigurePhase=\"false\" includeMode=\"planner\" includeSource=\"true\" type=\"InstallableUnit\">");
_builder.newLine();
_builder.append("\t");
_builder.append("<unit id=\"com.google.gson\" version=\"2.7.0.v20170129-0911\"/>");
_builder.newLine();
_builder.append("\t");
_builder.append("<unit id=\"org.antlr.runtime\" version=\"3.2.0.v201101311130\"/>");
_builder.newLine();
_builder.append("\t");
_builder.append("<unit id=\"org.junit\" version=\"4.12.0.v201504281640\"/>");
_builder.newLine();
{
JUnitVersion _junitVersion = this.getConfig().getJunitVersion();
boolean _equals = Objects.equal(_junitVersion, JUnitVersion.JUNIT_5);
if (_equals) {
_builder.append("\t");
_builder.append("<unit id=\"org.junit.jupiter.api\" version=\"5.1.0.v20180327-1502\"/>");
_builder.newLine();
_builder.append("\t");
_builder.append("<unit id=\"org.junit.jupiter.engine\" version=\"5.1.0.v20180327-1502\"/>");
_builder.newLine();
_builder.append("\t");
_builder.append("<unit id=\"org.junit.platform.commons\" version=\"1.1.0.v20180327-1502\"/>");
_builder.newLine();
_builder.append("\t");
_builder.append("<unit id=\"org.junit.platform.engine\" version=\"1.1.0.v20180327-1502\"/>");
_builder.newLine();
_builder.append("\t");
_builder.append("<unit id=\"org.junit.platform.launcher\" version=\"1.1.0.v20180327-1502\"/>");
_builder.newLine();
_builder.append("\t");
_builder.append("<unit id=\"org.junit.platform.runner\" version=\"1.1.0.v20180327-1502\"/>");
_builder.newLine();
_builder.append("\t");
_builder.append("<unit id=\"org.opentest4j\" version=\"1.0.0.v20180327-1502\"/>");
_builder.newLine();
}
}
_builder.append("\t");
_builder.append("<unit id=\"org.objectweb.asm\" version=\"6.1.1.v20180414-0329\"/>");
_builder.newLine();
_builder.append("\t");
_builder.append("<unit id=\"org.objectweb.asm.tree\" version=\"6.1.1.v20180414-0329\"/>");
_builder.newLine();
_builder.append("\t");
_builder.append("<repository location=\"http://download.eclipse.org/tools/orbit/downloads/drops/S20180504181223/repository\"/>");
_builder.newLine();
_builder.append("</location>");
_builder.newLine();
_builder.append("</locations>");
_builder.newLine();
_builder.append("</target>");