Openscad_cl was found to be unecessary as the Python wrapper does the…

… same thing. Openscad.exe has been removed, README.txt now specifies the required version. Stls.py and Sheets.py now use relative include paths. openscad.py now prints the command it is executing.
bjmckenz · Mar 27, 2012 · 069dcdf · 069dcdf
1 parent 750ea16
commit 069dcdf
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/README.txt b/README.txt
@@ -4,6 +4,8 @@ Currently only supports mendel and sturdy machine variants, the huxley version n
 
 Use
 ---
+Add the directory of the OpenScad executable to your search. For Windows OpenSCAD-2012.02 or later is required. For Linux it will need to be OpenScad-2011.12 or later.
+
 To make all the files for a machine run
     make_machine.py machine_name
 

diff --git a/openscad.exe b/openscad.exe
diff --git a/openscad.py b/openscad.py
@@ -1,11 +1,10 @@
 import subprocess
-import os
 
 def run(*args):
-    if os.name == "nt":
-        subprocess.call(["openscad_cl"] + list(args))
-    else:
-        log = open("openscad.log", "w")
-        subprocess.call(["openscad"] + list(args), stdout = log, stderr = log)
-        log.close()
-
+    print "openscad",
+    for arg in args:
+        print arg,
+    print
+    log = open("openscad.log", "w")
+    subprocess.call(["openscad"] + list(args), stdout = log, stderr = log)
+    log.close()
diff --git a/openscad_cl.exe b/openscad_cl.exe
diff --git a/sheets.py b/sheets.py
@@ -44,7 +44,7 @@ def sheets(machine):
                         #
                         dxf_maker_name = target_dir + "/" + module + ".scad"
                         f = open(dxf_maker_name, "w")
-                        f.write("use <%s/%s>\n" % (source_dir, filename))
+                        f.write("use <../../%s/%s>\n" % (source_dir, filename))
                         f.write("%s();\n" % module);
                         f.close()
                         #

diff --git a/stls.py b/stls.py
@@ -40,7 +40,7 @@ def stls(machine, parts = None):
     f.close()
 
     #
-    # Decide which fils to make
+    # Decide which files to make
     #
     if parts:
         targets = list(parts)           #copy the list so we dont modify the list passed in
@@ -66,7 +66,7 @@ def stls(machine, parts = None):
                         #
                         stl_maker_name = source_dir + "/stl.scad"
                         f = open(stl_maker_name, "w")
-                        f.write("use <%s/%s>\n" % (source_dir, filename))
+                        f.write("use <%s>\n" % filename)
                         f.write("%s();\n" % module);
                         f.close()
                         #
-Original file line number
+Diff line change
@@ Expand Up @@
     Use
     ---
+    Add the directory of the OpenScad executable to your search. For Windows OpenSCAD-2012.02 or later is required. For Linux it will need to be OpenScad-2011.12 or later.
     To make all the files for a machine run
         make_machine.py machine_name
@@ Expand Down @@