Merge.

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

diff --git a/bin/compile.py b/bin/compile.py
index e5fb0c2b5a197ab65ba797d30bdd2b625753b98e..da2e1982aee0dda8106a4c525201ace54e088ed1 100644 (file)
--- a/bin/compile.py
+++ b/bin/compile.py
@@ -11,7 +11,7 @@ class MinifyException(Exception):
   
 def jarit(src):
   try:
-    p = subprocess.Popen(["java", "-jar", "bin/yuicompressor-2.4.2.jar", src], stdout=subprocess.PIPE, shell=os.name == "nt")
+    p = subprocess.Popen(["java", "-jar", "bin/yuicompressor-2.4.8.jar", src], stdout=subprocess.PIPE, shell=os.name == "nt")
   except Exception, e:
     if hasattr(e, "errno") and e.errno == 2:
       raise MinifyException, "unable to run java"
@@ -61,6 +61,8 @@ def merge_files(output, files, root_path=lambda x: x):
   f = open(output, "wb")
 
   for x in files:
+    if x.startswith("//"):
+      continue
     f2 = open(root_path(x), "rb")
     f.write(f2.read() + "\n")
     f2.close()
@@ -139,4 +141,4 @@ def vcheck():
   
 if __name__ == "__main__":
   main()
-  
\ No newline at end of file
+