@@ -106,15 +106,21 @@ def _SetupReleaseZap(install_directory: str, zap_version: str):
106
106
107
107
if sys .platform == 'linux' :
108
108
zap_platform = 'linux'
109
+ arch = os .uname ().machine
109
110
elif sys .platform == 'darwin' :
110
111
zap_platform = 'mac'
112
+ arch = os .uname ().machine
113
+ elif sys .platform == 'win32' :
114
+ zap_platform = 'win'
115
+ # os.uname is not implemented on Windows, so use an alternative instead.
116
+ import platform
117
+ arch = platform .uname ().machine
111
118
else :
112
119
raise Exception ('Unknown platform - do not know what zip file to download.' )
113
120
114
- arch = os .uname ().machine
115
121
if arch == 'arm64' :
116
122
zap_arch = 'arm64'
117
- elif arch == 'x86_64' :
123
+ elif arch == 'x86_64' or arch == 'AMD64' :
118
124
zap_arch = 'x64'
119
125
else :
120
126
raise Exception (f'Unknown architecture "${ arch } " - do not know what zip file to download.' )
@@ -228,17 +234,21 @@ def main(log_level: str, sdk_root: str, extract_root: str, zap_version: Optional
228
234
229
235
install_directory = os .path .join (extract_root , f"zap-{ zap_version } " )
230
236
237
+ export_cmd = "export"
238
+ if sys .platform == 'win32' :
239
+ export_cmd = "set"
240
+
231
241
if zap == DownloadType .SOURCE :
232
242
install_directory = install_directory + "-src"
233
243
_SetupSourceZap (install_directory , zap_version )
234
244
235
245
# Make sure the results can be used in scripts
236
- print (f"export ZAP_DEVELOPMENT_PATH={ shlex .quote (install_directory )} " )
246
+ print (f"{ export_cmd } ZAP_DEVELOPMENT_PATH={ shlex .quote (install_directory )} " )
237
247
else :
238
248
_SetupReleaseZap (install_directory , zap_version )
239
249
240
250
# Make sure the results can be used in scripts
241
- print (f"export ZAP_INSTALL_PATH={ shlex .quote (install_directory )} " )
251
+ print (f"{ export_cmd } ZAP_INSTALL_PATH={ shlex .quote (install_directory )} " )
242
252
243
253
244
254
if __name__ == '__main__' :
0 commit comments