diff options
| author | Juergen Haug | 2018-02-05 17:40:59 +0000 |
|---|---|---|
| committer | Juergen Haug | 2018-02-05 19:36:04 +0000 |
| commit | 13968fee4fe90ead866af91f635bfa067e0cb6f8 (patch) | |
| tree | f6a7fc7273d9205ad93be95ed879a17c1351536c /plugins/org.eclipse.etrice.core.etmap | |
| parent | bf57ff2b489e79cb585eb3a69e3275031358f94c (diff) | |
| parent | f6d683be58e7d0ad5332b5ded57ec4dd33c59f0f (diff) | |
| download | org.eclipse.etrice-13968fee4fe90ead866af91f635bfa067e0cb6f8.tar.gz org.eclipse.etrice-13968fee4fe90ead866af91f635bfa067e0cb6f8.tar.xz org.eclipse.etrice-13968fee4fe90ead866af91f635bfa067e0cb6f8.zip | |
Merge branch 'master' into newfsmgen_finalize
with conflicts...
Change-Id: I4d06be6132abcdfbf53ea078e65373b42b2541f9
Diffstat (limited to 'plugins/org.eclipse.etrice.core.etmap')
| -rw-r--r-- | plugins/org.eclipse.etrice.core.etmap/build.gradle | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/plugins/org.eclipse.etrice.core.etmap/build.gradle b/plugins/org.eclipse.etrice.core.etmap/build.gradle index 3941075b6..0ddd84a97 100644 --- a/plugins/org.eclipse.etrice.core.etmap/build.gradle +++ b/plugins/org.eclipse.etrice.core.etmap/build.gradle @@ -1,24 +1,9 @@ -apply plugin: 'java' - -apply from: "$rootDir/gradle/publish.gradle" - dependencies { compile project(':plugins:org.eclipse.etrice.core.common') compile project(':plugins:org.eclipse.etrice.core.etphys') compile project(':plugins:org.eclipse.etrice.core.room') compile project(':plugins:org.eclipse.etrice.core.genmodel') - compile "org.eclipse.xtext:org.eclipse.xtext:$xtext_version" -} - -sourceSets { - main { - java { - srcDirs = ['src', 'src-gen', 'xtend-gen'] - } - resources { - srcDirs = ['src', 'src-gen'] - include '**/*.xtextbin', '**/*.tokens' - } - } + compile "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext" + compile "org.eclipse.xtext:org.eclipse.xtext:$versions.xtext" }
\ No newline at end of file |