From 57c998beccbab1a6e6b8d6ba2b43d6712be5ee3a Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Thu, 1 Aug 2013 11:02:49 -0400
Subject: [PATCH 1/4] Automate publishing of the changelogs.

Publishes the changelog on github using a gh-pages branch.

This implementation changes back and forth between git
branches without updating the working tree.  This should
be faster because the branches are unrelated so updating
the tree would require removing and recreating all the files.
---
 build.xml                    | 39 +++++++++++++++++++++++++++++++++++-
 res/xml/changelog_master.xml |  8 ++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 65a87cb15..cef6b9422 100644
--- a/build.xml
+++ b/build.xml
@@ -155,7 +155,7 @@
     </target>
 
     <!-- rules -->
-    <target name="bump-version" depends="-set-version,-commit-version">
+    <target name="bump-version" depends="-set-version,-commit-version,-update-gh-pages-branch,-push-version">
         <echo>Bumped K-9 to ${version-name}</echo>
     </target>
 
@@ -166,6 +166,43 @@
         <exec executable="git" failonerror="true">
             <arg line="tag ${version-name}" />
         </exec>
+    </target>
+
+    <!-- Copy the changelog to the gh-pages branch. -->
+    <target name="-update-gh-pages-branch">
+        <!-- Check for a clean index, because it's about to be reset -->
+        <exec executable="git" failonerror="true">
+            <arg line="diff-index --cached --quiet HEAD" />
+        </exec>
+        <exec executable="git" failonerror="true" outputproperty="git-branch-ref" errorproperty="git-branch-ref-error">
+            <arg line="symbolic-ref HEAD" />
+        </exec>
+        <exec executable="git" failonerror="true">
+            <arg line="symbolic-ref HEAD refs/heads/gh-pages" />
+        </exec>
+        <exec executable="git" failonerror="true">
+            <arg line="reset -q" />
+        </exec>
+        <exec executable="git" failonerror="true" outputproperty="git-ls-tree" errorproperty="git-ls-tree-error">
+            <arg line="ls-tree ${git-branch-ref} res/xml/changelog_master.xml" />
+        </exec>
+        <regex property="changelog-path-dst" input="${git-branch-ref}" regexp=".*/([^/]+$)" select="changelog_\1_branch.xml" />
+        <regex property="git-index-info" input="${git-ls-tree}" regexp="(.*\t).*" select="\1${changelog-path-dst}" />
+        <exec executable="git" failonerror="true" inputstring="${git-index-info}">
+            <arg line="update-index --index-info" />
+        </exec>
+        <exec executable="git" failonerror="true">
+            <arg line="commit -m'Update changelog for version ${version-name}'" />
+        </exec>
+        <exec executable="git" failonerror="true">
+            <arg line="symbolic-ref HEAD ${git-branch-ref}" />
+        </exec>
+        <exec executable="git" failonerror="true">
+            <arg line="reset -q" />
+        </exec>
+    </target>
+
+    <target name="-push-version">
         <exec executable="git" failonerror="true">
             <arg line="push" />
         </exec>
diff --git a/res/xml/changelog_master.xml b/res/xml/changelog_master.xml
index 76b459098..06dc8a2bc 100644
--- a/res/xml/changelog_master.xml
+++ b/res/xml/changelog_master.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="changelog_style.xsl"?>
+<!--
+     The master change log is kept in res/xml/changelog_master.xml.
+     Locale specific versions are kept in res/xml-<locale qualifier>/changelog.xml.
+
+     Don't edit the changelog_<name>_branch.xml files in the gh-pages branch.
+     They are automatically updated with "ant bump-version".
+-->
 <changelog>
     <release version="4.508" versioncode="18008" >
         <change>Move 'share' menu item back, at least for the moment</change>

From 6e6208139054871444b86e2741b284e4c8075120 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Thu, 1 Aug 2013 10:54:26 -0400
Subject: [PATCH 2/4] More robust parsing of changelog in build.xml

---
 build.xml | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index cef6b9422..14c61ca04 100644
--- a/build.xml
+++ b/build.xml
@@ -86,6 +86,7 @@
     <property name="rclib" value="${out.dir}/K9RemoteControl.jar" />
     <property name="rcdir" value="com/fsck/k9/remotecontrol/**" />
 
+    <property name="changelog-path-src" value="res/xml/changelog_master.xml" />
     <condition property="android.executable" value="android.bat">
         <os family="windows" />
     </condition>
@@ -139,9 +140,29 @@
         </if.contrib>
 
         <echo>Setting version to ${version-name}</echo>
-        <exec executable="perl" failonerror="true">
-            <arg line="-0 -ne '/\x3Crelease version=\x22${version-name}\x22/ or die qq/No changelog for ${version-name}\n/' res/xml/changelog_master.xml" />
+
+        <xpath
+            input="${changelog-path-src}"
+            expression="/changelog/release[@version='${version-name}']/@version"
+            output="changelog-test" />
+
+        <if.contrib>
+            <equals arg1="${changelog-test}" arg2="${version-name}" />
+            <else>
+                <fail>No changelog for ${version-name}.</fail>
+            </else>
+        </if.contrib>
+
+        <exec executable="git" failonerror="true" outputproperty="git-status" errorproperty="git-status-error">
+            <arg line="status -s ${changelog-path-src}" />
         </exec>
+        <if.contrib>
+            <equals arg1="${git-status}" arg2="" />
+            <else>
+                <fail>Uncomitted changelog edits.</fail>
+            </else>
+        </if.contrib>
+
         <replace file="AndroidManifest.xml"
             token="android:versionName=&quot;${current-version-name}&quot;"
             value="android:versionName=&quot;${version-name}&quot;" summary="true"
@@ -184,7 +205,7 @@
             <arg line="reset -q" />
         </exec>
         <exec executable="git" failonerror="true" outputproperty="git-ls-tree" errorproperty="git-ls-tree-error">
-            <arg line="ls-tree ${git-branch-ref} res/xml/changelog_master.xml" />
+            <arg line="ls-tree ${git-branch-ref} ${changelog-path-src}" />
         </exec>
         <regex property="changelog-path-dst" input="${git-branch-ref}" regexp=".*/([^/]+$)" select="changelog_\1_branch.xml" />
         <regex property="git-index-info" input="${git-ls-tree}" regexp="(.*\t).*" select="\1${changelog-path-dst}" />

From b8b21a0bcbff9ee45ed5b6e0000feb044540154b Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Thu, 1 Aug 2013 10:54:45 -0400
Subject: [PATCH 3/4] Make sure the gh-pages branch is pushed.

---
 build.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 14c61ca04..25c92401f 100644
--- a/build.xml
+++ b/build.xml
@@ -225,10 +225,7 @@
 
     <target name="-push-version">
         <exec executable="git" failonerror="true">
-            <arg line="push" />
-        </exec>
-        <exec executable="git" failonerror="true">
-            <arg line="push origin tag ${version-name}" />
+            <arg line="push origin HEAD gh-pages tag ${version-name}" />
         </exec>
     </target>
 

From b795106289d86d4145d5010191c40e9a0b60bee2 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Thu, 1 Aug 2013 11:21:52 -0400
Subject: [PATCH 4/4] New "-pre-bump-check" target for sanity checks.

Perform all sanity checks before making any changes.
---
 build.xml | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/build.xml b/build.xml
index 25c92401f..ad55fb6b3 100644
--- a/build.xml
+++ b/build.xml
@@ -130,17 +130,7 @@
         <regex property="version-name" input="${major}." regexp="(\d+.)" replace="\1${minor}" />
     </target>
 
-    <target name="-set-version" depends="-get-version-name,-get-version-code">
-        <!-- pass -Dversion-name=4.200 to define the version instead of auto-incrementing it -->
-        <if.contrib>
-            <isset property="version-name" />
-            <else>
-                <runtarget target="-auto-incr-version" />
-            </else>
-        </if.contrib>
-
-        <echo>Setting version to ${version-name}</echo>
-
+    <target name="-pre-bump-check" depends="-get-version-name,-auto-incr-version">
         <xpath
             input="${changelog-path-src}"
             expression="/changelog/release[@version='${version-name}']/@version"
@@ -163,6 +153,24 @@
             </else>
         </if.contrib>
 
+        <!-- Check for a clean index, because it will be reset in -update-gh-pages-branch -->
+        <exec executable="git" failonerror="true">
+            <arg line="diff-index --cached --quiet HEAD" />
+        </exec>
+
+    </target>
+
+    <target name="-set-version" depends="-get-version-name,-get-version-code">
+        <!-- pass -Dversion-name=4.200 to define the version instead of auto-incrementing it -->
+        <if.contrib>
+            <isset property="version-name" />
+            <else>
+                <runtarget target="-auto-incr-version" />
+            </else>
+        </if.contrib>
+
+        <echo>Setting version to ${version-name}</echo>
+
         <replace file="AndroidManifest.xml"
             token="android:versionName=&quot;${current-version-name}&quot;"
             value="android:versionName=&quot;${version-name}&quot;" summary="true"
@@ -176,7 +184,7 @@
     </target>
 
     <!-- rules -->
-    <target name="bump-version" depends="-set-version,-commit-version,-update-gh-pages-branch,-push-version">
+    <target name="bump-version" depends="-pre-bump-check,-set-version,-commit-version,-update-gh-pages-branch,-push-version">
         <echo>Bumped K-9 to ${version-name}</echo>
     </target>
 
@@ -191,10 +199,6 @@
 
     <!-- Copy the changelog to the gh-pages branch. -->
     <target name="-update-gh-pages-branch">
-        <!-- Check for a clean index, because it's about to be reset -->
-        <exec executable="git" failonerror="true">
-            <arg line="diff-index --cached --quiet HEAD" />
-        </exec>
         <exec executable="git" failonerror="true" outputproperty="git-branch-ref" errorproperty="git-branch-ref-error">
             <arg line="symbolic-ref HEAD" />
         </exec>