Commit d370faca authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Comply to ASN1SCC v4 argument ordering

parent af39f72a
......@@ -20,15 +20,15 @@ clean:
%.c: %.pr FORCE
$(OPENGEODE) $< system_structure.pr --toC
mono $(ASN1SCC) -c dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn
%.ali: %.pr FORCE
$(OPENGEODE) $< system_structure.pr --toAda
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -gnat2012 -c -g -fprofile-arcs -ftest-coverage *.adb
%.o: %.asn FORCE
mono $(ASN1SCC) -c $< -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal $<
$(CC) -O$(O) -c -g $*.c
%.o: %.c FORCE
......
......@@ -10,13 +10,13 @@ test-parse:
test-ada:
$(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n og.ali
test-c:
$(OPENGEODE) og.pr --toC
mono $(ASN1SCC) -c dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn
$(CC) -O$(O) -c *.c
......@@ -27,8 +27,8 @@ test-llvm:
test-python:
$(OPENGEODE) og.pr --shared
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -gnat2012 -fPIC -c *.adb
$(GNATBIND) -n -Llibog og
$(GNATMAKE) -c -fPIC -gnat2012 b~og.adb
......
......@@ -22,7 +22,7 @@ test-llvm: orchestrator.o
test-python:
$(OPENGEODE) orchestrator.pr system_structure.pr --shared
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -gnat2012 -c *.adb
$(GNATBIND) -n -Lliborchestrator orchestrator
$(GNATMAKE) -c -gnat2012 b~orchestrator.adb
......
......@@ -10,13 +10,13 @@ test-parse:
test-ada:
$(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n car.ali
test-c:
$(OPENGEODE) og.pr --toC
mono $(ASN1SCC) -c dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn
$(CC) -O$(O) -c *.c
......
......@@ -10,13 +10,13 @@ test-parse:
test-ada:
$(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada dataview.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn
$(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n og.ali
test-c:
$(OPENGEODE) og.pr --toC
mono $(ASN1SCC) -c dataview.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview.asn
$(CC) -O$(O) -c *.c
......
......@@ -22,7 +22,7 @@ test-llvm: orchestrator.o
test-python:
$(OPENGEODE) orchestrator.pr system_structure.pr --shared
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -gnat2012 -c *.adb
$(GNATBIND) -n -Lliborchestrator orchestrator
$(GNATMAKE) -c -gnat2012 b~orchestrator.adb
......
......@@ -13,7 +13,7 @@ test-ada:
test-c:
$(OPENGEODE) testsc.pr --toC
mono $(ASN1SCC) -c dataview.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview.asn
$(CC) -O$(O) -c *.c
......
......@@ -10,13 +10,13 @@ test-parse:
test-ada:
$(OPENGEODE) demodevicedsap.pr --toAda
mono $(ASN1SCC) -Ada *.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
$(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n demodevicedsap.ali
test-c:
$(OPENGEODE) demodevicedsap.pr --toC
mono $(ASN1SCC) -c *.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal *.asn
$(CC) -O$(O) -c *.c
......
......@@ -10,13 +10,13 @@ test-parse:
test-ada:
$(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada dataview.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn
$(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n og.ali
test-c:
$(OPENGEODE) og.pr --toC
mono $(ASN1SCC) -c dataview.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview.asn
$(CC) -O$(O) -c *.c
......
......@@ -10,7 +10,7 @@ test-parse:
test-ada:
$(OPENGEODE) test.pr --toAda
mono $(ASN1SCC) -Ada dataview.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn
$(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n test.ali
......@@ -20,7 +20,7 @@ simu:
test-c:
$(OPENGEODE) test.pr --toC
mono $(ASN1SCC) -c dataview.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview.asn
$(CC) -O$(O) -c *.c
......
......@@ -10,13 +10,13 @@ test-parse:
test-ada:
$(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n og.ali
test-c:
$(OPENGEODE) og.pr --toC
mono $(ASN1SCC) -c dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn
$(CC) -O$(O) -c *.c
......
......@@ -17,7 +17,7 @@ test-ada:
[ $(ARCH) == 64 ] && EXTRAFLAG="--target=x86_64-linux" ; \
mkdir -p build && cp *.pr *.asn model_checker.gpr properties build && cd build && \
../../../../opengeode/opengeode.py orchestrator.pr --shared && \
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal && \
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn && \
taste-properties -d -s properties orchestrator.pr && \
taste-asn1-iterators *.asn && gprbuild -Pmodel_checker $$EXTRAFLAG && ./model_checker
......
......@@ -22,7 +22,7 @@ test-llvm: orchestrator.o
test-python:
$(OPENGEODE) orchestrator.pr system_structure.pr --shared
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n -Lliborchestrator orchestrator
$(GNATMAKE) -c b~orchestrator.adb
......
......@@ -10,18 +10,18 @@ test-parse:
test-ada:
$(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada dataview.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn
cp test_ada.ada test_ada.adb && gnat make test_ada.adb && ./test_ada
test-c:
$(OPENGEODE) og.pr --toC
mono $(ASN1SCC) -c dataview.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview.asn
$(CC) -O$(O) -c *.c
test-python:
$(OPENGEODE) og.pr --shared
mono $(ASN1SCC) -Ada dataview.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c dataview.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview.asn
$(GNATMAKE) -O$(O) -gnat2012 -fPIC -c *.adb
$(GNATBIND) -n -Llibog og
$(GNATMAKE) -c -fPIC -gnat2012 b~og.adb
......
......@@ -13,7 +13,7 @@ test-ada:
test-c:
$(OPENGEODE) og.pr --toC
mono $(ASN1SCC) -c dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn
$(CC) -O$(O) -c *.c
......
......@@ -10,13 +10,13 @@ test-parse:
test-ada:
$(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n og.ali
test-c:
$(OPENGEODE) og.pr --toC
mono $(ASN1SCC) -c dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn
$(CC) -O$(O) -c *c
......
......@@ -10,13 +10,13 @@ test-parse:
test-ada:
$(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n og.ali
test-c:
$(OPENGEODE) og.pr --toC
mono $(ASN1SCC) -c dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn
$(CC) -O$(O) -c *.c
......@@ -27,8 +27,8 @@ test-llvm:
test-python:
$(OPENGEODE) og.pr --shared
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -gnat2012 -fPIC -c *.adb
$(GNATBIND) -n -Llibog og
$(GNATMAKE) -c -fPIC -gnat2012 b~og.adb
......
......@@ -10,13 +10,13 @@ test-parse:
test-ada:
$(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n og.ali
test-c:
$(OPENGEODE) og.pr --toC
mono $(ASN1SCC) -c dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn
$(CC) -O$(O) -c *.c
......@@ -27,8 +27,8 @@ test-llvm:
test-python:
$(OPENGEODE) og.pr --shared
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -gnat2012 -fPIC -c *.adb
$(GNATBIND) -n -Llibog og
$(GNATMAKE) -c -fPIC -gnat2012 b~og.adb
......
......@@ -10,13 +10,13 @@ test-parse:
test-ada:
$(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n og.ali
test-c:
$(OPENGEODE) og.pr --toC
mono $(ASN1SCC) -c dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn
$(CC) -O$(O) -c *.c
......@@ -27,8 +27,8 @@ test-llvm:
test-python:
$(OPENGEODE) og.pr --shared
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -gnat2012 -fPIC -c *.adb
$(GNATBIND) -n -Llibog og
$(GNATMAKE) -c -fPIC -gnat2012 b~og.adb
......
......@@ -10,7 +10,7 @@ test-parse:
test-ada: dataview-uniq.o test_ada.o
$(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
$(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n og.ali
$(GNATLINK) -o test_ada test_ada.o dataview-uniq.o og.ali -lgnat
......@@ -18,7 +18,7 @@ test-ada: dataview-uniq.o test_ada.o
test-c:
$(OPENGEODE) og.pr --toC
mono $(ASN1SCC) -c dataview-uniq.asn -typePrefix asn1Scc -equal
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn
$(CC) -O$(O) -c *.c
......
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