X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/blobdiff_plain/77b32b5630fcb4b3b9a8be2db67f8741f5bf935b..e1a91a8a54a08080df33a061eb0d36b1918fe0ea:/compile.sh

diff --git a/compile.sh b/compile.sh
index ef9b01e..2629748 100755
--- a/compile.sh
+++ b/compile.sh
@@ -1,10 +1,12 @@
 #!/bin/sh
+python pagegen.py
+
 mkdir -p compiled
 rm -f compiled/*.js
 
 cd js
-cat version.js jslib.js irc/ircconnection.js irc/irclib.js irc/baseircclient.js irc/irctracker.js irc/commandparser.js irc/ircclient.js ui/baseui.js ui/baseuiwindow.js ui/colour.js ui/theme.js qwebircinterface.js > ../compiled/qwebirc-concat.js
-cat ui/swmlayout.js ui/swmui.js > ../compiled/swmui-concat.js
+cat qwebirc.js version.js jslib.js irc/ircconnection.js irc/irclib.js irc/numerics.js irc/baseircclient.js irc/irctracker.js irc/commandparser.js irc/ircclient.js ui/baseui.js ui/baseuiwindow.js ui/colour.js ui/url.js ui/theme.js ui/genericlogin.js ui/embedwizard.js irc/commandhistory.js ui/hilightcontroller.js ui/menuitems.js ui/tabcompleter.js ui/optionspane.js ui/aboutpane.js qwebircinterface.js auth.js sound.js > ../compiled/qwebirc-concat.js
+cat ui/swmui.js ui/swmlayout.js > ../compiled/swmui-concat.js
 
 error() {
   cd ..
@@ -16,24 +18,34 @@ catit() {
   cat js/copyright.js compiled/$1-compiled.js > static/js/$1.js
 }
 
-jarit() {
-  SRC=$1
-  DST=$2
+xjarit() {
+  local SRC=$1
+  local DST=$2
   cd compiled
-  java -jar ../bin/yuicompressor-2.3.5.jar $SRC.js > $DST-compiled.js
+  java -jar ../bin/yuicompressor-2.3.5.jar $SRC.js > $DST.js
   if [ "$?" != 0 ]; then
     error
   fi
   cd ..
+}
+
+jarit() {
+  SRC=$1
+  DST=$2
+  
+  xjarit $SRC $DST-compiled
   catit $DST
   rm compiled/$DST-compiled.js
 }
 
 cd ..
+xjarit ../static/js/mochaui/mocha ../static/js/mochaui/mocha-compressed
+
 jarit qwebirc-concat qwebirc
 jarit ../js/ui/uglyui uglyui
 jarit swmui-concat swmui
 jarit ../js/ui/mochaui mochaui
+jarit ../js/ui/qui qui
 
 rm compiled/{swmui,qwebirc}-concat.js