diff options
author | Jan Schmidt <thaytan@noraisin.net> | 2009-01-27 14:57:57 +0000 |
---|---|---|
committer | Jan Schmidt <thaytan@noraisin.net> | 2009-02-19 12:00:57 +0000 |
commit | be2a8b2a8e80a5530a0ccba0c95e018b63eeb350 (patch) | |
tree | b196b24ed5058918fe4081a521eabb8690ba5cc0 /bin | |
parent | a37b55150ddc9488baf2fc73998157401442d2e9 (diff) |
Start modifying the new release script for git
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/new-release | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/bin/new-release b/bin/new-release index 75605325..02a02d41 100755 --- a/bin/new-release +++ b/bin/new-release @@ -42,7 +42,7 @@ moduledir=$modulebasedir/$module echo "Updating CVS" pushd $moduledir > /dev/null 2>&1 -cvs up +git pull popd release=src/htdocs/releases/$module/$version @@ -80,6 +80,8 @@ else echo Updating $makefileam perl -i.bak -p -e "s@(releases =)@\$1 $version@" $makefileam fi +# Mark for committing +git add $makefileam # update configure.ac configureac=$moduledir/configure.ac @@ -110,14 +112,15 @@ else cat $changelog.bak >> $changelog fi -# FIXME: add to cvs -cvs add $release.xml - echo "Now press Enter to edit the next .xml file and update the list of features and API changes" read $EDITOR $release.xml +# Mark for committing +git add $release.xml + + echo "Building website" make @@ -157,11 +160,11 @@ then echo "Press Enter to commit updates to .po files" read pushd $moduledir > /dev/null 2>&1 - cvs commit -m "Update .po files" po/*.po + git commit -m "Update .po files" po/*.po popd fi cd $moduledir -cvs diff > release.diff -echo "Press Enter to review the CVS diff" +git diff > release.diff +echo "Press Enter to review the git diff" less -R release.diff |