[22648] trunk/base

[source_changes at macosforge.org]

Revision: 22648
          http://trac.macosforge.org/projects/macports/changeset/22648
Author:   jmpp at macports.org
Date:     2007-03-08 20:46:13 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------

We don't always want the "distfromsvn" target of the main Makefile to build the full archive tarballs
(the ones including the dports tree), for instance when testing rc's we may only want base tarballs, so
lets add a conditional there.

I'm also updating the ReleaseProcess file to reflect this change and to use the recommended URL -> URL syntax
for the copy command when branching and tagging.

Modified Paths:
--------------
    trunk/base/Makefile.in
    trunk/base/ReleaseProcess

Modified: trunk/base/Makefile.in
===================================================================
--- trunk/base/Makefile.in	2007-03-09 00:36:30 UTC (rev 22647)
+++ trunk/base/Makefile.in	2007-03-09 04:46:13 UTC (rev 22648)
@@ -68,13 +68,15 @@
 
 _dopkg: _gettag _pkgdist
 
-# This target fetches a tagged distribution from cvs, and generates tarballs and checksums for it
+# This target fetches a tagged distribution from svn, and generates tarballs and checksums for it
 distfromsvn:
 	@[ -n "${DISTVER}" ] || ( echo Must specify DISTVER, like: make DISTVER=1.4 dist; exit 1 )
 	[ -d ${DISTDIR} ] || mkdir ${DISTDIR}
 	rm -f ${DISTDIR}/${DISTNAME}.chk.txt
 	${MAKE} PKGNAME=${DISTNAME} REPOPATH=macports/base SVNTAG=${DISTTAG} _dopkg
+ifeq ($(ARC),yes) 
 	${MAKE} PKGNAME=${DISTARCNAME} REPOPATH=macports SVNTAG=${DISTARCTAG} _dopkg
+endif
 
 test::
 

Modified: trunk/base/ReleaseProcess
===================================================================
--- trunk/base/ReleaseProcess	2007-03-09 00:36:30 UTC (rev 22647)
+++ trunk/base/ReleaseProcess	2007-03-09 04:46:13 UTC (rev 22648)
@@ -35,7 +35,7 @@
 * 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:
 
- svn copy -r<rev> http://svn.macports.org/repository/macports/trunk/base/ http://svn.macports.org/repository/macports/branches/release_1_4
+ svn cp -r<rev> http://svn.macports.org/repository/macports/trunk/base/ http://svn.macports.org/repository/macports/branches/release_1_4
 
 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, optional for beta snapshots) into the /tags svn directory.
 
@@ -66,7 +66,7 @@
 
 We first tag the branched base directory for the release
 
- svn copy branches/release_1_4 http://svn.macports.org/repository/macports/tags/release_1_4_0
+ svn cp http://svn.macports.org/repository/macports/branches/release_1_4 http://svn.macports.org/repository/macports/tags/release_1_4_0
 
 Although only the base subdirectory is branched and tagged for a given major release, we also create a seperate tag for the entire tree (base sources and full ports tree) at the time a release tag is created, in order to provide a stake in the ground that specifies a set of ports intended to work with that release. Note that this tag incorporates the entire svn trunk directory at TOT (top of tree), except for the base directory which is kept at the point of the release.
 
@@ -93,7 +93,7 @@
 
  make DISTVER=1.4 DISTTAG=release_1_4_0 distfromsvn
 
-Note that DISTTAG is generated from DISTVER automatically. But our naming convention drops the last .0 in the DISTNAME, so for x.y.0 releases, you want to specify these distinctly, as above.
+Note that DISTTAG is generated from DISTVER automatically. But our naming convention drops the last .0 in the DISTNAME, so for x.y.0 releases, you want to specify these distinctly, as above. Also, you need to pass the "ARC=yes" flag on the command line to the "distfromsvn" target if you wish to produce tarballs for the full archive.
 
 These tarballs are uploaded via svn to http://svn.macports.org/repository/macports/downloads/MacPorts-1.4/ directory.
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070308/7fc29684/attachment.html