Skip to content

Commit 2fc275d

Browse files
Add patch
Signed-off-by: Jean-Christophe Morin <[email protected]>
1 parent 91d996f commit 2fc275d

File tree

2 files changed

+30
-18
lines changed

2 files changed

+30
-18
lines changed

.github/workflows/wheel.yaml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,21 @@ jobs:
1919
arch: amd64
2020

2121
- name: Build
22+
shell: bash
2223
run: |
24+
set -ex
25+
ls -la launcher
2326
git clone https://github.com/pypa/distlib.git
24-
cp launcher/CMakeLists.txt distlib/PC/
25-
cd distlib/PC
26-
# $devenv=(Split-Path -Path (vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1))
27-
# $env:PATH="$devenv;$env:PATH"
28-
# echo $env:PATH
29-
# echo $devenv
30-
# ls
31-
# msbuild SimpleLauncher.sln -p:Configuration=Release -p:Platform=x64
32-
33-
# $vsInstallation = (vswhere -products * 17.0 -property installationPath)
34-
# echo $vsInstallation
35-
# VC\\Auxiliary\\Build\\vcvarsall.bat<
36-
# $env:VERBOSE=1
37-
38-
cmake . -GNinja
39-
cmake --build .
40-
41-
ls
27+
28+
cp distlib/PC/launcher.c launcher/
29+
30+
cd launcher
31+
patch -Np1 -i remote-appended.patch --binary
32+
33+
mkdir build
34+
cd build
35+
36+
cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release
37+
VERBOSE=1 cmake --build .
38+
39+
ls -la

launcher/remote-appended.patch

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/launcher.c b/launcher.c
2+
index 727f7916..2447d378 100644
3+
--- a/launcher.c
4+
+++ b/launcher.c
5+
@@ -35,8 +35,6 @@
6+
7+
#pragma comment (lib, "Shlwapi.lib")
8+
9+
-#define APPENDED_ARCHIVE
10+
-#define USE_ENVIRONMENT
11+
#define SUPPORT_RELATIVE_PATH
12+
13+
#define MSGSIZE 1024
14+

0 commit comments

Comments
 (0)