Commit 7bdc5a94 authored by Richard Mansfield's avatar Richard Mansfield

Generate release notes for eduforge

parent 6d33aabc
......@@ -30,6 +30,7 @@ OPTION=$3
BUILDDIR="/tmp/mahara/tarballs"
#BUILDDIR="/home/richard/foobar44/mahara/tarballs"
CURRENTDIR="`pwd`"
SCRIPTDIR=$( readlink -f -- "${0%/*}" )
if [ -z "${MAJOR}" ] || [ -z "${MINOR}" ]; then
print_usage
......@@ -64,21 +65,25 @@ if [ "$OPTION" != "--public" ]; then
git checkout -b S_${BRANCH} mahara-security/${BRANCH}
echo "Merging $BRANCH (public) into $BRANCH (security)"
git merge ${BRANCH}
# Check for merge conflicts
fi
# Update ChangeLog
# Edit ChangeLog
RELEASE="${MAJOR}.${MINOR}${MICRO}"
echo -e "#\n# Please add a description of the major changes in this release, one per line:\n#\n" > ${CURRENTDIR}/ChangeLog.temp
sensible-editor ${CURRENTDIR}/ChangeLog.temp
grep -v "^#" ${CURRENTDIR}/ChangeLog.temp > ${CURRENTDIR}/changes.temp
if [ -f "ChangeLog" ]; then
cp ChangeLog ChangeLog.back
echo "$RELEASE (`date +%Y-%m-%d`)" > ChangeLog
echo "- " >> ChangeLog
sed 's/^/- /g' ${CURRENTDIR}/changes.temp >> ChangeLog
echo >> ChangeLog
cat ChangeLog.back >> ChangeLog
sensible-editor ${BUILDDIR}/mahara/ChangeLog
git add ChangeLog
fi
......@@ -108,6 +113,7 @@ git commit -m "Version bump for $RELEASE"
# Tag the version bump commit
RELEASETAG="`echo $RELEASE | tr '[:lower:]' '[:upper:]'`_RELEASE"
echo -e "\nTag new version bump commit as '$RELEASETAG'"
git tag -s ${RELEASETAG} -m "$RELEASE release"
......@@ -125,6 +131,38 @@ git archive --format=zip -9 ${RELEASETAG} > ${CURRENTDIR}/mahara-${RELEASE}.zip
# Save git changelog
OLDRELEASETAG=`git tag -l '*_RELEASE' | tail -2 | head -1`
if [ -n "${OLDRELEASETAG}" ] ; then
git log --pretty=oneline ${OLDRELEASETAG}..${RELEASETAG} > ${CURRENTDIR}/${RELEASETAG}.cl
else
git log --pretty=oneline ${RELEASETAG} > ${CURRENTDIR}/${RELEASETAG}.cl
fi
OLDRELEASE=${OLDRELEASETAG%_RELEASE}
# Prepare eduforge release notes
TMP_M4_FILE=/tmp/mahara-releasnotes.m4.tmp
echo "changecom" > $TMP_M4_FILE
echo "define(\`__RELEASE__',\`${RELEASE}')dnl" >> $TMP_M4_FILE
echo "define(\`__OLDRELEASE__',\`${OLDRELEASE}')dnl" >> $TMP_M4_FILE
echo "define(\`__MAJOR__',\`${MAJOR}')dnl" >> $TMP_M4_FILE
sed 's/^/ * /g' ${CURRENTDIR}/changes.temp >> ${CURRENTDIR}/changes.eduforge.temp
echo "define(\`__CHANGES__',\`include(\`${CURRENTDIR}/changes.eduforge.temp')')dnl" >> $TMP_M4_FILE
if [ -z "${MICRO}" ]; then
TEMPLATE=releasenotes.stable.template
else
TEMPLATE=releasenotes.${MICROA}.template
fi
m4 ${TMP_M4_FILE} ${SCRIPTDIR}/${TEMPLATE} > ${CURRENTDIR}/releasenotes-${RELEASE}.txt
# Second version bump for post-release
NEWVERSION=$(( ${NEWVERSION} + 1 ))
......
Mahara __RELEASE__ Release Notes
*** THERE IS NO UPGRADE PATH TO THIS RELEASE ***
You MUST install this from scratch, upgrading from trunk or from a previous
stable release is NOT supported.
This is a preview release of Mahara __MAJOR__. Things will be broken!
Please do not file bug reports, but we are interested to hear your
feedback on the new features, through #mahara on freenode, e-mail to
dev@mahara.org or the forums at www.mahara.org.
This release includes:
__CHANGES__
As mentioned, there is no supported upgrade path. Attempting to upgrade an
existing Mahara will result in a broken system, so do not try this yet.
Mahara __RELEASE__ Release Notes
This is a beta release of Mahara __MAJOR__. Things will be broken! However,
we are now soliciting bug reports, should you find a bug. You can report bugs
to the tracker:
https://eduforge.org/tracker/?func=add&group_id=176&atid=739
Please choose 'HEAD/trunk' as the version of your bug.
This release is one in which upgrading from the 1.0 stable version is
possible. This does not mean that this should be done on a live
website! Instead, make a copy of your database and dataroot, set up a
new Mahara using them, and test upgrading on that.
Upgrading from this release to any future release will not be
supported either, so please perform any testing you might want to make
on either a new install of this release or a copy of your site.
This release includes:
__CHANGES__
Mahara __RELEASE__ Release Notes
This is a release candidate of Mahara __MAJOR__. Release candidates should
have no major bugs affecting the installation, upgrade path or general Mahara
usage, but nevertheless may have bugs in these areas. You can report bugs to
the tracker:
https://eduforge.org/tracker/?func=add&group_id=176&atid=739
Please choose '__MAJOR__ stable branch' as the version of your bug.
In this release, upgrading from the 1.0 stable version is possible. This does
not mean that this should be done on a live website! Please perform any testing
you might want to make on either a new install of this release or a copy of
your site.
This release includes:
__CHANGES__
As mentioned above, the upgrade should not be attempted on a live site yet.
Instead, make a copy of your database and dataroot, set up a new Mahara using
them, and test upgrading on that.
Mahara __RELEASE__ Release Notes
This is a stable release of Mahara __MAJOR__. Stable releases are fit for
general use. If you find a bug, please report it to the tracker:
https://eduforge.org/tracker/?func=add&group_id=176&atid=739
Please choose '__MAJOR__ stable branch' as the version of your bug.
This release includes an upgrade path from 1.0. If you wish to
upgrade, we encourage you to make a copy of your website and test the
upgrade on it first, to minimise the effect of any potential unforseen
problems.
Changes from __OLDRELEASE__:
__CHANGES__
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment