From 4b82e58b440c0c9946ec497e95e0d75e8de603d1 Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Tue, 8 Jul 2008 21:48:48 -0400 Subject: [PATCH] Preliminary updates to get release.txt updated to Git. Signed-off-by: Edward Z. Yang --- release.txt | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/release.txt b/release.txt index ea9f9e0..ddb9713 100644 --- a/release.txt +++ b/release.txt @@ -8,30 +8,26 @@ In order to perform a release, a few steps have to be taken: # [@] Run `php release1-update.php $VERSION` (bumps version numbers) # [if necessary] Bump version numbers in TODO # Write new WHATSNEW and FOCUS entry - # Commit as "Release x.y.z." - -[Manage auxiliary branches] -if ( need to deprecate old branch ) { - # Obsolete old release series - - Add OBSOLETE file with text: - x.y branch was fully obsoleted by release of x.y.0. It is no longer supported. - Bug and security fixes will not be issued regardless of security. - ...and then info on backwards incompatible changes. - - Add line to NEWS: - x.y branch was fully obsoleted by release of x.y.0. It is no longer supported. -} elseif ( creating a new branch for sub-release ) { - # If branch doesn't exist yet, branch from the last tag - # Update switch2branch script, replacing version number - # Open log for trunk, then switch to branch - # Merge changes into branch, commit as "Merged r#s for x.y.z release into branch" - - Be sure to remove future items from NEWS -} - -[Perform release] -# [@] `php release2-tag.php` (tags the releases) + # Commit as "Release x.y.z." and push +# `git tag -u 0x869C48DA v1.2.3` (0x869C48DA is Edward's master private key; + substitute with your own if you're making a release.) (NOT TESTED!) + (CANNOT USE LAPTOP FOR RELEASE!) +# svn import a clean Git checkout of the tag with the .git directory removed + to svn+ssh://ezyang@htmlpurifier.org/svnroot/htmlpurifier/tags/1.2.3 + (even better s/htmlpurifier.org/SVN.HTMLPurifier/ if you have the appropriate + PuTTY session registered) (NOT TESTED!) + + ( SKETCHY! This section has not been completed yet. ) + # [@] Build the zip and tar.gz files: - Run `./build.sh $VERSION` on the server, download with 'download.bat' + (THIS PART is BROKEN, due to our old-version guard. Have download.bat + bypass this) - Run build.bat on Windows computer, upload the files + ( Careful with EOL style!) + + ( Should get some sort of repos that contains just the pristine tarballs/zips??? ) + # [@] Build the PEAR release using package_pear.bat (package.php and `pear package`) # [@] Run sum-all.bat (generates sha1 checksums) # [@] Run sign-all.bat, enter password when prompted (signs releases) @@ -40,10 +36,10 @@ if ( need to deprecate old branch ) { . Write a news entry describing the release (see WHATSNEW) - current.ent . Bump version number and date - - Switch the external for live/ + - Switch the external for live/ (this means updating the submodule to + the tag) - Update .htaccess.in -# Update (svn update) -# Commit (svn commit) +# Commit and push == Post-procedures == @@ -62,6 +58,7 @@ if ( need to deprecate old branch ) { . Change version number in subject field . Use: news item on webpage (add link to webpage as HTML Purifier), download links (substitute in htmlpurifier.org), sha-1 sums. + (NOT using GPGShell anymore. Figure out command line args to use on gpg) - Hotscripts listing . Step 1-3: No changes . Step 4: Bump version number in two fields -- 2.11.4.GIT