Merge branch 'yentl' into new-sccd

scripts/compile.py

@@ -15,10 +15,15 @@ def do_compile(address, filename, username, modulename, mode):
     return 0
 
 if __name__ == "__main__":
-    address = sys.argv[1]
-    filename = sys.argv[2]
-    username = sys.argv[3]
-    modulename = sys.argv[4]
-    mode = sys.argv[5]
-    
-    sys.exit(do_compile(address, filename, username, modulename, mode))
+    if len(sys.argv) != 6:
+        sys.stderr.write("Expected different parameters!\n")
+        sys.stderr.write("    %s address filename username modulename mode\n" % sys.argv[0])
+        sys.exit(1)
+    else:
+        address = sys.argv[1]
+        filename = sys.argv[2]
+        username = sys.argv[3]
+        modulename = sys.argv[4]
+        mode = sys.argv[5]
+        
+        sys.exit(do_compile(address, filename, username, modulename, mode))

scripts/link_and_load.py

@@ -9,9 +9,13 @@ def link_and_load(address, username, objs, fast):
     link(address, username, objs, fast)
 
 if __name__ == "__main__":
-    address = sys.argv[1]
-    username = sys.argv[2]
-    objs = [arg for arg in sys.argv[3:] if arg != "--fast"]
-    fast = "--fast" in sys.argv[3:]
+    if len(sys.argv) < 4:
+        sys.stderr.write("Expected different parameters!\n")
+        sys.stderr.write("    %s address username [files]*\n")
+    else:
+        address = sys.argv[1]
+        username = sys.argv[2]
+        objs = [arg for arg in sys.argv[3:] if arg != "--fast"]
+        fast = "--fast" in sys.argv[3:]
 
-    link_and_load(address, username, objs, fast)
+        link_and_load(address, username, objs, fast)

scripts/make_all.py

@@ -5,11 +5,16 @@ from link_and_load import link_and_load
 import random
 import glob
 
-address = sys.argv[1]
-username = sys.argv[2]
-files = [a.replace("\\", "/") for a in sum([glob.glob(f) for f in sys.argv[3:]], [])]
+if __name__ == "__main__":
+    if len(sys.argv) < 4:
+        sys.stderr.write("Expected different parameters!\n")
+        sys.stderr.write("    %s address username [file]*\n")
+    else:
+        address = sys.argv[1]
+        username = sys.argv[2]
+        files = [a.replace("\\", "/") for a in sum([glob.glob(f) for f in sys.argv[3:]], [])]
 
-for f in files:
-    do_compile(address, f, str(random.random()), f, "CO")
+        for f in files:
+            do_compile(address, f, str(random.random()), f, "CO")
 
-link_and_load(address, username, files, False)
+        link_and_load(address, username, files, False)

scripts/make_parallel.py

@@ -6,6 +6,11 @@ import random
 import multiprocessing
 import glob
 
+if len(sys.argv) < 4:
+    sys.stderr.write("Expected different parameters!\n")
+    sys.stderr.write("    %s address username [file]*\n" % sys.argv[0])
+    sys.exit(1)
+
 address = sys.argv[1]
 username = sys.argv[2]
 files = [a.replace("\\", "/") for a in sum([glob.glob(f) for f in sys.argv[3:]], [])]

scripts/prompt.py

@@ -5,10 +5,16 @@ import subprocess
 import os
 
 def local_print(string):
-    print("\033[92m%s\033[0m" % string)
+    if os.name == "posix":
+        # Nicer colour output when using posix (and thus supporting colour)
+        string = "\033[92m%s\033[0m" % string
+    print(string)
 
 def remote_print(string):
-    print("\033[94m%s\033[0m" % string)
+    if os.name == "posix":
+        # Nicer colour output when using posix (and thus supporting colour)
+        string = "\033[94m%s\033[0m" % string
+    print(string)
 
 local_print("Welcome to the local shell!")
 local_print("Please specify Modelverse location (default: localhost:8001)")

scripts/run_local_modelverse.py

@@ -2,5 +2,9 @@ import subprocess
 import sys
 
 # sys.executable to use the same Python interpreter used to invoke this command
-subprocess.check_call([sys.executable, "-m", "sccd.compiler.sccdc", "-p", "threads", "server.xml"], cwd="hybrid_server")
-subprocess.call([sys.executable, "run_mvk_server.py", sys.argv[1]], cwd="hybrid_server")
+if len(sys.argv) != 2:
+    sys.stderr.write("Expected different parameters!\n")
+    sys.stderr.write("    %s port\n" % sys.argv[0])
+else:
+    subprocess.check_call([sys.executable, "-m", "sccd.compiler.sccdc", "-p", "threads", "server.xml"], cwd="hybrid_server")
+    subprocess.call([sys.executable, "run_mvk_server.py", sys.argv[1]], cwd="hybrid_server")