Merge branch 'master' of https://github.com/modula3/cm3

modula3 · Jun 5, 2016 · 2dd8754 · 2dd8754
2 parents 72fe0cb + 0f85470
commit 2dd8754
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/m3-sys/m3back/src/M3C.m3 b/m3-sys/m3back/src/M3C.m3
@@ -4775,13 +4775,13 @@ VAR ok1 := TRUE;
 BEGIN
     CASE type OF
         | CGType.Int8   => ok1 := TInt.GE(i, TInt.Min8 );
-                              (*ok2 := TInt.LE(i, TInt.Max8);*)
+                         (*ok2 := TInt.LE(i, TInt.Max8);*)
         | CGType.Int16  => ok1 := TInt.GE(i, TInt.Min16);
-                              (*ok2 := TInt.LE(i, TInt.Max16);*)
+                         (*ok2 := TInt.LE(i, TInt.Max16);*)
         | CGType.Int32  => ok1 := TInt.GE(i, TInt.Min32);
-                              (*ok2 := TInt.LE(i, TInt.Max32);*)
+                         (*ok2 := TInt.LE(i, TInt.Max32);*)
         | CGType.Int64  => ok1 := TInt.GE(i, TInt.Min64);
-                              ok2 := TInt.LE(i, TInt.Max64);
+                           ok2 := TInt.LE(i, TInt.Max64);
         | CGType.Word8  => ok1 := TWord.LE(i, TWord.Max8);
         | CGType.Word16 => ok1 := TWord.LE(i, TWord.Max16);
         | CGType.Word32 => ok1 := TWord.LE(i, TWord.Max32);

diff --git a/scripts/python/capture-boot.py b/scripts/python/capture-boot.py
@@ -2,7 +2,7 @@
 
 import sys, os.path, os, shutil, pylib, uuid
 from os.path import isfile, isdir
-from pylib import *
+from pylib import CopyFile, CreateDirectory
 
 root = sys.argv[1] or "/cm3"
 temp = "cm3temp-" + str(uuid.uuid4()).upper()
@@ -35,7 +35,9 @@ def copy(a):
 
     elif isfile(os.path.join(root, "bin", a + ".exe")):
         a = os.path.join("bin", a + ".exe")
-
+
+    # Take only static libs -- foo.lib for Windows, libfoo.a for Posix,
+    # whichever exists.
     elif isfile(os.path.join(root, "lib", a + ".lib")):
         a = os.path.join("lib", a + ".lib")
 
@@ -56,11 +58,9 @@ def copy(a):
 copy("libm3")
 copy("m3")
 copy("m3core")
-CopyRecursive(os.path.join(root, "bin", "config"),
-              os.path.join(temp, "bin", "config"))
-
-def TarGzip(PackageSetName):
-    MakeArchive(PackageSetName, "tar cfvz", "tar.gz")
+if isdir(os.path.join(root, "bin", "config")):
+    CopyRecursive(os.path.join(root, "bin", "config"),
+                  os.path.join(temp, "bin", "config"))
 
 def Run(a):
     print(a + " in " + os.getcwd())