diff options
author | Henrik Rentz-Reichert | 2017-08-29 15:07:49 +0000 |
---|---|---|
committer | Henrik Rentz-Reichert | 2017-08-29 15:13:10 +0000 |
commit | 04647080b992f0e78286475c0d079b90728e2e6c (patch) | |
tree | 3e94896764d04aee6b724dacee1ca6e441c88f6a /plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice | |
parent | e8aed4ad25ee7451045ddb0f3b6ec12eccee238e (diff) | |
download | org.eclipse.etrice-04647080b992f0e78286475c0d079b90728e2e6c.tar.gz org.eclipse.etrice-04647080b992f0e78286475c0d079b90728e2e6c.tar.xz org.eclipse.etrice-04647080b992f0e78286475c0d079b90728e2e6c.zip |
Bug 521498 - [genmodel, generators] gen. only explicitly passed models
* generate only models that are passed on the command line
* also in non-lib mode generate all ROOM classes
Change-Id: Ib0766d77ba9de3c1b4de4d9b97c0a301241603a2
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice')
4 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend index 471b0a7c2..fb5ccb677 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend @@ -43,7 +43,7 @@ class ActorClassGen extends GenericActorClassGenerator { @Inject protected ILogger logger def doGenerate(Root root) { - for (xpac: root.xpActorClasses) { + for (xpac: root.actorClasses.map[root.getExpandedActorClass(it)]) { val path = xpac.actorClass.generationTargetPath+xpac.actorClass.getPath val infopath = xpac.actorClass.generationInfoPath+xpac.actorClass.getPath var file = xpac.actorClass.getCHeaderFileName diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend index 985074453..c8d8ed4b3 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend @@ -37,7 +37,7 @@ class DataClassGen { @Inject ILogger logger def doGenerate(Root root) { - for (dc: root.usedDataClasses) { + for (dc: root.dataClasses) { val path = dc.generationTargetPath+dc.getPath val infopath = dc.generationInfoPath+dc.getPath var file = dc.getCHeaderFileName diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/EnumerationTypeGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/EnumerationTypeGen.xtend index f0ce0f4d4..fc0ef2376 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/EnumerationTypeGen.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/EnumerationTypeGen.xtend @@ -31,7 +31,7 @@ class EnumerationTypeGen { @Inject extension TypeHelpers def doGenerate(Root root) { - for (et: root.usedEnumClasses) { + for (et: root.enumClasses) { val path = et.generationTargetPath+et.getPath val infopath = et.generationInfoPath+et.getPath var file = et.getCHeaderFileName diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend index f792caed0..accde66c6 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend @@ -40,7 +40,7 @@ class ProtocolClassGen extends GenericProtocolClassGenerator { @Inject ILogger logger def doGenerate(Root root) { - for (pc: root.usedProtocolClasses) { + for (pc: root.protocolClasses) { val path = pc.generationTargetPath+pc.getPath val infopath = pc.generationInfoPath+pc.getPath var file = pc.getCHeaderFileName |