From 0e0fdfa20200d21c1117be1ab95b517504df4866 Mon Sep 17 00:00:00 2001
From: Jon Atkins <github@jonatkins.com>
Date: Thu, 29 Aug 2013 04:57:51 +0100
Subject: [PATCH 1/4] build.py updates taken from new dev branch

---
 build.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.py b/build.py
index 5c4cd1c1..96212c5c 100755
--- a/build.py
+++ b/build.py
@@ -59,7 +59,7 @@ dateTimeVersion = time.strftime('%Y%m%d.',utcTime) + time.strftime('%H%M%S',utcT
 resourceUrlBase = settings.get('resourceUrlBase')
 distUrlBase = settings.get('distUrlBase')
 buildMobile = settings.get('buildMobile')
-
+antOptions = settings.get('antOptions','')
 
 # plugin wrapper code snippets. handled as macros, to ensure that
 # 1. indentation caused by the "function wrapper()" doesn't apply to the plugin code body
@@ -132,7 +132,7 @@ def loaderImage(var):
     return 'data:image/png;base64,{0}'.format(base64.encodestring(open(fn, 'rb').read()).decode('utf8').replace('\n', ''))
 
 def loadCode(ignore):
-    return '\n\n'.join(map(readfile, glob.glob('code/*.js')))
+    return '\n\n'.join(map(readfile, sorted(glob.glob('code/*.js'))))
 
 
 def extractUserScriptMeta(var):
@@ -263,7 +263,7 @@ if buildMobile:
 
     if buildMobile != 'copyonly':
         # now launch 'ant' to build the mobile project
-        retcode = os.system("ant -buildfile mobile/build.xml %s" % buildMobile)
+        retcode = os.system("ant %s -buildfile mobile/build.xml %s" % (antOptions, buildMobile))
 
         if retcode != 0:
             print ("Error: mobile app failed to build. ant returned %d" % retcode)

From 565d877c41b63b401a93f83579b8521b3de63700 Mon Sep 17 00:00:00 2001
From: Jon Atkins <github@jonatkins.com>
Date: Thu, 29 Aug 2013 04:59:15 +0100
Subject: [PATCH 2/4] website updates - including a bit mistakenly added to the
 new dev branch when it should have been here

---
 website/page/test.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/website/page/test.php b/website/page/test.php
index db491779..c1a256de 100644
--- a/website/page/test.php
+++ b/website/page/test.php
@@ -63,11 +63,16 @@ iitcDesktopPluginDownloadTable ( $path );
 
 <h3 id="test-mobile">Mobile test build</h3>
 
+<div class="alert alert-block alert-info">
+<b>Note</b>: Test builds have recently been changed so they can be installed alongside the standard IITC builds.
+Test builds will be called "IITCm Test" - while the regular release builds remain named "IITC Mobile"
+</div>
+
 <?php
 
 include_once ( "code/mobile-download.php" );
 
-$apkfile = "$path/IITC_Mobile-test.apk";
+$apkfile = "$path/IITC_Mobile-$path.apk";
 
 
 if ( file_exists($apkfile) )

From 97ddeafba81e31c7343889a87e4034d5d33ea801 Mon Sep 17 00:00:00 2001
From: Jon Atkins <github@jonatkins.com>
Date: Thu, 29 Aug 2013 06:18:52 +0100
Subject: [PATCH 3/4] website: comment out note about mobile test builds until
 it's actually working...

---
 website/page/test.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/website/page/test.php b/website/page/test.php
index c1a256de..f11a1e7e 100644
--- a/website/page/test.php
+++ b/website/page/test.php
@@ -63,10 +63,12 @@ iitcDesktopPluginDownloadTable ( $path );
 
 <h3 id="test-mobile">Mobile test build</h3>
 
+<!--
 <div class="alert alert-block alert-info">
 <b>Note</b>: Test builds have recently been changed so they can be installed alongside the standard IITC builds.
 Test builds will be called "IITCm Test" - while the regular release builds remain named "IITC Mobile"
 </div>
+-->
 
 <?php
 

From cffebb18ab2d633cacec258c1dcc407b3033b6f0 Mon Sep 17 00:00:00 2001
From: Jon Atkins <github@jonatkins.com>
Date: Thu, 29 Aug 2013 16:27:13 +0100
Subject: [PATCH 4/4] website: fix typo in # link for faq entry

---
 website/page/faq.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/page/faq.php b/website/page/faq.php
index 086d1ce9..a8787dd5 100644
--- a/website/page/faq.php
+++ b/website/page/faq.php
@@ -3,7 +3,7 @@
 <ul>
 
 <li>
-<h4 id="moblie-login">Login on mobile doesn't work!</h4>
+<h4 id="mobile-login">Login on mobile doesn't work!</h4>
 <p>
 Many users are seeing the error message <b>Error: Server Error</b> when attempting to log in on mobile.
 To get past this and log in successfully, you can try to