From 674c8e96edda303d2329a21f47aaec70a67bf493 Mon Sep 17 00:00:00 2001
From: Vineet Reynolds <Vineet.Reynolds@gmail.com>
Date: Mon, 10 Mar 2014 15:38:08 +0530
Subject: [PATCH] Removed README.html from the gitignore list.

This is to ensure that WFK source distributions contain these
files.

Also modified the release script to add and remove README.html
files only when preparing WFK releases.
---
 .gitignore      |  1 -
 dist/release.sh | 12 +++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d56404ea8..4046fc67e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ bin
 .openshift
 */.gitignore
 /helloworld-jsp
-README.html
 CONTRIBUTING.html
 .errai
 demo/src/main/gwt-unitCache
diff --git a/dist/release.sh b/dist/release.sh
index 8100d5f81..822a5dbad 100755
--- a/dist/release.sh
+++ b/dist/release.sh
@@ -51,8 +51,8 @@ notify_email()
 
 release()
 {
+   git reset --hard  
    echo "Releasing TicketMonster version $RELEASEVERSION"
-   echo "Regenerating html from markdown"
    default="Y"
    read -p "Do you want to update the Performance dates in import.sql [Y/n]? " yn
    yn=${yn:-$default}
@@ -69,10 +69,13 @@ release()
    read -p "Do you want to create a WFK release [Y/n]? " wfk
    wfk=${wfk:-$default}
    if [[ $wfk = "Y" || $wfk = "y" ]] ; then
-   echo "Omitting files unnecessary for WFK distribution"
+      echo "Regenerating html from markdown"
       mv $DIR/../README.md $DIR/../dist/README.orig.md
       cp $DIR/../dist/README.dist.md $DIR/../README.md
       $DIR/release-utils.sh -m
+      git ls-files --others $DIR/.. | grep '\README.html$' | xargs git add
+      
+      echo "Omitting files unnecessary for WFK distribution"
       git rm --cached -r $DIR/../dist/
       git rm --cached -r $DIR/../tutorial/
    fi
@@ -81,10 +84,13 @@ release()
    git branch $RELEASEVERSION tags/$RELEASEVERSION
    $DIR/release-utils.sh -u -o $RELEASEVERSION -n $NEWSNAPSHOTVERSION
    if [[ $wfk = "Y" || $wfk = "y" ]] ; then
-   echo "Adding files again..."
+      echo "Adding files again..."
       mv $DIR/../dist/README.orig.md $DIR/../README.md
       git add $DIR/../dist/
       git add $DIR/../tutorial/
+
+      echo "Removing READMEs again..."
+      git ls-files $DIR/.. | grep '\README.html$' | xargs git rm
    fi
    git commit -a -m "Prepare for development of $NEWSNAPSHOTVERSION"
    if [[ $wfk = "N" || $wfk = "n" ]] ; then