Merge branch 'master' into quakenet

[irc/quakenet/qwebirc.git] / bin / mkstatic.py

diff --git a/bin/mkstatic.py b/bin/mkstatic.py
old mode 100644 (file)
new mode 100755 (executable)
index ec156df..9955f74
--- a/bin/mkstatic.py
+++ b/bin/mkstatic.py
@@ -9,8 +9,8 @@ def trymkdir(*dir):
 
 def copywalk(src, dest, visitor):
   for root, dirs, files in os.walk(src):
-    if ".hg" in dirs:
-      dirs.remove(".hg")
+    if ".git" in dirs:
+      dirs.remove(".git")
       
     newdir = os.path.join(dest, root)
     if not os.path.exists(newdir):
@@ -62,18 +62,17 @@ def main():
   trymkdir(DEST, "static")
   trymkdir(DEST, "static", "js")
     
-  compile.main(DEST)
+  compile.main(DEST, produce_debug=False)
   
-  for x in "authgate qwebirc simplejson twisted".split(" "):
+  for x in "authgate qwebirc esimplejson twisted".split(" "):
     copypydir(x, DEST)
-  for x in "css images panes sound".split(" "):
+  for x in "images panes sound".split(" "):
     copydir(os.path.join("static", x), DEST)
-    
-  for x in pages.JS_BASE:
-    copy(os.path.join("static", "js", "%s.js" % x), DEST)
+  for x in pages.JS_EXTRA:
+    copy(os.path.join("static", "js", x + ".js"), DEST)
     
   for x in pages.UIs.values():
-    e = x.get("buildextra")
+    e = x.get("extrajs")
     if e is None:
       continue
     for x2 in e:
@@ -83,7 +82,7 @@ def main():
       if not os.path.exists(dir):
         os.mkdir(dir)
       copy(file, DEST)
-  
+      
   copy(os.path.join("static/favicon.ico"), DEST)
   
   if 0:
@@ -101,4 +100,4 @@ def main():
   
 if __name__ == "__main__":
   main()
-  
\ No newline at end of file
+