Skip to content

Commit 5d42d49

Browse files
committed
Revert "Use Python's patch module"
This reverts commit 4705753.
1 parent 4705753 commit 5d42d49

1 file changed

Lines changed: 15 additions & 1 deletion

File tree

library_builders.bat

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,21 @@ exit /b 0
2121
https://github.com/ornladios/ADIOS2/archive/v2.10.2.zip
2222
powershell Expand-Archive adios2-2.10.2.zip -DestinationPath dep-adios2
2323

24-
python -m patch --directory=dep-adios2/ADIOS2-2.10.2/ https://github.com/franzpoeschel/ADIOS2/commit/9f3bea5d3974578bb40fc629506666633a4b6743.patch
24+
curl -sLo dep-adios2/ADIOS2-2.10.2/patch.diff https://github.com/franzpoeschel/ADIOS2/commit/9f3bea5d3974578bb40fc629506666633a4b6743.patch
25+
26+
:: Use git-am for applying the patch,
27+
:: for some reason, python -m patch just silently does nothing.
28+
:: git-am requires a Git repository to apply a patch, but the release zip
29+
:: strips away any Git info, so we just quickly initialize a repository.
30+
cd dep-adios2/ADIOS2-2.10.2
31+
git init
32+
git config user.email "tooling@tools.com"
33+
git config user.name "Tooling"
34+
git add .
35+
git commit --message="Initial commit so we can use git-am"
36+
git am patch.diff
37+
cd ..
38+
cd ..
2539

2640
cmake --version
2741

0 commit comments

Comments
 (0)