Skip to content
This repository has been archived by the owner on Sep 22, 2024. It is now read-only.

Code adjustment for pre-build-cmd branch #76

Merged
merged 2 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions oomph/LinguaFrancaEpoch.setup
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/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 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/launching/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Launching.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore"
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/launching/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Launching.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/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.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="lingua.franca.epoch"
label="Lingua Franca (Epoch)">
<setupTask
Expand Down Expand Up @@ -293,6 +293,8 @@
name="org.eclipse.platform.source.feature.group"/>
<requirement
name="org.eclipse.emf.mwe2.launcher.feature.group"/>
<requirement
name="org.apache.commons.text"/>
<requirement
name="org.eclipse.elk.sdk.feature.feature.group"/>
<requirement
Expand Down Expand Up @@ -321,8 +323,6 @@
name="de.cau.cs.kieler.klighd.view.feature.source.feature.group"/>
<requirement
name="de.cau.cs.kieler.klighd.ui.contrib3x"/>
<requirement
name="de.cau.cs.kieler.klighd.lsp"/>
<requirement
name="com.fasterxml.jackson.core.jackson-core"/>
<requirement
Expand Down
1 change: 1 addition & 0 deletions org.lflang.targetplatform/org.lflang.targetplatform.target
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
<unit id="org.antlr.runtime" version="0.0.0"/>
<unit id="org.apache.commons.text" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2024-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
Expand Down
3 changes: 2 additions & 1 deletion org.lflang/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ Require-Bundle: org.eclipse.xtext,
org.lflang.epoch.mirror.json;bundle-version="1.20230618.0",
org.lflang.epoch.mirror.kotlin;bundle-version="1.6.21",
org.lflang.epoch.mirror.jcip;bundle-version="1.0.0",
com.google.gson;bundle-version="2.10.1"
com.google.gson;bundle-version="2.10.1",
org.apache.commons.text;bundle-version="1.11.0"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.lflang,
org.lflang.ast,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.lflang.generator.GeneratorBase;
import org.lflang.generator.LFGeneratorContext;
import org.lflang.generator.TargetTypes;
import org.lflang.generator.docker.DockerGenerator;
import org.lflang.lf.Attribute;
import org.lflang.target.Target;

Expand All @@ -29,5 +30,10 @@ public TargetTypes getTargetTypes() {
public Target getTarget() {
throw new IllegalStateException(Mock.VERIFIER_MSG);
}

@Override
protected DockerGenerator getDockerGenerator(LFGeneratorContext context) {
throw new IllegalStateException(Mock.VERIFIER_MSG);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.lflang.generator.GeneratorBase;
import org.lflang.generator.LFGeneratorContext;
import org.lflang.generator.TargetTypes;
import org.lflang.generator.docker.DockerGenerator;
import org.lflang.scoping.LFGlobalScopeProvider;
import org.lflang.target.Target;

Expand All @@ -25,5 +26,10 @@ public TargetTypes getTargetTypes() {
public Target getTarget() {
throw new IllegalStateException(Mock.KOTLIN_MSG);
}

@Override
protected DockerGenerator getDockerGenerator(LFGeneratorContext context) {
throw new IllegalStateException(Mock.KOTLIN_MSG);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.lflang.generator.GeneratorBase;
import org.lflang.generator.LFGeneratorContext;
import org.lflang.generator.TargetTypes;
import org.lflang.generator.docker.DockerGenerator;
import org.lflang.scoping.LFGlobalScopeProvider;
import org.lflang.target.Target;

Expand All @@ -25,5 +26,10 @@ public TargetTypes getTargetTypes() {
public Target getTarget() {
throw new IllegalStateException(Mock.KOTLIN_MSG);
}

@Override
protected DockerGenerator getDockerGenerator(LFGeneratorContext context) {
throw new IllegalStateException(Mock.KOTLIN_MSG);
}

}
6 changes: 6 additions & 0 deletions org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.lflang.generator.GeneratorBase;
import org.lflang.generator.LFGeneratorContext;
import org.lflang.generator.TargetTypes;
import org.lflang.generator.docker.DockerGenerator;
import org.lflang.scoping.LFGlobalScopeProvider;
import org.lflang.target.Target;

Expand All @@ -30,4 +31,9 @@ public Target getTarget() {
throw new IllegalStateException(Mock.KOTLIN_MSG);
}

@Override
protected DockerGenerator getDockerGenerator(LFGeneratorContext context) {
throw new IllegalStateException(Mock.KOTLIN_MSG);
}

}
Loading