mirror of
https://github.com/Stirling-Tools/Stirling-PDF.git
synced 2025-06-23 16:05:09 +00:00
adding java options to installer. fixing workflow trigger
This commit is contained in:
parent
480d7626c1
commit
53c63806e3
12
.github/workflows/multiOSReleases.yml
vendored
12
.github/workflows/multiOSReleases.yml
vendored
@ -2,13 +2,13 @@ name: Test Installers Build
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
release:
|
|
||||||
types: [created]
|
|
||||||
inputs:
|
inputs:
|
||||||
test_mode:
|
test_mode:
|
||||||
description: "Run in test mode (skips release step)"
|
description: "Run in test mode (skip release step)"
|
||||||
required: false
|
required: false
|
||||||
default: "false"
|
default: "false"
|
||||||
|
release:
|
||||||
|
types: [created]
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
@ -200,10 +200,10 @@ jobs:
|
|||||||
ls -lah ./build/jpackage/
|
ls -lah ./build/jpackage/
|
||||||
mkdir ./binaries
|
mkdir ./binaries
|
||||||
if [ "${{ matrix.os }}" = "windows-latest" ]; then
|
if [ "${{ matrix.os }}" = "windows-latest" ]; then
|
||||||
mv "./build/jpackage/Stirling-PDF-${{ needs.read_versions.outputs.version }}.exe" "./binaries/Stirling-PDF-win-installer.exe"
|
mv "./build/jpackage/Stirling PDF-${{ needs.read_versions.outputs.version }}.exe" "./binaries/Stirling-PDF-win-installer.exe"
|
||||||
elif [ "${{ matrix.os }}" = "macos-latest" ]; then
|
elif [ "${{ matrix.os }}" = "macos-latest" ]; then
|
||||||
mv "./build/jpackage/Stirling-PDF-${{ needs.read_versions.outputs.versionMac }}.dmg" "./binaries/Stirling-PDF-mac-installer.dmg"
|
mv "./build/jpackage/Stirling PDF-${{ needs.read_versions.outputs.versionMac }}.dmg" "./binaries/Stirling-PDF-mac-installer.dmg"
|
||||||
mv "./build/jpackage/x86_64/Stirling-PDF (x86_64)-${{ needs.read_versions.outputs.versionMac }}.dmg" "./binaries/Stirling-PDF-mac-x86_64-installer.dmg"
|
mv "./build/jpackage/x86_64/Stirling PDF (x86_64)-${{ needs.read_versions.outputs.versionMac }}.dmg" "./binaries/Stirling-PDF-mac-x86_64-installer.dmg"
|
||||||
else
|
else
|
||||||
mv "./build/jpackage/stirling-pdf_${{ needs.read_versions.outputs.version }}-1_amd64.deb" "./binaries/Stirling-PDF-linux-installer.deb"
|
mv "./build/jpackage/stirling-pdf_${{ needs.read_versions.outputs.version }}-1_amd64.deb" "./binaries/Stirling-PDF-linux-installer.deb"
|
||||||
fi
|
fi
|
||||||
|
44
build.gradle
44
build.gradle
@ -116,7 +116,7 @@ jpackage {
|
|||||||
input = "build/libs"
|
input = "build/libs"
|
||||||
destination = "${projectDir}/build/jpackage"
|
destination = "${projectDir}/build/jpackage"
|
||||||
mainJar = "Stirling-PDF-${project.version}.jar"
|
mainJar = "Stirling-PDF-${project.version}.jar"
|
||||||
appName = "Stirling-PDF"
|
appName = "Stirling PDF"
|
||||||
appVersion = project.version
|
appVersion = project.version
|
||||||
// appVersion = "2005.45.1"
|
// appVersion = "2005.45.1"
|
||||||
vendor = "Stirling-Software"
|
vendor = "Stirling-Software"
|
||||||
@ -164,8 +164,8 @@ jpackage {
|
|||||||
appVersion = getMacVersion(project.version.toString())
|
appVersion = getMacVersion(project.version.toString())
|
||||||
icon = "src/main/resources/static/favicon.icns"
|
icon = "src/main/resources/static/favicon.icns"
|
||||||
type = "dmg"
|
type = "dmg"
|
||||||
macPackageIdentifier = "Stirling-PDF"
|
macPackageIdentifier = "Stirling PDF"
|
||||||
macPackageName = "Stirling-PDF"
|
macPackageName = "Stirling PDF"
|
||||||
macAppCategory = "public.app-category.productivity"
|
macAppCategory = "public.app-category.productivity"
|
||||||
macSign = false // Enable signing
|
macSign = false // Enable signing
|
||||||
macAppStore = false // Not targeting App Store initially
|
macAppStore = false // Not targeting App Store initially
|
||||||
@ -249,18 +249,32 @@ tasks.register('jpackageMacX64') {
|
|||||||
|
|
||||||
def result = exec {
|
def result = exec {
|
||||||
commandLine 'jpackage',
|
commandLine 'jpackage',
|
||||||
'--type', 'dmg',
|
'--type', 'dmg',
|
||||||
'--name', 'Stirling-PDF (x86_64)',
|
'--name', 'Stirling PDF (x86_64)',
|
||||||
'--input', 'build/libs',
|
'--input', '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', 'stirling.software.SPDF.SPDFApplication',
|
||||||
'--runtime-image', file(jrePath + "/zulu-17.jre/Contents/Home"),
|
'--runtime-image', file(jrePath + "/zulu-17.jre/Contents/Home"),
|
||||||
'--dest', 'build/jpackage/x86_64',
|
'--dest', 'build/jpackage/x86_64',
|
||||||
'--icon', 'src/main/resources/static/favicon.icns',
|
'--icon', 'src/main/resources/static/favicon.icns',
|
||||||
'--app-version', getMacVersion(project.version.toString()),
|
'--app-version', getMacVersion(project.version.toString()),
|
||||||
'--mac-package-name', 'Stirling-PDF (x86_64)',
|
'--mac-package-name', 'Stirling PDF (x86_64)',
|
||||||
'--mac-package-identifier', 'Stirling-PDF (x86_64)',
|
'--mac-package-identifier', 'Stirling PDF (x86_64)',
|
||||||
'--mac-app-category', 'public.app-category.productivity'
|
'--mac-app-category', 'public.app-category.productivity',
|
||||||
|
|
||||||
|
// Java options
|
||||||
|
'--java-options', '-DBROWSER_OPEN=true',
|
||||||
|
'--java-options', '-DSTIRLING_PDF_DESKTOP_UI=true',
|
||||||
|
'--java-options', '-Djava.awt.headless=false',
|
||||||
|
'--java-options', '-Dapple.awt.UIElement=true',
|
||||||
|
'--java-options', '--add-opens=java.base/java.lang=ALL-UNNAMED',
|
||||||
|
'--java-options', '--add-opens=java.desktop/java.awt.event=ALL-UNNAMED',
|
||||||
|
'--java-options', '--add-opens=java.desktop/sun.awt=ALL-UNNAMED',
|
||||||
|
'--java-options', '--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED',
|
||||||
|
'--java-options', '--add-opens=java.desktop/sun.awt.windows=ALL-UNNAMED',
|
||||||
|
'--java-options', '--add-opens=java.desktop/sun.lwawt=ALL-UNNAMED',
|
||||||
|
'--java-options', '--add-opens=java.desktop/sun.lwawt.macosx=ALL-UNNAMED'
|
||||||
|
|
||||||
standardOutput = outputStream
|
standardOutput = outputStream
|
||||||
errorOutput = errorStream
|
errorOutput = errorStream
|
||||||
ignoreExitValue = true
|
ignoreExitValue = true
|
||||||
|
Loading…
x
Reference in New Issue
Block a user