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

Adapt Makefiles to new state generated in ASN1

parent 63b7ae59
...@@ -175,6 +175,9 @@ The background pattern was downloaded from www.subtlepatterns.com ...@@ -175,6 +175,9 @@ The background pattern was downloaded from www.subtlepatterns.com
Changelog Changelog
========= =========
**3.3.0 (08/2020)**
- Save the state as an ASN.1 model instead of a native Ada type
**3.2.1 (07/2020)** **3.2.1 (07/2020)**
- Fix issue with the "present" operator - Fix issue with the "present" operator
- Move the context declaration to the .ads - Move the context declaration to the .ads
......
This diff is collapsed.
...@@ -140,7 +140,7 @@ except ImportError: ...@@ -140,7 +140,7 @@ except ImportError:
__all__ = ['opengeode', 'SDL_Scene', 'SDL_View', 'parse'] __all__ = ['opengeode', 'SDL_Scene', 'SDL_View', 'parse']
__version__ = '3.2.1' __version__ = '3.3.0'
if hasattr(sys, 'frozen'): if hasattr(sys, 'frozen'):
# Detect if we are running on Windows (py2exe-generated) # Detect if we are running on Windows (py2exe-generated)
......
...@@ -28,7 +28,7 @@ test-qgen-gt-c: ...@@ -28,7 +28,7 @@ test-qgen-gt-c:
test-ada: test-ada:
#make -f Makefile.og #make -f Makefile.og
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
gnat make titi gnat make titi
test-c: test-c:
......
...@@ -30,7 +30,7 @@ clean: ...@@ -30,7 +30,7 @@ clean:
%.ali: %.pr FORCE %.ali: %.pr FORCE
$(OPENGEODE) $< system_structure.pr --toAda && \ $(OPENGEODE) $< system_structure.pr --toAda && \
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn && \ mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn && \
$(GNATMAKE) -O$(O) -gnat2012 -c -g -fprofile-arcs -ftest-coverage *.adb $(GNATMAKE) -O$(O) -gnat2012 -c -g -fprofile-arcs -ftest-coverage *.adb
%.o: %.asn FORCE %.o: %.asn FORCE
......
...@@ -27,7 +27,7 @@ test-qgen-gt-c: ...@@ -27,7 +27,7 @@ test-qgen-gt-c:
test-ada: test-ada:
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
$(GNATMAKE) -O$(O) -c *.adb $(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n og.ali $(GNATBIND) -n og.ali
......
...@@ -28,7 +28,7 @@ test-qgen-gt-c: ...@@ -28,7 +28,7 @@ test-qgen-gt-c:
test-ada: test-ada:
#make -f Makefile.og #make -f Makefile.og
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
gnat make og gnat make og
test-c: test-c:
......
...@@ -27,7 +27,7 @@ test-qgen-gt-c: ...@@ -27,7 +27,7 @@ test-qgen-gt-c:
test-ada: test-ada:
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
$(GNATMAKE) -O$(O) -c *.adb $(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n car.ali $(GNATBIND) -n car.ali
......
...@@ -28,7 +28,7 @@ test-qgen-gt-c: ...@@ -28,7 +28,7 @@ test-qgen-gt-c:
test-ada: test-ada:
mkdir -p src && cd src && $(OPENGEODE) ../toto.pr -g --toAda && \ mkdir -p src && cd src && $(OPENGEODE) ../toto.pr -g --toAda && \
cp ../test_toto.ada test_toto.adb && \ cp ../test_toto.ada test_toto.adb && \
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal ../dataview.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal ../*.asn *.asn
mkdir -p obj && cd obj && gnat make -O$(O) ../src/test_toto && \ mkdir -p obj && cd obj && gnat make -O$(O) ../src/test_toto && \
./test_toto | diff ../expected - ./test_toto | diff ../expected -
......
...@@ -27,7 +27,7 @@ test-qgen-gt-c: ...@@ -27,7 +27,7 @@ test-qgen-gt-c:
test-ada: test-ada:
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
$(GNATMAKE) -O$(O) -c *.adb $(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n og.ali $(GNATBIND) -n og.ali
......
...@@ -27,7 +27,7 @@ test-parse: ...@@ -27,7 +27,7 @@ test-parse:
test-ada: test-ada:
$(OPENGEODE) orchestrator.pr system_structure.pr --toAda $(OPENGEODE) orchestrator.pr system_structure.pr --toAda
mono $(shell which asn1.exe) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn mono $(shell which asn1.exe) -Ada -typePrefix asn1Scc -equal *.asn
gnat make orchestrator gnat make orchestrator
test-c: test-c:
......
...@@ -4,8 +4,8 @@ mkdir -p testsc_simu ...@@ -4,8 +4,8 @@ mkdir -p testsc_simu
cp testsc.pr dataview.asn testsc_simu cp testsc.pr dataview.asn testsc_simu
cd testsc_simu cd testsc_simu
opengeode testsc.pr --shared opengeode testsc.pr --shared
cat dataview.asn >> dataview-uniq.asn cat *.asn > dataview-uniq.asn
mono $(which asn1.exe) -Ada -typePrefix asn1Scc -equal dataview.asn mono $(which asn1.exe) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn
mono $(which asn1.exe) -c -typePrefix asn1Scc -equal dataview.asn mono $(which asn1.exe) -c -typePrefix asn1Scc -equal dataview.asn
gnatmake -gnat2012 -fPIC -c *.adb gnatmake -gnat2012 -fPIC -c *.adb
gnatbind -n -Llibtestsc testsc gnatbind -n -Llibtestsc testsc
......
...@@ -27,7 +27,7 @@ test-qgen-gt-c: ...@@ -27,7 +27,7 @@ test-qgen-gt-c:
test-ada: test-ada:
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
$(GNATMAKE) -O$(O) -c *.adb $(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n og.ali $(GNATBIND) -n og.ali
......
...@@ -27,7 +27,7 @@ test-qgen-gt-c: ...@@ -27,7 +27,7 @@ test-qgen-gt-c:
test-ada: test-ada:
$(OPENGEODE) test.pr --toAda $(OPENGEODE) test.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
$(GNATMAKE) -O$(O) -c *.adb $(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n test.ali $(GNATBIND) -n test.ali
......
...@@ -27,7 +27,7 @@ test-qgen-gt-c: ...@@ -27,7 +27,7 @@ test-qgen-gt-c:
test-ada: test-ada:
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
$(GNATMAKE) -O$(O) -c *.adb $(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n og.ali $(GNATBIND) -n og.ali
......
...@@ -28,7 +28,7 @@ test-qgen-gt-c: ...@@ -28,7 +28,7 @@ test-qgen-gt-c:
test-ada: test-ada:
#make -f Makefile.og #make -f Makefile.og
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
gnat make og gnat make og
......
...@@ -36,7 +36,7 @@ test-ada: ...@@ -36,7 +36,7 @@ test-ada:
#[ $(ARCH) == 64 ] && EXTRAFLAG="--target=x86_64-linux" ; #[ $(ARCH) == 64 ] && EXTRAFLAG="--target=x86_64-linux" ;
mkdir -p build && cp *.pr *.asn model_checker.gpr properties build && cd build && \ mkdir -p build && cp *.pr *.asn model_checker.gpr properties build && cd build && \
$(OPENGEODE) orchestrator.pr --shared && \ $(OPENGEODE) orchestrator.pr --shared && \
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn && \ mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn && \
taste-properties -d -s properties orchestrator.pr && \ taste-properties -d -s properties orchestrator.pr && \
taste-asn1-iterators *.asn && \ taste-asn1-iterators *.asn && \
ADA_PROJECT_PATH=~/.local/share/gpr:${ADA_PROJECT_PATH} gprbuild -Pmodel_checker && ./model_checker ADA_PROJECT_PATH=~/.local/share/gpr:${ADA_PROJECT_PATH} gprbuild -Pmodel_checker && ./model_checker
......
...@@ -28,12 +28,12 @@ test-qgen-gt-c: ...@@ -28,12 +28,12 @@ test-qgen-gt-c:
test-ada: test-ada:
#make -f Makefile.og #make -f Makefile.og
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview-uniq.asn og_newtypes.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
gnat make og gnat make og
test-c: test-c:
$(OPENGEODE) og.pr --toC $(OPENGEODE) og.pr --toC
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview-uniq.asn og_newtypes.asn mono $(ASN1SCC) -c -typePrefix asn1Scc -equal *.asn
$(CC) -O$(O) -c *.c $(CC) -O$(O) -c *.c
......
...@@ -27,6 +27,7 @@ test-qgen-gt-c: ...@@ -27,6 +27,7 @@ test-qgen-gt-c:
test-ada: test-ada:
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
$(GNATMAKE) -O$(O) -c *.adb $(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n og.ali $(GNATBIND) -n og.ali
......
...@@ -27,7 +27,7 @@ test-qgen-gt-c: ...@@ -27,7 +27,7 @@ test-qgen-gt-c:
test-ada: test-ada:
$(OPENGEODE) og.pr --toAda $(OPENGEODE) og.pr --toAda
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
cp test_ada.ada test_ada.adb && gnat make test_ada.adb -g && ./test_ada cp test_ada.ada test_ada.adb && gnat make test_ada.adb -g && ./test_ada
test-c: test-c:
...@@ -37,7 +37,7 @@ test-c: ...@@ -37,7 +37,7 @@ test-c:
test-python: test-python:
$(OPENGEODE) og.pr --shared $(OPENGEODE) og.pr --shared
mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal dataview.asn mono $(ASN1SCC) -Ada -typePrefix asn1Scc -equal *.asn
mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview.asn mono $(ASN1SCC) -c -typePrefix asn1Scc -equal dataview.asn
$(GNATMAKE) -O$(O) -gnat2012 -fPIC -c *.adb $(GNATMAKE) -O$(O) -gnat2012 -fPIC -c *.adb
$(GNATBIND) -n -Llibog og $(GNATBIND) -n -Llibog og
......
Supports Markdown
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