From 6f4b1dba04df0422ca6cd20050cbc7d342e8e88c Mon Sep 17 00:00:00 2001 From: Johannes Mey <johannes.mey@tu-dresden.de> Date: Sat, 9 Apr 2022 20:11:37 +0200 Subject: [PATCH] fix problems with jar contents --- .gitlab-ci.yml | 5 ++--- build.gradle | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7459c6b..ea867a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,11 +20,10 @@ build: image: openjdk:11 stage: build script: - - ./gradlew --console=plain --no-daemon assemble + - ./gradlew --console=plain --no-daemon assemble jar artifacts: paths: - - "src/gen" - expire_in: 1 week + - build/libs/*.jar test: image: openjdk:11 diff --git a/build.gradle b/build.gradle index 5c07b93..827082f 100644 --- a/build.gradle +++ b/build.gradle @@ -23,16 +23,26 @@ configurations { 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 { model { java { srcDir 'src/gen/java' } } + main { compileClasspath += sourceSets.model.output resources { - srcDir 'src/main/jastadd' + source(jastaddSources) + source(jastaddGenSources) } } test { @@ -41,6 +51,10 @@ sourceSets { } } +jar { + includeEmptyDirs false +} + File genSrc = file('src/gen/java') idea.module.generatedSourceDirs += genSrc -- GitLab