Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
OpenGEODE
Commits
e6bf4663
Commit
e6bf4663
authored
Aug 18, 2020
by
Maxime Perrotin
Browse files
Adapt Makefiles to new state generated in ASN1
parent
63b7ae59
Changes
38
Expand all
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
e6bf4663
...
...
@@ -175,6 +175,9 @@ The background pattern was downloaded from www.subtlepatterns.com
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)**
-
Fix issue with the "present" operator
-
Move the context declaration to the .ads
...
...
opengeode/AdaGenerator.py
View file @
e6bf4663
This diff is collapsed.
Click to expand it.
opengeode/opengeode.py
View file @
e6bf4663
...
...
@@ -140,7 +140,7 @@ except ImportError:
__all__
=
[
'opengeode'
,
'SDL_Scene'
,
'SDL_View'
,
'parse'
]
__version__
=
'3.
2.1
'
__version__
=
'3.
3.0
'
if
hasattr
(
sys
,
'frozen'
):
# Detect if we are running on Windows (py2exe-generated)
...
...
tests/testsuite/procedurecall/Makefile
View file @
e6bf4663
...
...
@@ -28,7 +28,7 @@ test-qgen-gt-c:
test-ada
:
#make -f Makefile.og
$(OPENGEODE)
og.pr
--toAda
mono
$(ASN1SCC)
-Ada
-typePrefix
asn1Scc
-equal
dataview
.asn
mono
$(ASN1SCC)
-Ada
-typePrefix
asn1Scc
-equal
*
.asn
gnat make titi
test-c
:
...
...
tests/testsuite/shared.mk
View file @
e6bf4663
...
...
@@ -30,7 +30,7 @@ clean:
%.ali
:
%.pr FORCE
$(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
%.o
:
%.asn FORCE
...
...
tests/testsuite/test-aggregation2/Makefile
View file @
e6bf4663
...
...
@@ -27,7 +27,7 @@ test-qgen-gt-c:
test-ada
:
$(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
$(GNATBIND)
-n
og.ali
...
...
tests/testsuite/test-append/Makefile
View file @
e6bf4663
...
...
@@ -28,7 +28,7 @@ test-qgen-gt-c:
test-ada
:
#make -f Makefile.og
$(OPENGEODE)
og.pr
--toAda
mono
$(ASN1SCC)
-Ada
-typePrefix
asn1Scc
-equal
dataview-uniq
.asn
mono
$(ASN1SCC)
-Ada
-typePrefix
asn1Scc
-equal
*
.asn
gnat make og
test-c
:
...
...
tests/testsuite/test-battery/Makefile
View file @
e6bf4663
...
...
@@ -27,7 +27,7 @@ test-qgen-gt-c:
test-ada
:
$(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
$(GNATBIND)
-n
car.ali
...
...
tests/testsuite/test-choice-determinant/Makefile
View file @
e6bf4663
...
...
@@ -28,7 +28,7 @@ test-qgen-gt-c:
test-ada
:
mkdir
-p
src
&&
cd
src
&&
$(OPENGEODE)
../toto.pr
-g
--toAda
&&
\
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
&&
\
./test_toto | diff ../expected -
...
...
tests/testsuite/test-choice/Makefile
View file @
e6bf4663
...
...
@@ -27,7 +27,7 @@ test-qgen-gt-c:
test-ada
:
$(OPENGEODE)
og.pr
--toAda
mono
$(ASN1SCC)
-Ada
-typePrefix
asn1Scc
-equal
dataview
.asn
mono
$(ASN1SCC)
-Ada
-typePrefix
asn1Scc
-equal
*
.asn
$(GNATMAKE)
-O
$(O)
-c
*
.adb
$(GNATBIND)
-n
og.ali
...
...
tests/testsuite/test-demotaste/Makefile
View file @
e6bf4663
...
...
@@ -27,7 +27,7 @@ test-parse:
test-ada
:
$(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
test-c
:
...
...
tests/testsuite/test-eds1/check_simulation.sh
View file @
e6bf4663
...
...
@@ -4,8 +4,8 @@ mkdir -p testsc_simu
cp
testsc.pr dataview.asn testsc_simu
cd
testsc_simu
opengeode testsc.pr
--shared
cat
dataview
.asn
>
>
dataview-uniq.asn
mono
$(
which asn1.exe
)
-Ada
-typePrefix
asn1Scc
-equal
dataview.asn
cat
*
.asn
>
dataview-uniq.asn
mono
$(
which asn1.exe
)
-Ada
-typePrefix
asn1Scc
-equal
dataview
-uniq
.asn
mono
$(
which asn1.exe
)
-c
-typePrefix
asn1Scc
-equal
dataview.asn
gnatmake
-gnat2012
-fPIC
-c
*
.adb
gnatbind
-n
-Llibtestsc
testsc
...
...
tests/testsuite/test-emptysequence/Makefile
View file @
e6bf4663
...
...
@@ -27,7 +27,7 @@ test-qgen-gt-c:
test-ada
:
$(OPENGEODE)
og.pr
--toAda
mono
$(ASN1SCC)
-Ada
-typePrefix
asn1Scc
-equal
dataview
.asn
mono
$(ASN1SCC)
-Ada
-typePrefix
asn1Scc
-equal
*
.asn
$(GNATMAKE)
-O
$(O)
-c
*
.adb
$(GNATBIND)
-n
og.ali
...
...
tests/testsuite/test-emptysequence2/Makefile
View file @
e6bf4663
...
...
@@ -27,7 +27,7 @@ test-qgen-gt-c:
test-ada
:
$(OPENGEODE)
test.pr
--toAda
mono
$(ASN1SCC)
-Ada
-typePrefix
asn1Scc
-equal
dataview
.asn
mono
$(ASN1SCC)
-Ada
-typePrefix
asn1Scc
-equal
*
.asn
$(GNATMAKE)
-O
$(O)
-c
*
.adb
$(GNATBIND)
-n
test.ali
...
...
tests/testsuite/test-forloop/Makefile
View file @
e6bf4663
...
...
@@ -27,7 +27,7 @@ test-qgen-gt-c:
test-ada
:
$(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
$(GNATBIND)
-n
og.ali
...
...
tests/testsuite/test-in-expression/Makefile
View file @
e6bf4663
...
...
@@ -28,7 +28,7 @@ test-qgen-gt-c:
test-ada
:
#make -f Makefile.og
$(OPENGEODE)
og.pr
--toAda
mono
$(ASN1SCC)
-Ada
-typePrefix
asn1Scc
-equal
dataview-uniq
.asn
mono
$(ASN1SCC)
-Ada
-typePrefix
asn1Scc
-equal
*
.asn
gnat make og
...
...
tests/testsuite/test-iterators/Makefile
View file @
e6bf4663
...
...
@@ -36,7 +36,7 @@ test-ada:
#[
$(ARCH)
==
64
]
&&
EXTRAFLAG
=
"--target=x86_64-linux"
;
mkdir
-p
build
&&
cp
*
.pr
*
.asn model_checker.gpr properties build
&&
cd
build
&&
\
$(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-asn1-iterators
*
.asn
&&
\
ADA_PROJECT_PATH
=
~/.local/share/gpr:
${ADA_PROJECT_PATH}
gprbuild
-Pmodel_checker
&&
./model_checker
...
...
tests/testsuite/test-newtype/Makefile
View file @
e6bf4663
...
...
@@ -28,12 +28,12 @@ test-qgen-gt-c:
test-ada
:
#make -f Makefile.og
$(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
test-c
:
$(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
...
...
tests/testsuite/test-noparam/Makefile
View file @
e6bf4663
...
...
@@ -27,6 +27,7 @@ test-qgen-gt-c:
test-ada
:
$(OPENGEODE)
og.pr
--toAda
mono
$(ASN1SCC)
-Ada
-typePrefix
asn1Scc
-equal
*
.asn
$(GNATMAKE)
-O
$(O)
-c
*
.adb
$(GNATBIND)
-n
og.ali
...
...
tests/testsuite/test-optionalfield/Makefile
View file @
e6bf4663
...
...
@@ -27,7 +27,7 @@ test-qgen-gt-c:
test-ada
:
$(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
test-c
:
...
...
@@ -37,7 +37,7 @@ test-c:
test-python
:
$(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
$(GNATMAKE)
-O
$(O)
-gnat2012
-fPIC
-c
*
.adb
$(GNATBIND)
-n
-Llibog
og
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment