def jarit(src):
try:
- p = subprocess.Popen(["java", "-jar", "bin/yuicompressor-2.3.5.jar", src], stdout=subprocess.PIPE)
+ p = subprocess.Popen(["java", "-jar", "bin/yuicompressor-2.4.8.jar", src], stdout=subprocess.PIPE)
except Exception, e:
if hasattr(e, "errno") and e.errno == 2:
raise MinifyException, "unable to run java"
return data
JAVA_WARNING_SURPRESSED = False
-def jmerge_files(prefix, suffix, output, files, *args):
+def jmerge_files(prefix, suffix, output, files, *args, **kwargs):
global COPYRIGHT
output = output + "." + suffix
o = os.path.join(prefix, "compiled", output)
f = open(os.path.join(prefix, "static", suffix, output), "wb")
f.write(COPYRIGHT)
+
+ if kwargs.get("file_prefix"):
+ f.write(kwargs.get("file_prefix"))
+
f.write(compiled)
f.close()
for x in files:
f2 = open(root_path(x), "rb")
- f.write(f2.read())
+ f.write(f2.read() + "\n")
f2.close()
f.close()
csssrc = pagegen.csslist(uiname, True)
jmerge_files(outputdir, "css", uiname + "-" + ID, csssrc)
shutil.copy2(os.path.join(outputdir, "static", "css", uiname + "-" + ID + ".css"), os.path.join(outputdir, "static", "css", uiname + ".css"))
+
+ mcssname = os.path.join("css", uiname + ".mcss")
+ if os.path.exists(mcssname):
+ mcssdest = os.path.join(outputdir, "static", "css", uiname + ".mcss")
+ shutil.copy2(mcssname, mcssdest)
+ shutil.copy2(mcssdest, os.path.join(outputdir, "static", "css", uiname + "-" + ID + ".mcss"))
+
#jmerge_files(outputdir, "js", uiname, value["uifiles"], lambda x: os.path.join("js", "ui", "frontends", x + ".js"))
alljs = []
alljs.append(os.path.join("js", y + ".js"))
for y in value["uifiles"]:
alljs.append(os.path.join("js", "ui", "frontends", y + ".js"))
- jmerge_files(outputdir, "js", uiname + "-" + ID, alljs)
+ jmerge_files(outputdir, "js", uiname + "-" + ID, alljs, file_prefix="QWEBIRC_BUILD=\"" + ID + "\";\n")
os.rmdir(coutputdir)