Don't install java when installing windows sdk (#1324)
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
This commit is contained in:
@@ -192,24 +192,6 @@
|
|||||||
"activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
|
"activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
|
||||||
"activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.9/site-packages/certifi/cacert.pem"
|
"activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.9/site-packages/certifi/cacert.pem"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"id": "java",
|
|
||||||
"version": "8.152",
|
|
||||||
"bitness": 32,
|
|
||||||
"arch": "x86",
|
|
||||||
"windows_url": "portable_jre_8_update_152_32bit.zip",
|
|
||||||
"activated_env": "JAVA_HOME=%installation_dir%",
|
|
||||||
"activated_cfg": "JAVA='%installation_dir%/bin/java%.exe%'"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "java",
|
|
||||||
"version": "8.152",
|
|
||||||
"bitness": 64,
|
|
||||||
"arch": "x86_64",
|
|
||||||
"windows_url": "portable_jre_8_update_152_64bit.zip",
|
|
||||||
"activated_env": "JAVA_HOME=%installation_dir%",
|
|
||||||
"activated_cfg": "JAVA='%installation_dir%/bin/java%.exe%'"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"id": "emscripten",
|
"id": "emscripten",
|
||||||
"version": "tag-%tag%",
|
"version": "tag-%tag%",
|
||||||
@@ -415,7 +397,7 @@
|
|||||||
{
|
{
|
||||||
"version": "releases-%releases-tag%",
|
"version": "releases-%releases-tag%",
|
||||||
"bitness": 64,
|
"bitness": 64,
|
||||||
"uses": ["node-20.18.0-64bit", "python-3.9.2-nuget-64bit", "java-8.152-64bit", "releases-%releases-tag%-64bit"],
|
"uses": ["node-20.18.0-64bit", "python-3.9.2-nuget-64bit", "releases-%releases-tag%-64bit"],
|
||||||
"os": "win",
|
"os": "win",
|
||||||
"custom_install_script": "emscripten_npm_install"
|
"custom_install_script": "emscripten_npm_install"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ try {
|
|||||||
$EMSDK = [System.Environment]::GetEnvironmentVariable("EMSDK", $env_type)
|
$EMSDK = [System.Environment]::GetEnvironmentVariable("EMSDK", $env_type)
|
||||||
$EMSDK_NODE = [System.Environment]::GetEnvironmentVariable("EMSDK_NODE", $env_type)
|
$EMSDK_NODE = [System.Environment]::GetEnvironmentVariable("EMSDK_NODE", $env_type)
|
||||||
$EMSDK_PYTHON = [System.Environment]::GetEnvironmentVariable("EMSDK_PYTHON", $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)
|
$PATH = [System.Environment]::GetEnvironmentVariable("PATH", $env_type)
|
||||||
|
|
||||||
if (!$EMSDK) {
|
if (!$EMSDK) {
|
||||||
@@ -38,9 +37,6 @@ try {
|
|||||||
if (!$EMSDK_NODE) {
|
if (!$EMSDK_NODE) {
|
||||||
throw "EMSDK_NODE is not set for the user"
|
throw "EMSDK_NODE is not set for the user"
|
||||||
}
|
}
|
||||||
if (!$JAVA_HOME) {
|
|
||||||
throw "JAVA_HOME is not set for the user"
|
|
||||||
}
|
|
||||||
if (!$EMSDK_PYTHON) {
|
if (!$EMSDK_PYTHON) {
|
||||||
throw "EMSDK_PYTHON is not set for the user"
|
throw "EMSDK_PYTHON is not set for the user"
|
||||||
}
|
}
|
||||||
@@ -76,20 +72,17 @@ finally {
|
|||||||
[Environment]::SetEnvironmentVariable("EMSDK", $null, "User")
|
[Environment]::SetEnvironmentVariable("EMSDK", $null, "User")
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "User")
|
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "User")
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "User")
|
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "User")
|
||||||
[Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "User")
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK", $null, "Machine")
|
[Environment]::SetEnvironmentVariable("EMSDK", $null, "Machine")
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Machine")
|
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Machine")
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Machine")
|
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Machine")
|
||||||
[Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Machine")
|
|
||||||
} catch {}
|
} catch {}
|
||||||
|
|
||||||
|
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK", $null, "Process")
|
[Environment]::SetEnvironmentVariable("EMSDK", $null, "Process")
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Process")
|
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Process")
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Process")
|
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Process")
|
||||||
[Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Process")
|
|
||||||
|
|
||||||
refreshenv
|
refreshenv
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -125,20 +125,17 @@ finally {
|
|||||||
[Environment]::SetEnvironmentVariable("EMSDK", $null, "User")
|
[Environment]::SetEnvironmentVariable("EMSDK", $null, "User")
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "User")
|
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "User")
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "User")
|
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "User")
|
||||||
[Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "User")
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK", $null, "Machine")
|
[Environment]::SetEnvironmentVariable("EMSDK", $null, "Machine")
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Machine")
|
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Machine")
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Machine")
|
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Machine")
|
||||||
[Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Machine")
|
|
||||||
} catch {}
|
} catch {}
|
||||||
|
|
||||||
|
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK", $null, "Process")
|
[Environment]::SetEnvironmentVariable("EMSDK", $null, "Process")
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Process")
|
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Process")
|
||||||
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Process")
|
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Process")
|
||||||
[Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Process")
|
|
||||||
|
|
||||||
refreshenv
|
refreshenv
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user