Skip to content

Commit 987d50c

Browse files
authored
port to windows-rs (RustPython#5080)
* Fix OpenSSL in windows CI * bump windows-rs * prepare windows-sys 0.48 * CloseHandle * DuplicateHandle * CreatePipe * GetFileType * GetExitCodeProcess * TerminateProcess * GetStdHandle * GetCurrentProcess * DeleteProcThreadAttributeList * WaitForSingleObject * CreateProcessW * InitializeProcThreadAttributeList * UpdateProcThreadAttribute * clean up helpers
1 parent 2fa88f9 commit 987d50c

File tree

4 files changed

+213
-168
lines changed

4 files changed

+213
-168
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,9 @@ jobs:
257257
run: |
258258
choco install llvm openssl --no-progress
259259
if [[ -d "C:\Program Files\OpenSSL-Win64" ]]; then
260-
echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64;" >> $GITHUB_ENV
260+
echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_ENV
261261
else
262-
echo "OPENSSL_DIR=C:\Program Files\OpenSSL;" >> $GITHUB_ENV
262+
echo "OPENSSL_DIR=C:\Program Files\OpenSSL" >> $GITHUB_ENV
263263
fi
264264
if: runner.os == 'Windows'
265265
- name: Set up the Mac environment

Cargo.lock

Lines changed: 39 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vm/Cargo.toml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,25 @@ widestring = { workspace = true }
113113
winreg = "0.10.1"
114114

115115
[target.'cfg(windows)'.dependencies.windows]
116-
version = "0.39.0"
116+
version = "0.51.1"
117117
features = [
118-
"Win32_UI_Shell", "Win32_System_LibraryLoader", "Win32_Foundation"
118+
"Win32_Foundation",
119+
"Win32_System_LibraryLoader",
120+
"Win32_System_Threading",
121+
"Win32_UI_Shell",
122+
]
123+
124+
[target.'cfg(windows)'.dependencies.windows-sys]
125+
version = "0.48.0"
126+
features = [
127+
"Win32_Foundation",
128+
"Win32_Security",
129+
"Win32_Storage_FileSystem",
130+
"Win32_System_Console",
131+
"Win32_System_LibraryLoader",
132+
"Win32_System_Pipes",
133+
"Win32_System_Threading",
134+
"Win32_UI_Shell",
119135
]
120136

121137
[target.'cfg(windows)'.dependencies.winapi]

0 commit comments

Comments
 (0)