Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
4ab42f7
Start building for Windows
wbarnha Jan 4, 2023
53f2046
install pkgconfig etc before build
wbarnha Jan 4, 2023
add8815
choco install pkgconfiglite
wbarnha Jan 4, 2023
386b805
build uchardet on windows
wbarnha Jan 4, 2023
388dc6c
add dir calls for debug
wbarnha Jan 4, 2023
ea50ea6
add dir calls for debug
wbarnha Jan 4, 2023
369fad1
reuse win32sh code
wbarnha Jan 4, 2023
08c9518
fix formatting
wbarnha Jan 4, 2023
d612646
remove unneeded dir calls
wbarnha Jan 4, 2023
3ee61d5
update paths
wbarnha Jan 4, 2023
8c0a179
allow default install path on windows
wbarnha Jan 4, 2023
6bc1458
Merge branch 'master' into support-windows
wbarnha Jan 4, 2023
22fc9a8
back to the old install prefix
wbarnha Jan 4, 2023
3260a34
Merge branch 'master' into support-windows
wbarnha Jan 13, 2023
3598485
try specifying absolute paths for Windows
wbarnha Jan 13, 2023
e8ac508
try formatting paths differently
wbarnha Jan 13, 2023
97357a3
fix library path
wbarnha Jan 13, 2023
bfdbb25
remove CMAKE_INSTALL_PREFIX
wbarnha Jan 13, 2023
cb8133e
try vcpkg pkgconf
wbarnha Jan 13, 2023
bf3b37c
disable vcpkg env vars?
wbarnha Jan 13, 2023
4a96b21
fix pkgconf typo
wbarnha Jan 13, 2023
931b812
add vcpkg-pkgconfig-get-modules
wbarnha Jan 13, 2023
470801e
pip install pkgconfig?
wbarnha Jan 13, 2023
44ba30e
back to pkgconfiglite i guess
wbarnha Jan 13, 2023
c6211d1
try skipping pkgconfig on Windows
wbarnha Jan 14, 2023
90a4713
revert dumb change
wbarnha Jan 14, 2023
b1bb0d0
Add -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE
wbarnha Jan 14, 2023
3d0f1d1
set BUILD_SHARED_LIBS=OFF
wbarnha Jan 14, 2023
69c6306
build static libs again
wbarnha Jan 14, 2023
9d6a0c6
add extra_compile_args for windows
wbarnha Jan 18, 2023
4b8d212
add compiler_directives
wbarnha Jan 19, 2023
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/build-and-upload-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-11]
os: [ubuntu-latest, macos-11, windows-2019]

steps:
- uses: actions/checkout@v3
Expand Down
8 changes: 7 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,11 @@ before-build = [
before-build = [
"git submodule sync --recursive",
"git submodule update --init --force --recursive --depth=1",
"make pip"
"make pip",
"choco install pkgconfiglite",
'cd {project}\\src\\ext\\uchardet\\ && mkdir build && cd build && cmake .. -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON && make && make install',
]

[tool.cibuildwheel.windows.environment]
INCLUDE_PATH='C:/Program Files (x86)/uchardet/include/uchardet/'
LIBRARY_PATH='C:/Program Files (x86)/uchardet/lib/'
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
os.path.join('src', 'cchardet', '_cchardet.pyx')
],
language='c++',
extra_compile_args=['/d2FH4-'] if sys.platform == 'win32' else [],
**ext_args
)

Expand Down Expand Up @@ -96,5 +97,7 @@ def read(f):
scripts=['bin/cchardetect'],
ext_modules=cythonize([
cchardet_module,
]),
],
compiler_directives={'language_level' : "3"},
),
)