Skip to content

Commit 7f3689c

Browse files
committed
Remove the platform independent fix (handled by NBPackage)
1 parent 3607da8 commit 7f3689c

2 files changed

Lines changed: 0 additions & 38 deletions

File tree

.github/workflows/release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ jobs:
2424
run: ./gradlew overrideHarness -Ptag_name=${{ github.ref_name }}
2525
- name: Build Installers
2626
run: ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=false set-spec-version build-zip unset-spec-version
27-
- name: Fix Platform Independent Build
28-
run: ./gradlew fixPlatformIndependent -Ptag_name=${{ github.ref_name }}
2927
- name: Download JDKs for the installers
3028
run: bash download-jdks.sh
3129
working-directory: installers

build.gradle

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -643,42 +643,6 @@ tasks.register('cleanSdk') {
643643
}
644644
}
645645

646-
tasks.register('extractPlatformIndependent', Copy) {
647-
from zipTree('dist/jmonkeyplatform.zip')
648-
into "dist/temp/"
649-
650-
exclude("jmonkeyplatform/etc/jmonkeyplatform.conf")
651-
}
652-
653-
tasks.register('patchPlatformIndependent', Copy) {
654-
dependsOn extractPlatformIndependent
655-
from zipTree('dist/jmonkeyplatform.zip')
656-
into "dist/temp/"
657-
658-
include("jmonkeyplatform/etc/jmonkeyplatform.conf")
659-
660-
filter { String line ->
661-
line.startsWith('jdkhome=') ? '#jdkhome="/path/to/jdk"' : line
662-
}
663-
664-
doLast {
665-
delete(file('dist/jmonkeyplatform.zip'))
666-
}
667-
}
668-
669-
tasks.register('fixPlatformIndependent', Zip) {
670-
dependsOn patchPlatformIndependent
671-
description = "We compile our installers with the bundled jdk, but the platform independent zip doesn't have the jdk. For this we need to change the jmonkeyplatform.zip after building the installers to not have a jdk bundled"
672-
673-
from 'dist/temp'
674-
archiveFileName = 'jmonkeyplatform.zip'
675-
destinationDirectory = file('dist')
676-
677-
doLast {
678-
delete("dist/temp")
679-
}
680-
}
681-
682646
wrapper {
683647
gradleVersion = '9.2.1'
684648
}

0 commit comments

Comments
 (0)