mirror of
https://github.com/Stirling-Tools/Stirling-PDF.git
synced 2025-06-06 18:30:57 +00:00
Fix for MacOS x86_64 Installer (#3314)
- Updated workflow step to log jpackage dir   --- ## Checklist ### General - [x] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [x] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md) (if applicable) - [x] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md) (if applicable) - [x] I have performed a self-review of my own code - [x] My changes generate no new warnings ### Documentation - [x] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed) - [x] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only) ### UI Changes (if applicable) - [x] Screenshots or videos demonstrating the UI changes are attached (e.g., as comments or direct attachments in the PR) ### Testing (if applicable) - [x] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing) for more details.
This commit is contained in:
parent
c57f68551f
commit
c93722ec05
1
.github/workflows/multiOSReleases.yml
vendored
1
.github/workflows/multiOSReleases.yml
vendored
@ -175,6 +175,7 @@ jobs:
|
|||||||
id: prepare
|
id: prepare
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
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"
|
||||||
|
10
build.gradle
10
build.gradle
@ -165,7 +165,7 @@ jpackage {
|
|||||||
icon = "src/main/resources/static/favicon.icns"
|
icon = "src/main/resources/static/favicon.icns"
|
||||||
type = "dmg"
|
type = "dmg"
|
||||||
macPackageIdentifier = "com.stirling.software.pdf"
|
macPackageIdentifier = "com.stirling.software.pdf"
|
||||||
macPackageName = "Stirling-PDF_aarch64"
|
macPackageName = "Stirling-PDF-aarch64"
|
||||||
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
|
||||||
@ -230,6 +230,8 @@ tasks.register('jpackageMacX64') {
|
|||||||
group = 'distribution'
|
group = 'distribution'
|
||||||
description = 'Packages app for MacOS x86_64'
|
description = 'Packages app for MacOS x86_64'
|
||||||
|
|
||||||
|
println "Running jpackageMacX64 task"
|
||||||
|
|
||||||
if (OperatingSystem.current().isMacOsX()) {
|
if (OperatingSystem.current().isMacOsX()) {
|
||||||
println "MacOS detected. Downloading temp JRE."
|
println "MacOS detected. Downloading temp JRE."
|
||||||
dependsOn("downloadTempJre")
|
dependsOn("downloadTempJre")
|
||||||
@ -270,11 +272,11 @@ tasks.register('jpackageMacX64') {
|
|||||||
def stderr = errorStream.toString("UTF-8")
|
def stderr = errorStream.toString("UTF-8")
|
||||||
|
|
||||||
if (!stdout.isBlank()) {
|
if (!stdout.isBlank()) {
|
||||||
println "📝 jpackage stdout:\n$stdout"
|
println "jpackage stdout:\n$stdout"
|
||||||
}
|
}
|
||||||
|
|
||||||
if (result.exitValue != 0) {
|
if (result.exitValue != 0) {
|
||||||
throw new GradleException("❌ jpackage failed with exit code ${result.exitValue}.\n\n$stderr")
|
throw new GradleException("jpackage failed with exit code ${result.exitValue}.\n\n$stderr")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -322,7 +324,7 @@ tasks.register('cleanTempJre') {
|
|||||||
def path = project.ext.tempJrePath
|
def path = project.ext.tempJrePath
|
||||||
|
|
||||||
if (path && new File("$path").exists()) {
|
if (path && new File("$path").exists()) {
|
||||||
println "🧹 Cleaning up temporary JRE: $path"
|
println "Cleaning up temporary JRE: $path"
|
||||||
new File("$path").parentFile.deleteDir()
|
new File("$path").parentFile.deleteDir()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user