Compare commits

..

3 Commits

5 changed files with 18 additions and 3 deletions

View File

@@ -40,6 +40,15 @@ jobs:
with: with:
name: wheel-config name: wheel-config
path: python/ path: python/
- name: Get vcpkg repo
if: matrix.os == 'windows-2019'
run: git clone https://github.com/Microsoft/vcpkg.git
- name: Build and install vcpkg and install libiconv for windows
if: matrix.os == 'windows-2019'
run: |
.\vcpkg\bootstrap-vcpkg.bat
vcpkg install libiconv
working-directory: vcpkg/
- name: Build wheels - name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse run: python -m cibuildwheel --output-dir wheelhouse
working-directory: python/ working-directory: python/

View File

@@ -233,3 +233,6 @@ can be found in the `python/examples` folder.
- https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun - https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun
- https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml - https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml
- https://cibuildwheel.readthedocs.io/en/stable/deliver-to-pypi/ - https://cibuildwheel.readthedocs.io/en/stable/deliver-to-pypi/
- https://www.gnu.org/software/libiconv/
- https://vcpkg.io/en/packages.html
- https://vcpkg.io/en/getting-started

View File

@@ -10,8 +10,11 @@ SRC = src/
LIB = lib/ LIB = lib/
PYT = python/ PYT = python/
# list headers # list headers and include directories
HPP = $(wildcard $(LIB)/*.hpp) HPP = $(wildcard $(LIB)/*.hpp)
IPP = $(shell find $(LIB) -type f -name '*.hpp')
KIB = $(shell find $(LIB) -type d)
MIB = $(foreach dir,$(KIB),-I $(dir))
# choose compiler and its options # choose compiler and its options
CC = g++ -std=c++17 CC = g++ -std=c++17
@@ -36,12 +39,12 @@ $(EXE): check-tags $(GVSN) main.o
$(CC) $(OPT) main.o -o $@ $(CC) $(OPT) main.o -o $@
# build main.cpp and include git version/commit tag # build main.cpp and include git version/commit tag
main.o: src/main.cpp $(HPP) main.o: src/main.cpp $(IPP)
@cp $< $<.cpp @cp $< $<.cpp
@sed -i 's/TAGSTRING/$(GTAG)/g' $<.cpp @sed -i 's/TAGSTRING/$(GTAG)/g' $<.cpp
@sed -i 's/HASHSTRING/$(GHSH)/g' $<.cpp @sed -i 's/HASHSTRING/$(GHSH)/g' $<.cpp
@sed -i 's/TIMESTAMPSTRING/$(TMS)/g' $<.cpp @sed -i 's/TIMESTAMPSTRING/$(TMS)/g' $<.cpp
$(CC) -c $(OPT) -I $(LIB) $<.cpp -o $@ $(CC) -c $(OPT) $(MIB) $<.cpp -o $@
@rm $<.cpp @rm $<.cpp
install: $(EXE) install: $(EXE)