From: David B. <dbr...@us...> - 2009-11-05 01:48:50
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via 16f485aca2193b06d182ab30dd5afe36826e92b5 (commit) from 0e37ea6499fd493a32ebdfd3a27c6a01426b3a19 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 16f485aca2193b06d182ab30dd5afe36826e92b5 Author: David Brownell <dbr...@us...> Date: Wed Nov 4 16:46:27 2009 -0800 Other files: stop referring to ChangeLog too The ChangeLog idiom is redundant given any decent SCM. Time to phase it out here. Signed-off-by: David Brownell <dbr...@us...> diff --git a/doc/manual/release.txt b/doc/manual/release.txt index 31bf44d..d05ac74 100644 --- a/doc/manual/release.txt +++ b/doc/manual/release.txt @@ -311,7 +311,6 @@ git tag -m "The openocd-${PACKAGE_VERSION} release." "${PACKAGE_TAG}" release's tag. This is used only for producing these packages. -# Checkout the appropriate tag: <code>git checkout "${PACKAGE_VERSION}"</code> - -# Produce a ChangeLog for the release (using @c git2cl). -# @c bootstrap, @c configure, and @c make the package. -# Run <code>make distcheck</code> to produce the distribution archives. -# Run <code>make maintainer-clean</code> verify the repository is empty. @@ -320,7 +319,6 @@ git tag -m "The openocd-${PACKAGE_VERSION} release." "${PACKAGE_TAG}" - Allow users to access the documentation for each of our releases. - Place static copies of the following files on the project website: - @c NEWS: to provide a blurb for each release - - @c ChangeLog: to show exactly what has been changed - User's Guide, Developer Manual: to allow easy on-line viewing -# Upload packages and post announcements of their availability: -# Release packages into files section of project sites: @@ -334,7 +332,7 @@ git tag -m "The openocd-${PACKAGE_VERSION} release." "${PACKAGE_TAG}" - .zip: Windows - Berlios: -# Create the new release for the new version. - -# Provide @c NEWS and ChangeLog files, as requested. + -# Provide @c NEWS file, as requested. -# Upload files via FTP to ftp://ftp.berlios.de/incoming/ -# Edit descriptions for each file. -# Click button to send E-mail Release Notice. diff --git a/tools/release.sh b/tools/release.sh index e7fbc6c..c464c49 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -37,7 +37,6 @@ Build Commands: build Compiles the project; runs configure, if needed. Packaging Commands: - changelog Generate a new ChangeLog using ${SCM}2cl. package Produce new distributable source archives. stage Move archives to staging area for upload. @@ -83,17 +82,8 @@ do_build() { maybe_build() { [ -f "src/openocd" ] || do_build; } do_build_clean() { [ -f Makefile ] && make maintainer-clean >/dev/null; } -do_changelog() { - echo "Creating ChangeLog..." - local CMD=tools/git2cl/git2cl - eval ${CMD} ${OPTS} > ChangeLog -} -do_changelog_clean() { - git checkout ChangeLog -} do_package() { - do_changelog maybe_build echo "Building distribution packages..." make ${MAKE_OPTS} distcheck 2>&1 | perl tools/logger.pl > "release-pkg.log" @@ -120,14 +110,12 @@ do_stage() { mv -v "${FILE}" archives/ done cp -a NEWS archives/ - cp -a ChangeLog archives/ } do_stage_clean() { rm -v -f -r archives; } do_clean() { do_build_clean do_package_clean - do_changelog_clean rm -v -f release-*.log } do_clean_all() { @@ -195,12 +183,13 @@ do_release_step_news() { git mv "NEWS" "NEWS-${RELEASE_VERSION}" cat >NEWS <<NEWS -This file should include items worth mentioning in the -OpenOCD ${NEXT_RELEASE_VERSION} source archive release. - -The following areas of OpenOCD functionality changed in this release: +This file includes highlights of the changes made in the +OpenOCD ${NEXT_RELEASE_VERSION} source archive release. See the +repository history for details about what changed, including +bugfixes and other issues not mentioned here. JTAG Layer: +Boundary Scan: Target Layer: Flash Layer: Board, Target, and Interface Configuration Scripts: @@ -208,8 +197,11 @@ Documentation: Build and Release: For more details about what has changed since the last release, -see the ChangeLog associated with this source archive. For older NEWS, -see the NEWS files associated with each release (i.e. NEWS-<version>). +see the git repository history. With gitweb, you can browse that +in various levels of detail. + +For older NEWS, see the NEWS files associated with each release +(i.e. NEWS-<version>). For more information about contributing test reports, bug fixes, or new features and device support, please read the new Developer Manual (or @@ -353,9 +345,9 @@ CMD=$1 [ "${CMD}" ] || usage shift -ACTION_CMDS="bootstrap|configure|build|changelog|package|stage|clean" +ACTION_CMDS="bootstrap|configure|build|package|stage|clean" MISC_CMDS="all|info|release|branch|reset|help|usage" -CLEAN_CMDS="build_clean|changelog_clean|package_clean|stage_clean|clean_all" +CLEAN_CMDS="build_clean|package_clean|stage_clean|clean_all" CMDS="|${ACTION_CMDS}|${CLEAN_CMDS}|${MISC_CMDS}|" is_command() { echo "${CMDS}" | grep "|$1|" >/dev/null; } ----------------------------------------------------------------------- Summary of changes: doc/manual/release.txt | 4 +--- tools/release.sh | 32 ++++++++++++-------------------- 2 files changed, 13 insertions(+), 23 deletions(-) hooks/post-receive -- Main OpenOCD repository |