[31129] branches/release_1_6/base

Fri Nov 16 09:17:02 PST 2007

Revision: 31129
          http://trac.macosforge.org/projects/macports/changeset/31129
Author:   jmpp at macports.org
Date:     2007-11-16 09:17:01 -0800 (Fri, 16 Nov 2007)

Log Message:
-----------
Merged revisions 31126-31128 via svnmerge from 
http://svn.macports.org/repository/macports/trunk/base

........
  r31128 | jmpp at macports.org | 2007-11-16 13:10:10 -0400 (Fri, 16 Nov 2007) | 6 lines
  
  
  Update the ReleaseProcess file to reflect the 1.6 release examples.
  Also provide extended instructions on svnmegre.py and better explanation for the creation of the "archive" branch.
  Lastly, our new website will be live soon, so indicate again that that needs to be updated too to reflect new releases.
........

Modified Paths:
--------------
    branches/release_1_6/base/portmgr/ReleaseProcess

Property Changed:
----------------
    branches/release_1_6/base/


Property changes on: branches/release_1_6/base
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/base:1-31125
   + /trunk/base:1-31128

Modified: branches/release_1_6/base/portmgr/ReleaseProcess
===================================================================

--- branches/release_1_6/base/portmgr/ReleaseProcess	2007-11-16 17:10:10 UTC (rev 31128)
+++ branches/release_1_6/base/portmgr/ReleaseProcess	2007-11-16 17:17:01 UTC (rev 31129)
@@ -31,17 +31,17 @@
 
 === Create a Release Branch ===
 
-For each major release (i.e. 1.3.x, 1.4.x, etc.) an appropriate branch is created with a
+For each major release (i.e. 1.5.x, 1.6.x, etc.) an appropriate branch is created with a
 consistent name. To do this, two things are required:
 
  * Choose the svn revision from which to create the branch, most likely based off trunk.
- * Create the branch (e.g. release_1_4) through the svn "copy" command for history preservation,
+ * Create the branch (e.g. release_1_6) through the svn "copy" command for history preservation,
    first creating the needed branch directory to preserve the required directory structure
    (the 'base' directory level *needs* to exist in each release branch, otherwise selfupdate breaks):
 
- svn mkdir -m "commit-message" http://svn.macports.org/repository/macports/branches/release_1_4
+ svn mkdir -m "commit-message" http://svn.macports.org/repository/macports/branches/release_1_6
  svn cp [-r<rev>] -m "commit-message" http://svn.macports.org/repository/macports/trunk/base \
-     http://svn.macports.org/repository/macports/branches/release_1_4
+     http://svn.macports.org/repository/macports/branches/release_1_6
 
 The actual release, alpha or beta releases, release candidates, and any point releases will all
 live on this branch, and tagged appropriately and if necessary (a must for the actual releases,
@@ -51,9 +51,16 @@
 
 It is strongly recommended to use the svnmerge.py tool (provided by the subversion port) to
 maintain merge tracking information between release branches and trunk/base if you pretend to
-merge revisions back and forth between them, which is a very likely scenario.
+merge revisions back and forth between them, which is a very likely scenario. To do this, you
+must initialize the tracking information from within the "base" directory of your checkout of
+the branch you intend to manage:
 
+ svn co http://svn.macports.org/repository/macports/branches/release_1_6 branches/release_1_6
+ cd branches/release_1_6/base
+ svnmerge.py init
+ svn ci -F svnmerge-commit-message.txt
 
+
 === Prepare the code for Release ===
 
 In preparation for a release, several things should be completed within the code:
@@ -61,7 +68,7 @@
  * Update the file base/ChangeLog in both trunk and the relase branch to reflect the appropriate changes.
  * Update the file base/config/mp_version with the target release number. Note that this is a floating
    point number that corresponds to the release number; it should correspond roughly to the release number
-   where possible. Release 1.4.1, for instance, would be represented by the floating point number 1.410.
+   where possible. Release 1.6.1, for instance, would be represented by the floating point number 1.610.
    The version number in mp_version is displayed by the port command as the version of MacPorts,
    and is used by the selfupdate command to determine whether a newer version of code is available.
    This number should be different between trunk and a release branch, the former greater to differentiate
@@ -81,15 +88,15 @@
 
 Tagging conventions:
 
- * release_1_4_0-rc1 (release candidate 1 for release 1.4.0)
- * release_1_4_0 (tagged release 1.4.0)
- * release_1_4_0-archive (tagged release 1.4.0 -- complete archive)
- * release_1_4_1 (1.4.1 release)
+ * release_1_6_0-rc1 (release candidate 1 for release 1.6.0)
+ * release_1_6_0 (tagged release 1.6.0)
+ * release_1_6_0-archive (tagged release 1.6.0 -- complete archive)
+ * release_1_6_1 (1.6.1 release)
 
 We first tag the branched base directory to make up for the final release:
 
- svn cp -m "commit-message" http://svn.macports.org/repository/macports/branches/release_1_4 \
-     http://svn.macports.org/repository/macports/tags/release_1_4_0
+ svn cp -m "commit-message" http://svn.macports.org/repository/macports/branches/release_1_6 \
+     http://svn.macports.org/repository/macports/tags/release_1_6_0
 
 Although only the base subdirectory is branched and tagged for a given major release, we also create a 
 separate tag for the entire tree (base sources and full ports tree) at the time the final release tag is
@@ -101,13 +108,14 @@
 revision of the final tagging of base and then switching the base directory inturn to the appropriate
 release tag URL. For instance:
 
- svn co [-r<rev>] http://svn.macports.org/repository/macports/trunk macports/release-1.4.0
- cd macports/release-1.4.0/base
- svn switch http://svn.macports.org/repository/macports/tags/release_1_4_0/base
+ svn co [-r<rev>] http://svn.macports.org/repository/macports/trunk release_1.6.0-archive
+ cd release_1.6.0-archive/base
+ svn switch http://svn.macports.org/repository/macports/tags/release_1_6_0/base
 
-And finally we tag the entire directory as release_1_4_0-archive:
+And finally we tag the entire directory as release_1_6_0-archive:
 
- svn cp -m "commit-message" macports/release-1.4.0 http://svn.macports.org/repository/tags/release_1_4_0-archive
+ cd ../../
+ svn cp -m "commit-message" release_1.6.0-archive http://svn.macports.org/repository/tags/release_1_6_0-archive
 
 
 === Create & Post Release Tarballs ===
@@ -115,23 +123,23 @@
 The release tarballs are tar.bz2 and tar.gz archives of the  base directory only and of the entire svn tree
 for a particular release. They are named with the following naming convention:
 
- MacPorts-1.4.0.tar.{bz2,gz} (base directory only, corresponding to tag release_1_4_0)
- MacPorts-1.4.0-archive.tar.{bz2,gz} (complete archives corresponding to tag release_1_4_0-archive)
+ MacPorts-1.6.0.tar.{bz2,gz} (base directory only, corresponding to tag release_1_6_0)
+ MacPorts-1.6.0-archive.tar.{bz2,gz} (complete archives corresponding to tag release_1_6_0-archive)
 
 The following commands issued to the top level Makefile will generate the archives and checksums:
 
- make DISTVER=1.4.0 distfromsvn
+ make DISTVER=1.6.0 distfromsvn
 
 Note that you need to pass the "ARC=yes" flag on the command line to the "distfromsvn" top-level make target
 if you also wish to produce the full archive tarballs.
 
-All these tarballs are uploaded via svn to the http://svn.macports.org/repository/macports/downloads/MacPorts-1.4.0/
+All these tarballs are uploaded via svn to the http://svn.macports.org/repository/macports/downloads/MacPorts-1.6.0/
 directory.
 
 Additionally, a file is created, and posted to the same location, that contains md5, sha1, and rmd160 checksums
 for each of the files:
 
- MacPorts-1.4.0.chk.txt
+ MacPorts-1.6.0.chk.txt
  (We should have a way to sign these checksums, and have the signer's keys posted somewhere.
  Security experts in the project, would you be interested in leading this effort? Eric? Mark? Anyone else?)
 
@@ -142,8 +150,8 @@
 MacPorts releases (1.x.0), named in a consistent fashion and incorporating the OS version for which it
 was built.
 
- MacPorts-1.4.0-10.3.dmg
- MacPorts-1.4.0-10.4.dmg
+ MacPorts-1.6.0-10.4.dmg
+ MacPorts-1.6.0-10.5.dmg
 
 To create the disk image use the MacPorts port. The Portfile will need to be updated to incorporate the
 proper release version and checksums, and the release tarballs will need to be already uploaded to the
@@ -157,8 +165,8 @@
 file up at the downloads directory:
 
  cd work
- mv MacPorts-1.4.0.dmg MacPorts-1.4.0-10.4.dmg
- for type in -md5 -sha1 -ripemd160; do openssl dgst $type MacPorts-1.4.0-10.4.dmg; done
+ mv MacPorts-1.6.0.dmg MacPorts-1.6.0-10.5.dmg
+ for type in -md5 -sha1 -ripemd160; do openssl dgst $type MacPorts-1.6.0-10.5.dmg; done
 
 These new products, along with the new checksums, also have to be posted to the appropriate downloads
 directory of the MacPorts svn repository. Developers are required to validate the generated installer as
@@ -201,6 +209,7 @@
 Once the release has been posted, notification of the release should be sent/posted to the following places:
 
  * The macports-users at lists.macosforge.org and macports-dev at lists.macosforge.org mailing lists.
+ * The MacPorts website, by adapting the $mp_version_major and $mp_version_latest variables as appropriate in the trunk/www/includes/common.inc file.
  * Apple's [http://www.apple.com/downloads/macosx/unix_open_source/macports.html Mac OS X software downloads page] (submitter: jmpp@)
  * [http://freshmeat.net/projects/macports/ Freshmeat] (submitter: mww@)
  * [http://www.versiontracker.com/dyn/moreinfo/macosx/26679 VersionTracker] (submitter: mij@)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071116/2104d467/attachment-0001.html
