From 40acbe6d973f76ec053d17199311b9b9ff17b01b Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Thu, 14 Dec 2023 16:37:36 -0800 Subject: [PATCH] Don't install java when installing windows sdk We use the native version of closure compiler these days so we don't need to install java on windows IIUC. See https://github.com/emscripten-core/emscripten/pull/20919 --- emsdk_manifest.json | 2 +- test/test_activation.ps1 | 7 ------- test/test_path_preservation.ps1 | 3 --- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/emsdk_manifest.json b/emsdk_manifest.json index 623cb47d6c..6772b753f1 100644 --- a/emsdk_manifest.json +++ b/emsdk_manifest.json @@ -697,7 +697,7 @@ { "version": "releases-%releases-tag%", "bitness": 64, - "uses": ["node-16.20.0-64bit", "python-3.9.2-nuget-64bit", "java-8.152-64bit", "releases-%releases-tag%-64bit"], + "uses": ["node-16.20.0-64bit", "python-3.9.2-nuget-64bit", "releases-%releases-tag%-64bit"], "os": "win", "custom_install_script": "emscripten_npm_install" } diff --git a/test/test_activation.ps1 b/test/test_activation.ps1 index fdab08fb45..31a2c8eb8f 100644 --- a/test/test_activation.ps1 +++ b/test/test_activation.ps1 @@ -29,7 +29,6 @@ try { $EMSDK = [System.Environment]::GetEnvironmentVariable("EMSDK", $env_type) $EMSDK_NODE = [System.Environment]::GetEnvironmentVariable("EMSDK_NODE", $env_type) $EMSDK_PYTHON = [System.Environment]::GetEnvironmentVariable("EMSDK_PYTHON", $env_type) - $JAVA_HOME = [System.Environment]::GetEnvironmentVariable("JAVA_HOME", $env_type) $PATH = [System.Environment]::GetEnvironmentVariable("PATH", $env_type) if (!$EMSDK) { @@ -38,9 +37,6 @@ try { if (!$EMSDK_NODE) { throw "EMSDK_NODE is not set for the user" } - if (!$JAVA_HOME) { - throw "JAVA_HOME is not set for the user" - } if (!$EMSDK_PYTHON) { throw "EMSDK_PYTHON is not set for the user" } @@ -76,20 +72,17 @@ finally { [Environment]::SetEnvironmentVariable("EMSDK", $null, "User") [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "User") [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "User") - [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "User") try { [Environment]::SetEnvironmentVariable("EMSDK", $null, "Machine") [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Machine") [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Machine") - [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Machine") } catch {} [Environment]::SetEnvironmentVariable("EMSDK", $null, "Process") [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Process") [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Process") - [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Process") refreshenv } diff --git a/test/test_path_preservation.ps1 b/test/test_path_preservation.ps1 index 1547949967..0391b63a32 100644 --- a/test/test_path_preservation.ps1 +++ b/test/test_path_preservation.ps1 @@ -125,20 +125,17 @@ finally { [Environment]::SetEnvironmentVariable("EMSDK", $null, "User") [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "User") [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "User") - [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "User") try { [Environment]::SetEnvironmentVariable("EMSDK", $null, "Machine") [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Machine") [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Machine") - [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Machine") } catch {} [Environment]::SetEnvironmentVariable("EMSDK", $null, "Process") [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Process") [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Process") - [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Process") refreshenv