From e6ba6be90ed6e031be65b5b94b0ccc8dab67383d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Spo=CC=88nemann?= Date: Fri, 10 Jun 2016 17:10:26 +0200 Subject: [PATCH] Updated include / exclude patterns for jar resources --- plugins/org.eclipse.xtext/build.gradle | 1 + separate-builds/core/gradle/eclipse-project-layout.gradle | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/org.eclipse.xtext/build.gradle b/plugins/org.eclipse.xtext/build.gradle index 7b41eccb1..973b3dbd3 100644 --- a/plugins/org.eclipse.xtext/build.gradle +++ b/plugins/org.eclipse.xtext/build.gradle @@ -19,4 +19,5 @@ dependencies { sourceSets.main { java.srcDir 'packrat' resources.include 'org/**', 'modeling32.png' + resources.exclude 'packrat' } diff --git a/separate-builds/core/gradle/eclipse-project-layout.gradle b/separate-builds/core/gradle/eclipse-project-layout.gradle index 4559c95f9..e75b4eb1b 100644 --- a/separate-builds/core/gradle/eclipse-project-layout.gradle +++ b/separate-builds/core/gradle/eclipse-project-layout.gradle @@ -11,9 +11,9 @@ sourceSets { java.srcDirs = ['src', 'xtend-gen', 'src-gen', 'emf-gen'] resources { srcDirs = ['src', 'src-gen', 'emf-gen', '.'] - include 'plugin.xml', 'schema/**', 'about.ini', 'about.mappings', 'about.properties', 'about.html' - exclude '**/*._trace', '**/*.xtendbin', '**/*.xtend' - exclude 'src', 'xtend-gen', 'src-gen', 'emf-gen', 'build', 'target' + include 'plugin.xml', 'schema/**', 'model/**', 'about.ini', 'about.mappings', 'about.properties', 'about.html', + '**/*.properties', '**/*.xtextbin', '**/*.xmi', '**/*.g', '**/*.tokens' + exclude 'bin', 'src', 'xtend-gen', 'src-gen', 'emf-gen', 'build', 'target', 'build.properties' } } configure(isTestProject? main : test) {