diff options
| author | Jan Schmidt <thaytan@noraisin.net> | 2009-05-11 00:39:04 +0100 |
|---|---|---|
| committer | Jan Schmidt <thaytan@noraisin.net> | 2009-05-11 00:39:57 +0100 |
| commit | f07ced018b9d5d055403ea637ae08f175f08f954 (patch) | |
| tree | 5b2d8e086107cb05889ef4dac34df3c6267e71ac /bin | |
| parent | 26e28c5d7e41e5e33126a7b4e6fa108dc46842db (diff) | |
www: Modify new-release script
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/new-release | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/bin/new-release b/bin/new-release index d5ce5cb4..2315bda5 100755 --- a/bin/new-release +++ b/bin/new-release @@ -45,19 +45,6 @@ pushd $moduledir > /dev/null 2>&1 git pull popd -echo "Regenerating ChangeLog" -# Check CHANGELOG_START tag exists -if test ! -e $moduledir/.git/refs/tags/CHANGELOG_START -then - echo "No CHANGELOG_START tag in module" - exit 1 -fi -pushd $moduledir > /dev/null 2>&1 -changelog=ChangeLog -python common/gen-changelog.py > $changelog -git add $changelog -popd - release=src/htdocs/releases/$module/$version template=src/htdocs/releases/$module/template.xml if test ! -e $template @@ -108,6 +95,19 @@ make > out 2>&1 || ( echo "Build failed"; exit 1 ) popd # update Changelog +echo "Regenerating ChangeLog" +# Check CHANGELOG_START tag exists +if test ! -e $moduledir/.git/refs/tags/CHANGELOG_START +then + echo "No CHANGELOG_START tag in module" + exit 1 +fi +pushd $moduledir > /dev/null 2>&1 +changelog=ChangeLog +python common/gen-changelog.py > $changelog +git add $changelog +popd + changelog=$moduledir/ChangeLog if grep "=== release $version ===" $changelog > /dev/null 2>&1 then |