X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/blobdiff_plain/94b181927290b2d73d67b8a4892ca0330581e467..3184781b2123ac21ed524a63248cdc07ef5dc668:/compile.sh

diff --git a/compile.sh b/compile.sh
index 16ead57..632e72a 100755
--- a/compile.sh
+++ b/compile.sh
@@ -1,11 +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
-cd ../compiled
+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 qwebircinterface.js > ../compiled/qwebirc-concat.js
+cat ui/swmui.js ui/swmlayout.js > ../compiled/swmui-concat.js
 
 error() {
   cd ..
@@ -13,24 +14,39 @@ error() {
   exit 1
 }
 
-jarit() {
-  java -jar ../bin/yuicompressor-2.3.5.jar $1.js > $2-compiled.js
+catit() {
+  cat js/copyright.js compiled/$1-compiled.js > static/js/$1.js
+}
+
+xjarit() {
+  local SRC=$1
+  local DST=$2
+  cd compiled
+  java -jar ../bin/yuicompressor-2.3.5.jar $SRC.js > $DST.js
   if [ "$?" != 0 ]; then
     error
   fi
+  cd ..
 }
 
-catit() {
-  cat js/copyright.js compiled/$1-compiled.js > static/js/$1.js
+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
 
-cd ..
-catit qwebirc
-catit uglyui
-catit swmui
-rm -f compiled/*.js
 rmdir compiled