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

Use mono when calling msc2py.exe

parent 38c3f176
...@@ -34,6 +34,7 @@ LICENSE: LGPL - see LICENSE file ...@@ -34,6 +34,7 @@ LICENSE: LGPL - see LICENSE file
CHANGELOG: CHANGELOG:
1.6.2 - Use mono prefix to call msc2py.exe
1.6.1 - Fix messages that did not appear on the GUI if received too fast 1.6.1 - Fix messages that did not appear on the GUI if received too fast
1.6.0 - Fix autoscrolling in MSC streaming scenes 1.6.0 - Fix autoscrolling in MSC streaming scenes
1.5.8 - Fix in Scenario.py used in MSCtoPython handlers 1.5.8 - Fix in Scenario.py used in MSCtoPython handlers
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
__author__ = "Maxime Perrotin" __author__ = "Maxime Perrotin"
__license__ = "LGPLv3" __license__ = "LGPLv3"
__version__ = "1.6.1" __version__ = "1.6.2"
__url__ = "http://taste.tuxfamily.org" __url__ = "http://taste.tuxfamily.org"
import sys import sys
......
...@@ -18,6 +18,7 @@ import os ...@@ -18,6 +18,7 @@ import os
import sys import sys
import subprocess import subprocess
from time import strftime from time import strftime
import distutils.spawn as spawn
from multiprocessing import Process, Pipe from multiprocessing import Process, Pipe
from PySide.QtGui import(QFileDialog, QGraphicsView, QDockWidget, QMessageBox, from PySide.QtGui import(QFileDialog, QGraphicsView, QDockWidget, QMessageBox,
...@@ -278,10 +279,15 @@ endmscdocument; ...@@ -278,10 +279,15 @@ endmscdocument;
py_script_name = os.path.basename(script)[:-3] py_script_name = os.path.basename(script)[:-3]
if selected_msc is not None: if selected_msc is not None:
path_to_mono = spawn.find_executable('mono')
path_to_msc2py = spawn.find_executable('msc2py.exe')
if not path_to_mono or not path_to_msc2py:
raise TypeErorr('"mono" or "msc2py.exe" not found in path.')
py_script_name = os.path.basename(selected_msc[:-4]) py_script_name = os.path.basename(selected_msc[:-4])
self.log.info('Converting MSC script ' self.log.info('Converting MSC script '
+ selected_msc + ' to Python') + selected_msc + ' to Python')
commandline = ['msc2py.exe', commandline = [path_to_mono, path_to_msc2py,
'-i', os.path.abspath(self.ivpath), '-i', os.path.abspath(self.ivpath),
'-a', 'dataview-uniq.asn', '-a', 'dataview-uniq.asn',
'-p', py_script_name + '.py', '-p', py_script_name + '.py',
......
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