Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Belle2019-08-29 05:20:26 -0400
committerJan Belle2019-08-29 05:20:26 -0400
commitddae390c9f162b1d391e190987aba7e3c0fcd742 (patch)
treeaffbc3dc249d5e92a8c3d5f5e953eefd9c752fe3 /plugins/org.eclipse.etrice.generator.cpp
parent8dfd6e0b7d9c4d0ff5a55b3654868eeda59bb188 (diff)
downloadorg.eclipse.etrice-ddae390c9f162b1d391e190987aba7e3c0fcd742.tar.gz
org.eclipse.etrice-ddae390c9f162b1d391e190987aba7e3c0fcd742.tar.xz
org.eclipse.etrice-ddae390c9f162b1d391e190987aba7e3c0fcd742.zip
[generator] Fix generation dependency on eclipse project file
Removed usages of deprecated FileSystemHelpers.isValidGenerationLocation that prevent generation if the eclipse project file is not present. Change-Id: Ie7f2808f40a884ddc6d6bdcd0095b33c1b9ce08d
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.cpp')
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.xtend2
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeGen.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeRunnerGen.xtend4
3 files changed, 2 insertions, 8 deletions
diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.xtend
index d73cd7c06..407b2a437 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.xtend
@@ -24,7 +24,6 @@ import org.eclipse.etrice.core.genmodel.etricegen.WiredActorClass
import org.eclipse.etrice.core.genmodel.fsm.FsmGenExtensions
import org.eclipse.etrice.core.room.ActorClass
import org.eclipse.etrice.generator.cpp.Main
-import org.eclipse.etrice.generator.fsm.base.FileSystemHelpers
import org.eclipse.etrice.generator.base.io.IGeneratorFileIO
import org.eclipse.etrice.generator.generic.GenericActorClassGenerator
import org.eclipse.etrice.generator.generic.ProcedureHelpers
@@ -41,7 +40,6 @@ class ActorClassGen extends GenericActorClassGenerator {
@Inject protected extension ProcedureHelpers
@Inject protected Initialization initHelper
@Inject protected extension StateMachineGen
- @Inject protected extension FileSystemHelpers
@Inject protected extension GeneratorOptionsHelper
def doGenerate(Root root) {
diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeGen.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeGen.xtend
index da7cbef94..5a9b12563 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeGen.xtend
@@ -27,7 +27,6 @@ import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance
import org.eclipse.etrice.core.genmodel.etricegen.WiredSubSystemClass
import org.eclipse.etrice.core.room.SubSystemClass
import org.eclipse.etrice.generator.cpp.Main
-import org.eclipse.etrice.generator.fsm.base.FileSystemHelpers
import org.eclipse.etrice.generator.base.io.IGeneratorFileIO
import org.eclipse.etrice.generator.generic.ProcedureHelpers
import org.eclipse.etrice.generator.generic.RoomExtensions
@@ -41,7 +40,6 @@ class NodeGen {
@Inject extension CppExtensions
@Inject extension RoomExtensions
@Inject extension ProcedureHelpers
- @Inject extension FileSystemHelpers
@Inject extension GeneratorOptionsHelper
@Inject IGeneratorFileIO fileIO
@@ -54,7 +52,7 @@ class NodeGen {
for (nr : ETMapUtil::getNodeRefs()) {
for (instpath : ETMapUtil::getSubSystemInstancePaths(nr)) {
val ssi = root.getInstance(instpath) as SubSystemInstance
- if (ssi!==null && ssi.subSystemClass.validGenerationLocation) {
+ if (ssi!==null) {
val wired = sscc2wired.get(ssi.subSystemClass)
val path = ssi.subSystemClass.getPath
diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeRunnerGen.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeRunnerGen.xtend
index 575cb51f1..9b48b0ea6 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeRunnerGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeRunnerGen.xtend
@@ -20,7 +20,6 @@ import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance
import org.eclipse.etrice.core.genmodel.etricegen.SystemInstance
import org.eclipse.etrice.generator.cpp.Main
-import org.eclipse.etrice.generator.fsm.base.FileSystemHelpers
import org.eclipse.etrice.generator.base.io.IGeneratorFileIO
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.generator.cpp.setup.GeneratorOptionsHelper
@@ -30,7 +29,6 @@ class NodeRunnerGen {
@Inject extension RoomExtensions roomExt
@Inject extension CppExtensions
- @Inject extension FileSystemHelpers
@Inject extension GeneratorOptionsHelper
@Inject IGeneratorFileIO fileIO
@@ -39,7 +37,7 @@ class NodeRunnerGen {
for (nr : ETMapUtil::getNodeRefs()) {
for (instpath : ETMapUtil::getSubSystemInstancePaths(nr)) {
val ssi = root.getInstance(instpath) as SubSystemInstance
- if (ssi!==null && ssi.subSystemClass.validGenerationLocation) {
+ if (ssi!==null) {
val filepath = ssi.subSystemClass.getPath
fileIO.generateFile("generating SubSystemRunner declaration", filepath + nr.getCppClassName(ssi)+"Runner.h", root.generateHeaderFile(ssi))
fileIO.generateFile("generating SubSystemRunner implementation", filepath + nr.getCppClassName(ssi)+"Runner.cpp", root.generateSourceFile(ssi))

Back to the top