mario/TDMtermite
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* check versions vs. git tags

Browse Source 
* neglect -Wunused-variable for MSVC compiler
This commit is contained in:
Mario Fink 2021-06-10 13:27:40 +02:00
parent 3c72747def
commit 1e2b344104
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cython/setup.py
View File

@ -10,7 +10,8 @@ extensions = Extension(
# library_dirs=["lib"], # library_dirs=["lib"],
include_dirs=["lib","3rdparty/pugixml"], include_dirs=["lib","3rdparty/pugixml"],
language='c++', 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'], extra_link_args=['-std=c++17'],
) )

17
makefile
View File

@ -21,7 +21,10 @@ LIB := $(foreach dir,$(shell ls $(LIBB)),-I $(LIBB)$(dir))
# determine git version/commit tag # determine git version/commit tag
GTAG := $(shell git tag | tail -n1) GTAG := $(shell git tag | tail -n1)
GTAGV := $(shell git tag | tail -n1 | tr -d 'v')
GHSH := $(shell git rev-parse HEAD | head -c8) 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 # define install location
INST := /usr/local/bin INST := /usr/local/bin
@ -30,6 +33,18 @@ INST := /usr/local/bin
OST := $(shell uname) OST := $(shell uname)
CWD := $(shell pwd) 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 # CLI tool
@ -116,7 +131,7 @@ docker-clean:
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# pip # pip
pip-publish: cython-build pip-publish: $(PIPYVS) cython-build
cd pip/ && make pip-publish cd pip/ && make pip-publish
pip-test: pip-test:

2
pip/setup.cfg
View File

@ -1,6 +1,6 @@
[metadata] [metadata]
name = TDMtermite-RecordEvolution name = TDMtermite-RecordEvolution
version = 0.5 version = 1.0.1
author = Record Evolution GmbH author = Record Evolution GmbH
author_email = mario.fink@record-evolution.de author_email = mario.fink@record-evolution.de
maintainer = Record Evolution GmbH maintainer = Record Evolution GmbH

5
pip/setup.py
View File

@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
setup( setup(
name="TDMtermite", name="TDMtermite",
version="1.0.0", #version, version="1.0.1", #version,
author="Record Evolution GmbH", author="Record Evolution GmbH",
author_email="mario.fink@record-evolution.de", author_email="mario.fink@record-evolution.de",
maintainer="Record Evolution GmbH", maintainer="Record Evolution GmbH",
@ -30,7 +30,8 @@ setup(
# include_dirs=["3rdparty/pugixml/","lib/"], # include_dirs=["3rdparty/pugixml/","lib/"],
# depends=["../lib/tdm_termite.hpp"] # depends=["../lib/tdm_termite.hpp"]
language='c++', 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'], extra_link_args=['-std=c++17'],
)], )],
) )