Skip to content

Revert "Fix wrong install path for bz2.dll by patching Google's bzip2… #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2025
Merged

Revert "Fix wrong install path for bz2.dll by patching Google's bzip2… #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/windows-cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Apply patch
shell: bash
run: |
cp -r patch/bzip2.patch patch/ortools patch/patch.py patch/patch_utils.py patch/cmake_patches .
cp -r patch/ortools patch/patch.py patch/patch_utils.py patch/cmake_patches .
python patch.py

- name: Set-up Xpress with pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
- name: Apply patch
shell: bash
run: |
cp -r patch/bzip2.patch patch/ortools patch/patch.py patch/patch_utils.py patch/cmake_patches .
cp -r patch/ortools patch/patch.py patch/patch_utils.py patch/cmake_patches .
python patch.py

- name: Set-up Xpress with pip
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ FetchContent_Declare(ortools
GIT_REPOSITORY ${ortools_REPO}
GIT_TAG ${ortools_REF}
PATCH_COMMAND cp -rf
${CMAKE_CURRENT_SOURCE_DIR}/bzip2.patch
${CMAKE_CURRENT_SOURCE_DIR}/patch.py
${CMAKE_CURRENT_SOURCE_DIR}/patch_utils.py
${CMAKE_CURRENT_SOURCE_DIR}/ortools
Expand Down
174 changes: 0 additions & 174 deletions bzip2.patch
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from pathlib import Path
from typing import List
from patch_utils import *
from shutil import copyfile

with open('Version.txt', 'r') as f:
data = f.readlines()
Expand All @@ -13,10 +12,6 @@
additions: List[Addition] = []
replacements: List[Addition] = []

# Fix bzip2's install paths (DLL in Windows)
if newer_than_v9_13: # bzip2 was introduced as a dependency in v9.13
copyfile(Path.cwd()/'bzip2.patch', Path.cwd()/'patches'/'bzip2.patch')

# add the USE_SIRIUS configuration flag in CMakeLists.txt
additions.append(Addition(
Path.cwd()/'CMakeLists.txt',
Expand Down