Skip to content

Commit 674c8e9

Browse files
committedMar 10, 2014
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.
1 parent d6e5890 commit 674c8e9

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed
 

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ bin
88
.openshift
99
*/.gitignore
1010
/helloworld-jsp
11-
README.html
1211
CONTRIBUTING.html
1312
.errai
1413
demo/src/main/gwt-unitCache

‎dist/release.sh

+9-3
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ notify_email()
5151

5252
release()
5353
{
54+
git reset --hard
5455
echo "Releasing TicketMonster version $RELEASEVERSION"
55-
echo "Regenerating html from markdown"
5656
default="Y"
5757
read -p "Do you want to update the Performance dates in import.sql [Y/n]? " yn
5858
yn=${yn:-$default}
@@ -69,10 +69,13 @@ release()
6969
read -p "Do you want to create a WFK release [Y/n]? " wfk
7070
wfk=${wfk:-$default}
7171
if [[ $wfk = "Y" || $wfk = "y" ]] ; then
72-
echo "Omitting files unnecessary for WFK distribution"
72+
echo "Regenerating html from markdown"
7373
mv $DIR/../README.md $DIR/../dist/README.orig.md
7474
cp $DIR/../dist/README.dist.md $DIR/../README.md
7575
$DIR/release-utils.sh -m
76+
git ls-files --others $DIR/.. | grep '\README.html$' | xargs git add
77+
78+
echo "Omitting files unnecessary for WFK distribution"
7679
git rm --cached -r $DIR/../dist/
7780
git rm --cached -r $DIR/../tutorial/
7881
fi
@@ -81,10 +84,13 @@ release()
8184
git branch $RELEASEVERSION tags/$RELEASEVERSION
8285
$DIR/release-utils.sh -u -o $RELEASEVERSION -n $NEWSNAPSHOTVERSION
8386
if [[ $wfk = "Y" || $wfk = "y" ]] ; then
84-
echo "Adding files again..."
87+
echo "Adding files again..."
8588
mv $DIR/../dist/README.orig.md $DIR/../README.md
8689
git add $DIR/../dist/
8790
git add $DIR/../tutorial/
91+
92+
echo "Removing READMEs again..."
93+
git ls-files $DIR/.. | grep '\README.html$' | xargs git rm
8894
fi
8995
git commit -a -m "Prepare for development of $NEWSNAPSHOTVERSION"
9096
if [[ $wfk = "N" || $wfk = "n" ]] ; then

0 commit comments

Comments
 (0)