Commit 02c69a09 authored by Thanassis Tsiodras's avatar Thanassis Tsiodras

Merge remote-tracking branch 'esa-DMT/master'

parents f8367877 8275dfbc
......@@ -148,7 +148,7 @@ ASN2DATAMODEL:=asn2dataModel
GRAMMAR := %(origGrammarBase)s
BASEGRAMMAR := %(base)s
BDIR:= .
OBJ := $(BDIR)/$(GRAMMAR).o $(BDIR)/asn1crt.o $(BDIR)/real.o $(BDIR)/acn.o $(BDIR)/ber.o $(BDIR)/xer.o $(BDIR)/$(BASEGRAMMAR)_getset.o
OBJ := $(BDIR)/$(GRAMMAR).o $(BDIR)/asn1crt.o $(BDIR)/real.o $(BDIR)/acn.o $(BDIR)/$(BASEGRAMMAR)_getset.o
all: $(BDIR)/$(BASEGRAMMAR)_getset.so $(BDIR)/DV.py
......@@ -156,7 +156,7 @@ $(BDIR)/$(GRAMMAR)_getset.c: $(GRAMMAR).asn
%(tab)smkdir -p $(BDIR)
%(tab)s$(ASN2DATAMODEL) -toPython -o $(BDIR) $<
$(BDIR)/asn1crt.c $(BDIR)/$(GRAMMAR).c $(BDIR)/real.c $(BDIR)/acn.c $(BDIR)/ber.c $(BDIR)/xer.c $(BDIR)/$(GRAMMAR).h $(BDIR)/asn1crt.h: $(GRAMMAR).asn
$(BDIR)/asn1crt.c $(BDIR)/$(GRAMMAR).c $(BDIR)/real.c $(BDIR)/acn.c $(BDIR)/$(GRAMMAR).h $(BDIR)/asn1crt.h: $(GRAMMAR).asn
%(tab)sif [ ! -f "$(GRAMMAR).acn" ] ; then %(mono)s$(ASN1SCC) -ACND -o $(BDIR) $< ; fi
%(tab)s%(mono)s$(ASN1SCC) -ACN -c -uPER -equal -wordSize 8 -o $(BDIR) $< $(GRAMMAR).acn
......@@ -171,7 +171,7 @@ $(BDIR)/$(BASEGRAMMAR)_getset.so: ${OBJ}
%(tab)sgcc -g -fPIC -shared `python-config --ldflags` -o $@ $^
clean:
%(tab)srm -f $(BDIR)/asn1crt.? $(BDIR)/real.? $(BDIR)/$(GRAMMAR).? $(BDIR)/acn.? $(BDIR)/ber.? $(BDIR)/xer.?
%(tab)srm -f $(BDIR)/asn1crt.? $(BDIR)/real.? $(BDIR)/$(GRAMMAR).? $(BDIR)/acn.?
%(tab)srm -f $(BDIR)/DV.py $(BDIR)/*.pyc $(BDIR)/$(BASEGRAMMAR)_getset.? $(BDIR)/$(BASEGRAMMAR)_getset.so
%(tab)srm -f $(BDIR)/$(GRAMMAR)_asn.py
'''
......
......@@ -15,7 +15,9 @@ from . import verify
from . import recursiveMapper
from . import cleanupNodes
__version__ = "2.1.1"
import pkg_resources # pragma: no cover
__version__ = pkg_resources.require("dmt")[0].version # pragma: no cover
def print_version() -> None:
print("TASTE Data Modelling Tools version {}\n\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment