Skip to content

Commit

Permalink
Removed README.html from the gitignore list.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
VineetReynolds committed Mar 10, 2014
1 parent d6e5890 commit 674c8e9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
1 change: 0 additions & 1 deletion .gitignore
Expand Up @@ -8,7 +8,6 @@ bin
.openshift
*/.gitignore
/helloworld-jsp
README.html
CONTRIBUTING.html
.errai
demo/src/main/gwt-unitCache
Expand Down
12 changes: 9 additions & 3 deletions dist/release.sh
Expand Up @@ -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}
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 674c8e9

Please sign in to comment.