X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/blobdiff_plain/f2c48132bd683ba824c7ce121b34855001af035e..614427b2e93b5c465191ab0fba50d70fb652b00c:/bin/pagegen.py
diff --git a/bin/pagegen.py b/bin/pagegen.py
index 7597e2f..b05cd6e 100755
--- a/bin/pagegen.py
+++ b/bin/pagegen.py
@@ -1,53 +1,56 @@
import os, sys, pages, subprocess, re, optionsgen, config
-class HGException(Exception):
+class GitException(Exception):
pass
def jslist(name, debug):
ui = pages.UIs[name]
if debug:
x = [pages.JS_DEBUG_BASE, ui.get("extra", []), pages.DEBUG, ["debug/ui/frontends/%s" % y for y in ui["uifiles"]]]
- hgid = ""
+ gitid = ""
else:
#x = [pages.JS_BASE, ui.get("buildextra", ui.get("extra", [])), pages.BUILD_BASE, name]
x = [pages.JS_RAW_BASE, name]
- hgid = "-" + gethgid()
+ gitid = "-" + getgitid()
- return list(y if y.startswith("//") else "js/%s%s.js" % (y, hgid) for y in pages.flatten(x))
+ return list(y if y.startswith("//") else "js/%s%s.js" % (y, gitid) for y in pages.flatten(x))
def csslist(name, debug, gen=False):
ui = pages.UIs[name]
nocss = ui.get("nocss")
if not debug:
- return ["css/%s-%s.css" % (name, gethgid())]
- css = pages.flatten([ui.get("extracss", []), "colours", "dialogs"])
+ return ["css/%s-%s.css" % (name, getgitid())]
+ css = list(pages.flatten([ui.get("extracss", []), "colours", "dialogs"]))
if not nocss:
- css = list(css) + [name]
- return list("css/%s%s.css" % ("debug/" if gen else "", x) for x in css)
+ css+=[name]
+ css = ["%s.css" % x for x in css]
+ if hasattr(config, "CUSTOM_CSS"):
+ css+=[config.CUSTOM_CSS]
+ return list("css/%s%s" % ("debug/" if gen else "", x) for x in css)
-def _gethgid():
+def _getgitid():
try:
- p = subprocess.Popen(["hg", "id"], stdout=subprocess.PIPE)
+ p = subprocess.Popen(["git", "rev-parse", "HEAD"], stdout=subprocess.PIPE, shell=os.name == "nt")
except Exception, e:
if hasattr(e, "errno") and e.errno == 2:
- raise HGException, "unable to execute"
- raise HGException, "unknown exception running hg: %s" % repr(e)
+ raise GitException, "unable to execute"
+ raise GitException, "unknown exception running git: %s" % repr(e)
data = p.communicate()[0]
if p.wait() != 0:
- raise HGException, "unable to get id"
+ raise GitException, "unable to get id"
return re.match("^([0-9a-f]+).*", data).group(1)
-HGID = None
-def gethgid():
- global HGID
- if HGID is None:
+GITID = None
+def getgitid():
+ global GITID
+ if GITID is None:
try:
- HGID = _gethgid()
- except HGException, e:
- print >>sys.stderr, "warning: hg: %s (using a random id)." % e
- HGID = os.urandom(10).encode("hex")
- return HGID
+ GITID = _getgitid()
+ except GitException, e:
+ print >>sys.stderr, "warning: git: %s (using a random id)." % e
+ GITID = os.urandom(10).encode("hex")
+ return GITID
def producehtml(name, debug):
ui = pages.UIs[name]
@@ -62,20 +65,17 @@ def producehtml(name, debug):
div = ui.get("div", "")
customjs = ui.get("customjs", "")
- if debug:
- customjs = """
-""" + customjs
-
return """%s
%s (qwebirc)
+
+
+
-%s%s
+%s%s
%s