diff --git a/cython/setup.py b/cython/setup.py index 7168f2f..643889b 100644 --- a/cython/setup.py +++ b/cython/setup.py @@ -10,7 +10,8 @@ extensions = Extension( # library_dirs=["lib"], include_dirs=["lib","3rdparty/pugixml"], language='c++', - extra_compile_args=['-std=c++17','-Wno-unused-variable'], + #extra_compile_args=['-std=c++17','-Wno-unused-variable'], + extra_compile_args=['-std=c++17'], extra_link_args=['-std=c++17'], ) diff --git a/makefile b/makefile index c58c10d..4a32fde 100644 --- a/makefile +++ b/makefile @@ -21,7 +21,10 @@ LIB := $(foreach dir,$(shell ls $(LIBB)),-I $(LIBB)$(dir)) # determine git version/commit tag GTAG := $(shell git tag | tail -n1) +GTAGV := $(shell git tag | tail -n1 | tr -d 'v') GHSH := $(shell git rev-parse HEAD | head -c8) +PIPYVS := $(shell grep "version" pip/setup.py | tr -d 'version=",# ') +PICGVS := $(shell grep "version" pip/setup.cfg | tr -d 'version=",# ') # define install location INST := /usr/local/bin @@ -30,6 +33,18 @@ INST := /usr/local/bin OST := $(shell uname) CWD := $(shell pwd) +# --------------------------------------------------------------------------- # +# version/tag check + +checkversion: + @echo "git tag: "$(GTAG) + @echo "git head: "$(GHSH) + @echo "pip setup.py version: "$(PIPYVS) + @echo "pip setup.cfg version: "$(PICGVS) + +$(GTAGV): + @echo "check consistent versions (git tag vs. setup.py): "$(GTAG)" <-> "$(PIPYVS)" " + # --------------------------------------------------------------------------- # # CLI tool @@ -116,7 +131,7 @@ docker-clean: # --------------------------------------------------------------------------- # # pip -pip-publish: cython-build +pip-publish: $(PIPYVS) cython-build cd pip/ && make pip-publish pip-test: diff --git a/pip/setup.cfg b/pip/setup.cfg index 421e933..44ba71f 100644 --- a/pip/setup.cfg +++ b/pip/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = TDMtermite-RecordEvolution -version = 0.5 +version = 1.0.1 author = Record Evolution GmbH author_email = mario.fink@record-evolution.de maintainer = Record Evolution GmbH diff --git a/pip/setup.py b/pip/setup.py index d121c12..63a2743 100644 --- a/pip/setup.py +++ b/pip/setup.py @@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh: setup( name="TDMtermite", - version="1.0.0", #version, + version="1.0.1", #version, author="Record Evolution GmbH", author_email="mario.fink@record-evolution.de", maintainer="Record Evolution GmbH", @@ -30,7 +30,8 @@ setup( # include_dirs=["3rdparty/pugixml/","lib/"], # depends=["../lib/tdm_termite.hpp"] language='c++', - extra_compile_args=['-std=c++17','-Wno-unused-variable'], + #extra_compile_args=['-std=c++17','-Wno-unused-variable'], + extra_compile_args=['-std=c++17'], extra_link_args=['-std=c++17'], )], )