graalvm/setup-graalvm
1
0
Fork 0
mirror of https://github.com/graalvm/setup-graalvm.git synced 2025-02-23 12:20:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
peterz 2024-03-18 16:35:51 +03:00 committed by Fabio Niephaus
parent 30261a858e
commit a19f51dc38
No known key found for this signature in database
GPG Key ID: F21CF5275F31DFD6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/main/index.js generated vendored
View File

@ -94300,14 +94300,14 @@ function findLibericaURL(javaVersion, javaPackage) {
return asset.browser_download_url; return asset.browser_download_url;
} }
} }
throw new Error(`Unable to find asset for java-version: ${javaVersion}, java-package: ${javaPackage}, platform: ${platform}`); throw new Error(`Unable to find asset for java-version: ${javaVersion}, java-package: ${javaPackage}, platform: ${platform}. ${c.ERROR_REQUEST}`);
}); });
} }
exports.findLibericaURL = findLibericaURL; exports.findLibericaURL = findLibericaURL;
function determineToolName(javaVersion, javaPackage) { function determineToolName(javaVersion, javaPackage) {
const variant = determineVariantPart(javaPackage); const variant = determineVariantPart(javaPackage);
const platform = determinePlatformPart(); const platform = determinePlatformPart();
return `${LIBERICA_VM_PREFIX}${variant}openjdk${javaVersion}-${platform}`; return `${LIBERICA_VM_PREFIX}${variant}${platform}`;
} }
function determineVariantPart(javaPackage) { function determineVariantPart(javaPackage) {
return javaPackage !== null && javaPackage.includes('+fx') ? 'full-' : ''; return javaPackage !== null && javaPackage.includes('+fx') ? 'full-' : '';
@ -94323,7 +94323,7 @@ function determinePlatformPart() {
function isMuslBasedLinux() { function isMuslBasedLinux() {
if (c.IS_LINUX) { if (c.IS_LINUX) {
const output = (0, child_process_1.spawnSync)('ldd', ['--version']).stderr.toString('utf8'); const output = (0, child_process_1.spawnSync)('ldd', ['--version']).stderr.toString('utf8');
if (output.indexOf('musl') > -1) { if (output.includes('musl')) {
return true; return true;
} }
} }
@ -94433,7 +94433,7 @@ function run() {
graalVMHome = yield (0, mandrel_1.setUpMandrel)(graalVMVersion, javaVersion); graalVMHome = yield (0, mandrel_1.setUpMandrel)(graalVMVersion, javaVersion);
break; break;
case c.DISTRIBUTION_LIBERICA: case c.DISTRIBUTION_LIBERICA:
graalVMHome = yield (0, liberica_1.setUpLiberica)(javaVersion, graalVMVersion); graalVMHome = yield (0, liberica_1.setUpLiberica)(javaVersion, javaPackage);
break; break;
case '': case '':
if (javaVersion === c.VERSION_DEV) { if (javaVersion === c.VERSION_DEV) {

6
src/liberica.ts
View File

@ -82,14 +82,14 @@ export async function findLibericaURL(
} }
} }
throw new Error( throw new Error(
`Unable to find asset for java-version: ${javaVersion}, java-package: ${javaPackage}, platform: ${platform}` `Unable to find asset for java-version: ${javaVersion}, java-package: ${javaPackage}, platform: ${platform}. ${c.ERROR_REQUEST}`
) )
} }
function determineToolName(javaVersion: string, javaPackage: string) { function determineToolName(javaVersion: string, javaPackage: string) {
const variant = determineVariantPart(javaPackage) const variant = determineVariantPart(javaPackage)
const platform = determinePlatformPart() const platform = determinePlatformPart()
return `${LIBERICA_VM_PREFIX}${variant}openjdk${javaVersion}-${platform}` return `${LIBERICA_VM_PREFIX}${variant}${platform}`
} }
function determineVariantPart(javaPackage: string) { function determineVariantPart(javaPackage: string) {
@ -107,7 +107,7 @@ function determinePlatformPart() {
function isMuslBasedLinux() { function isMuslBasedLinux() {
if (c.IS_LINUX) { if (c.IS_LINUX) {
const output = spawnSync('ldd', ['--version']).stderr.toString('utf8') const output = spawnSync('ldd', ['--version']).stderr.toString('utf8')
if (output.indexOf('musl') > -1) { if (output.includes('musl')) {
return true return true
} }
} }