From owner-ctm-users@FreeBSD.ORG Sat Nov 15 20:41:26 2014 Return-Path: Delivered-To: ctm-users@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C08E0BF for ; Sat, 15 Nov 2014 20:41:26 +0000 (UTC) Received: from um-tip2-missouri-out.um.umsystem.edu (um-tip2-missouri-out.um.umsystem.edu [198.209.49.149]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "um-tip1.um.umsystem.edu", Issuer "InCommon Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 6D02E385 for ; Sat, 15 Nov 2014 20:41:25 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ag8FALK5Z1TPoJ7Q/2dsb2JhbABbFoJ5VVkEzRWHTgKBEhYBAQEBAQN6gmssDV4BAQEDAXgBBQsCAQgYCRYPCQMCAQIBICUCBA0BBQIBAYg0CQ3KcQGGAgEBCAEBAQEBARyPAIFvMweESwWSR405g1SICoIshzyDfG2BSIEDAQEB X-IPAS-Result: Ag8FALK5Z1TPoJ7Q/2dsb2JhbABbFoJ5VVkEzRWHTgKBEhYBAQEBAQN6gmssDV4BAQEDAXgBBQsCAQgYCRYPCQMCAQIBICUCBA0BBQIBAYg0CQ3KcQGGAgEBCAEBAQEBARyPAIFvMweESwWSR405g1SICoIshzyDfG2BSIEDAQEB Received: from um-ncas4.um.umsystem.edu ([207.160.158.208]) by um-tip2-exch-relay.um.umsystem.edu with ESMTP; 15 Nov 2014 14:40:14 -0600 Received: from UM-MBX-N02.um.umsystem.edu ([169.254.5.198]) by UM-NCAS4.um.umsystem.edu ([207.160.158.208]) with mapi id 14.03.0210.002; Sat, 15 Nov 2014 14:40:14 -0600 From: "Montgomery-Smith, Stephen" To: "Julian H. Stacey" Subject: Re: suggestion of src-cur src/.svn_revision Thread-Topic: suggestion of src-cur src/.svn_revision Thread-Index: AQHQAOUT3S1mti/D2k+tqcwpvrEZXpxii3YA Date: Sat, 15 Nov 2014 20:40:13 +0000 Message-ID: <5467BA24.7090507@missouri.edu> References: <201411151502.sAFF1lmJ046626@fire.js.berklix.net> In-Reply-To: <201411151502.sAFF1lmJ046626@fire.js.berklix.net> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 x-originating-ip: [207.160.158.205] Content-Type: text/plain; charset="Windows-1252" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Cc: "ctm-users@freebsd.org" X-BeenThere: ctm-users@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: CTM User discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Nov 2014 20:41:26 -0000 On 11/15/2014 09:01 AM, Julian H. Stacey wrote: > "Montgomery-Smith, Stephen" wrote: >> On 11/14/2014 04:29 AM, Julian H. Stacey wrote: >>> Hi Stephen, >>> >>> Wed, 05 Nov 2014 16:29:29 +0100 I wrote ctm-users@freebsd.org >>> >>>> So there is no place where ctm src-cur users can refer to SVN revision= number, >>>> So I suggest the ctm generator could be slightly extended eg approx: >>>> svn export file:///usr/svn/base/head > ../output >>>> tail -1 ../output | sed -e 's/Exported revision //' \ >>>> | sed -e 's/.$//' > head/.svn_revision >>> >>> Any chance you could try adding code above or similar please ? >> >> It was surprisingly easy to implement. Tell me if there are any problem= s. >=20 > Working nicely here thanks Stephen, great that you've done them all :-) One problem I encountered is that the SVN release number can increase without there being any actual changes to that particular branch. So mkctm has now been rewritten so that the delta is created only when there are actual changes, not just an SVN revision update. Otherwise branches like svn-4 will be spitting out new deltas which only update the SVN revision. > I see with my http://www.berklix.com/~jhs/src/bsd/jhs/bin/local/ctms/ctms >=20 > /pub/FreeBSD/branches/-current/ports ports-cur 10647 372594 > /pub/FreeBSD/branches/-current/src src-cur 11700 274549 > /pub/FreeBSD/branches/10.0-stable/src src-10 520 274548 > /pub/FreeBSD/branches/4.0-stable/src src-4 2355 274538 > /pub/FreeBSD/branches/5.0-stable/src src-5 862 274538 > /pub/FreeBSD/branches/6.0-stable/src src-6 1653 274538 > /pub/FreeBSD/branches/7.0-stable/src src-7 1734 274538 > /pub/FreeBSD/branches/8.0-stable/src src-8 1834 274548 > /pub/FreeBSD/branches/9.0-stable/src src-9 1325 274548 > /pub/FreeBSD/development/CTM/ports-cur ports-cur.10647.gz > /pub/FreeBSD/development/CTM/src-10 src-10.0520.gz > /pub/FreeBSD/development/CTM/src-4 src-4.2355.gz > /pub/FreeBSD/development/CTM/src-5 src-5.0862.gz > /pub/FreeBSD/development/CTM/src-6 src-6.1653.gz > /pub/FreeBSD/development/CTM/src-7 src-7.1734.gz > /pub/FreeBSD/development/CTM/src-8 src-8.1834.gz > /pub/FreeBSD/development/CTM/src-9 src-9.1325.gz > /pub/FreeBSD/development/CTM/src-cur src-cur.11700.gz > /pub/FreeBSD/development/CTM/svn-cur svn-cur.03024.xz > /pub/FreeBSD/development/FreeBSD-SVN svn-cur 3024=20 >=20 >=20 > I suggest one of us submit this or similar for 'man ctm' FILES section: >=20 > *** 11.0-CURRENT/src/usr.sbin/ctm/ctm/ctm.1 Sat Nov 15 15:34:47 2014 > --- new/src/usr.sbin/ctm/ctm/ctm.1 Sat Nov 15 15:52:38 2014 > *************** > *** 275,280 **** > --- 275,290 ---- > Changing > or removing this file will greatly confuse > .Nm . > + .sp > + .Pa .svn_revision > + contains the revision number emitted by SVN=20 > + .\" eg from approx > + .\" svn export file:///usr/svn/base/head > ../output > + .\" tail -1 ../output | sed -e 's/Exported revision //' \ > + .\" | sed -e 's/.$//' > head/.svn_revision > + (to reference when discussing sources with users of=20 > + .Nm svn > + direct). > .Pp > Using the > .Fl e >=20 > Cheers, > Julian >=20 This was the actual code I used to create (for example) src-8. cd ~library cd ctm/Temps/FreeBSD-8 svn up src svn up src | tail -1 | sed -E 's/[^[:digit:]]//g' > src/.svn_revision cd ~library ctm/ctm_generation/mkCTM ctm_conf.src-8 /usr/home/library/ctm/bin/create-INDEX One of us could file a PR with the appropriate changes to the ctm man page, but all my other PRs for ctm/mkctm have been ignored. However, I'll add the change to the svn-cur patches.=