Skip to content

Commit d63e0d4

Browse files
authored
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 emscripten-core/emscripten#20919
1 parent 2514ec7 commit d63e0d4

File tree

3 files changed

+1
-29
lines changed

3 files changed

+1
-29
lines changed

emsdk_manifest.json

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -192,24 +192,6 @@
192192
"activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
193193
"activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.9/site-packages/certifi/cacert.pem"
194194
},
195-
{
196-
"id": "java",
197-
"version": "8.152",
198-
"bitness": 32,
199-
"arch": "x86",
200-
"windows_url": "portable_jre_8_update_152_32bit.zip",
201-
"activated_env": "JAVA_HOME=%installation_dir%",
202-
"activated_cfg": "JAVA='%installation_dir%/bin/java%.exe%'"
203-
},
204-
{
205-
"id": "java",
206-
"version": "8.152",
207-
"bitness": 64,
208-
"arch": "x86_64",
209-
"windows_url": "portable_jre_8_update_152_64bit.zip",
210-
"activated_env": "JAVA_HOME=%installation_dir%",
211-
"activated_cfg": "JAVA='%installation_dir%/bin/java%.exe%'"
212-
},
213195
{
214196
"id": "emscripten",
215197
"version": "tag-%tag%",
@@ -415,7 +397,7 @@
415397
{
416398
"version": "releases-%releases-tag%",
417399
"bitness": 64,
418-
"uses": ["node-20.18.0-64bit", "python-3.9.2-nuget-64bit", "java-8.152-64bit", "releases-%releases-tag%-64bit"],
400+
"uses": ["node-20.18.0-64bit", "python-3.9.2-nuget-64bit", "releases-%releases-tag%-64bit"],
419401
"os": "win",
420402
"custom_install_script": "emscripten_npm_install"
421403
}

test/test_activation.ps1

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ try {
2929
$EMSDK = [System.Environment]::GetEnvironmentVariable("EMSDK", $env_type)
3030
$EMSDK_NODE = [System.Environment]::GetEnvironmentVariable("EMSDK_NODE", $env_type)
3131
$EMSDK_PYTHON = [System.Environment]::GetEnvironmentVariable("EMSDK_PYTHON", $env_type)
32-
$JAVA_HOME = [System.Environment]::GetEnvironmentVariable("JAVA_HOME", $env_type)
3332
$PATH = [System.Environment]::GetEnvironmentVariable("PATH", $env_type)
3433

3534
if (!$EMSDK) {
@@ -38,9 +37,6 @@ try {
3837
if (!$EMSDK_NODE) {
3938
throw "EMSDK_NODE is not set for the user"
4039
}
41-
if (!$JAVA_HOME) {
42-
throw "JAVA_HOME is not set for the user"
43-
}
4440
if (!$EMSDK_PYTHON) {
4541
throw "EMSDK_PYTHON is not set for the user"
4642
}
@@ -76,20 +72,17 @@ finally {
7672
[Environment]::SetEnvironmentVariable("EMSDK", $null, "User")
7773
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "User")
7874
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "User")
79-
[Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "User")
8075

8176
try {
8277
[Environment]::SetEnvironmentVariable("EMSDK", $null, "Machine")
8378
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Machine")
8479
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Machine")
85-
[Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Machine")
8680
} catch {}
8781

8882

8983
[Environment]::SetEnvironmentVariable("EMSDK", $null, "Process")
9084
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Process")
9185
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Process")
92-
[Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Process")
9386

9487
refreshenv
9588
}

test/test_path_preservation.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,17 @@ finally {
125125
[Environment]::SetEnvironmentVariable("EMSDK", $null, "User")
126126
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "User")
127127
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "User")
128-
[Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "User")
129128

130129
try {
131130
[Environment]::SetEnvironmentVariable("EMSDK", $null, "Machine")
132131
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Machine")
133132
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Machine")
134-
[Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Machine")
135133
} catch {}
136134

137135

138136
[Environment]::SetEnvironmentVariable("EMSDK", $null, "Process")
139137
[Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Process")
140138
[Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Process")
141-
[Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Process")
142139

143140
refreshenv
144141

0 commit comments

Comments
 (0)