Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
dmt
Commits
076ae4a3
Commit
076ae4a3
authored
Sep 29, 2019
by
Thanassis Tsiodras
Browse files
asn2aadlPlus now invokes ASN1SCC just once - this is as fast as we can go.
parent
b5954941
Changes
2
Hide whitespace changes
Inline
Side-by-side
dmt/asn2aadlPlus.py
View file @
076ae4a3
...
...
@@ -85,17 +85,13 @@ def calculateForNativeAndASN1SCC(absASN1SCCpath, autosrc, names, inputFiles):
inputASN1files
=
[
x
for
x
in
inputFiles
if
not
x
.
lower
().
endswith
(
'.acn'
)]
# Spawn ASN1SCC.exe compiler - for MacOS define a new sh file calling mono Asn1f2.exe
# if platform.system() == "Windows" or platform.system() == "Darwin":
# mysystem("%s -c -uPER -o \"%s\" %s %s" % (absASN1SCCpath, autosrc, acn, '"' + '" "'.join(inputFiles) + '"'))
# for line in os.popen("%s -AdaUses %s" % (absASN1SCCpath, '" "'.join(inputASN1files))):
# g_AdaPackageNameOfType[line.split(':')[0]] = line.split(':')[1].rstrip()
# else:
# cmd = "mono %s -c -uPER -fp AUTO -typePrefix asn1Scc -o \"%s\" %s %s" % (absASN1SCCpath, autosrc, acn, '"' + '" "'.join(inputFiles) + '"')
# res = mysystem(cmd)
# if res != 0:
# panic("This command failed: %s\n" % cmd)
# for line in os.popen('mono %s -fp AUTO -typePrefix asn1Scc -AdaUses "%s"' % (absASN1SCCpath, '" "'.join(inputASN1files))):
# g_AdaPackageNameOfType[line.split(':')[0]] = line.split(':')[1].rstrip()
if
platform
.
system
()
==
"Windows"
or
platform
.
system
()
==
"Darwin"
:
mysystem
(
"%s -c -uPER -o
\"
%s
\"
%s %s"
%
(
absASN1SCCpath
,
autosrc
,
acn
,
'"'
+
'" "'
.
join
(
inputFiles
)
+
'"'
))
else
:
cmd
=
"mono %s -c -uPER -fp AUTO -typePrefix asn1Scc -o
\"
%s
\"
%s %s"
%
(
absASN1SCCpath
,
autosrc
,
acn
,
'"'
+
'" "'
.
join
(
inputFiles
)
+
'"'
)
res
=
mysystem
(
cmd
)
if
res
!=
0
:
panic
(
"This command failed: %s
\n
"
%
cmd
)
for
asnModuleID
,
setOfTypenames
in
asnParser
.
g_adaUses
.
items
():
for
typeName
in
setOfTypenames
:
g_AdaPackageNameOfType
[
typeName
]
=
asnModuleID
...
...
setup.py
View file @
076ae4a3
...
...
@@ -11,7 +11,7 @@ from setuptools import setup, find_packages
setup
(
name
=
'dmt'
,
version
=
"2.1.4
5
"
,
version
=
"2.1.4
6
"
,
packages
=
find_packages
(),
author
=
'Thanassis Tsiodras'
,
author_email
=
'Thanassis.Tsiodras@esa.int'
,
...
...
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