Skip to content
Snippets Groups Projects
Commit 6f4b1dba authored by Johannes Mey's avatar Johannes Mey
Browse files

fix problems with jar contents

parent f9f10bc7
No related branches found
No related tags found
No related merge requests found
Pipeline #13331 passed
...@@ -20,11 +20,10 @@ build: ...@@ -20,11 +20,10 @@ build:
image: openjdk:11 image: openjdk:11
stage: build stage: build
script: script:
- ./gradlew --console=plain --no-daemon assemble - ./gradlew --console=plain --no-daemon assemble jar
artifacts: artifacts:
paths: paths:
- "src/gen" - build/libs/*.jar
expire_in: 1 week
test: test:
image: openjdk:11 image: openjdk:11
......
...@@ -23,16 +23,26 @@ configurations { ...@@ -23,16 +23,26 @@ configurations {
relast relast
} }
def jastaddSources = objects.sourceDirectorySet("resources", "Resources1")
jastaddSources.srcDir 'src/main'
jastaddSources.include 'jastadd/**'
def jastaddGenSources = objects.sourceDirectorySet("resources", "Resources2")
jastaddGenSources.srcDir 'src/gen'
jastaddGenSources.include 'jastadd/*.relast', 'jastadd/*.ecore.jadd'
sourceSets { sourceSets {
model { model {
java { java {
srcDir 'src/gen/java' srcDir 'src/gen/java'
} }
} }
main { main {
compileClasspath += sourceSets.model.output compileClasspath += sourceSets.model.output
resources { resources {
srcDir 'src/main/jastadd' source(jastaddSources)
source(jastaddGenSources)
} }
} }
test { test {
...@@ -41,6 +51,10 @@ sourceSets { ...@@ -41,6 +51,10 @@ sourceSets {
} }
} }
jar {
includeEmptyDirs false
}
File genSrc = file('src/gen/java') File genSrc = file('src/gen/java')
idea.module.generatedSourceDirs += genSrc idea.module.generatedSourceDirs += genSrc
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment