Fix 'clean' command in script, set mode executable.

configuration.py

@@ -217,7 +217,7 @@ def getenv(self, name):
       return None
 
   def clean(self, expunge=False):
-    for dir in ["tmp", "bin", "lib", "share", "mem", "env"]:
+    for dir in ["tmp", "bin", "lib", "share", "include", "mem", "env"]:
       if self.root_dir.exists(dir):
         shutil.rmtree(self.root_dir.get_disk_path(dir))
 

main.py

@@ -279,11 +279,17 @@ def script(config, argv):
   if filename is None:
     out = sys.stdout
   else:
-    # Write unix-style newlines regardless of host OS.
+    # Binary mode => Write unix-style newlines regardless of host OS.
     out = open(filename, "wb")
 
   builder.write(out)
 
+  if filename is not None:
+    out.close()
+    mask = os.umask(0)
+    os.umask(mask)
+    os.chmod(filename, 0777 & ~mask)
+
 # --------------------------------------------------------------------
 
 def clean(config, argv):

script.py

@@ -62,6 +62,11 @@
 __END__
 }
 
+function die() {
+  echo "$@" >&2
+  exit 1
+}
+
 function eval_assignment() {
   local varname=$(expr "$1" : '\([^=]*\)=.*')
   local value=$(expr "$1" : '[^=]*=\(.*\)')
@@ -113,11 +118,10 @@
   do_build=yes
 fi
 
-# Some helpers.
-function die() {
-  echo "$@" >&2
-  exit 1
-}
+# Clean before we do anything else.
+if test $do_clean = yes; then
+  rm -rf $script_name.cache tmp bin lib share include
+fi
 
 # Read the cache, if present.
 function read_cache() {