Corrected input path

This commit is contained in:
Dario Ghunney Ware 2025-07-07 14:12:07 +01:00
parent 296758f51b
commit 84e14d7822

View File

@ -43,36 +43,6 @@ bootJar {
enabled = false enabled = false
} }
sourceSets {
main {
java {
if (System.getenv('DOCKER_ENABLE_SECURITY') == 'false' || System.getenv('DISABLE_ADDITIONAL_FEATURES') == 'true'
|| (project.hasProperty('DISABLE_ADDITIONAL_FEATURES')
&& System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) {
exclude 'stirling/software/proprietary/security/**'
}
if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
exclude 'stirling/software/SPDF/UI/impl/**'
}
}
}
test {
java {
if (System.getenv('DOCKER_ENABLE_SECURITY') == 'false' || System.getenv('DISABLE_ADDITIONAL_FEATURES') == 'true'
|| (project.hasProperty('DISABLE_ADDITIONAL_FEATURES')
&& System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) {
exclude 'stirling/software/proprietary/security/**'
}
if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
exclude 'stirling/software/SPDF/UI/impl/**'
}
}
}
}
allprojects { allprojects {
group = 'stirling.software' group = 'stirling.software'
version = '1.0.0' version = '1.0.0'
@ -171,9 +141,9 @@ subprojects {
useJUnitPlatform() useJUnitPlatform()
} }
tasks.named("processResources") { tasks.named("processResources") {
dependsOn(rootProject.tasks.writeVersion) dependsOn(rootProject.tasks.writeVersion)
} }
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
@ -232,7 +202,8 @@ static def getMacVersion(String version) {
} }
jpackage { jpackage {
input = layout.projectDirectory.dir("build/libs") dependsOn ':stirling-pdf:bootJar'
input = layout.projectDirectory.dir("stirling-pdf/build/libs")
destination = layout.projectDirectory.dir("build/jpackage") destination = layout.projectDirectory.dir("build/jpackage")
mainJar = "Stirling-PDF-${project.version}.jar" mainJar = "Stirling-PDF-${project.version}.jar"
appName = "Stirling PDF" appName = "Stirling PDF"
@ -375,7 +346,7 @@ tasks.register('jpackageMacX64') {
commandLine 'jpackage', commandLine 'jpackage',
'--type', 'dmg', '--type', 'dmg',
'--name', 'Stirling PDF (x86_64)', '--name', 'Stirling PDF (x86_64)',
'--input', 'build/libs', '--input', 'stirling-pdf/build/libs',
'--main-jar', "Stirling-PDF-${project.version}.jar", '--main-jar', "Stirling-PDF-${project.version}.jar",
'--main-class', 'org.springframework.boot.loader.launch.JarLauncher', '--main-class', 'org.springframework.boot.loader.launch.JarLauncher',
'--runtime-image', file(jrePath + "/zulu-17.jre/Contents/Home"), '--runtime-image', file(jrePath + "/zulu-17.jre/Contents/Home"),