Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Jun 2014 09:24:53 -0600
From:      Warner Losh <imp@bsdimp.com>
To:        Boris Samorodov <bsam@passap.ru>
Cc:        freebsd-arm@FreeBSD.org
Subject:   Re: [crochet] Introduce SVN_CMD at lib/subversion.sh
Message-ID:  <AD763CE5-FF5C-46B2-9DC6-D6D419CE4684@bsdimp.com>
In-Reply-To: <53AD89C7.7010403@passap.ru>
References:  <53AD4BBF.9060202@passap.ru> <A538E7D1-6A70-4B45-AD34-F314D6E75CE3@bsdimp.com> <53AD89C7.7010403@passap.ru>

next in thread | previous in thread | raw e-mail | index | archive | help

--Apple-Mail=_559AF028-445E-4F13-9B08-1DDA32A60904
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=utf-8


On Jun 27, 2014, at 9:12 AM, Boris Samorodov <bsam@passap.ru> wrote:

> Signed PGP part
> 27.06.2014 18:53, Warner Losh =D0=BF=D0=B8=D1=88=D0=B5=D1=82:
> >
> > On Jun 27, 2014, at 4:47 AM, Boris Samorodov <bsam@passap.ru> wrote:
> >
> >> Hi Tim, All!
> >>
> >> Sometimes I use systems which have only svnlite version.
> >> I propose a patch to let crochet work at those systems as well:
> >
> > Where is SVN_CMD set?
>=20
> Look further at [*]

Ah. Need more caffeine.

> > Most other things in the system would just call this SVN. Is there a =
reason we need the _CMD?
>=20
> No reason. The name was inspired by the port's system (like ECHO_CMD,
> etc.). I'm fine with whatever name.

Yea, some parts of the project like to have a _CMD (like ports), while =
other parts only do _CMD
when the command name has been stolen for something else (like the build =
and nanobsd).

Warner


> > Warner
> >
> >> -----
> >> --- lib/subversion.sh.orig  2014-03-30 13:28:41.000000000 +0400
> >> +++ lib/subversion.sh       2014-06-27 14:37:01.668105743 +0400
> >> @@ -1,15 +1,16 @@
> >> +: ${SVN_CMD:=3D`which svn 2>/dev/null || which svnlite =
2>/dev/null`}
>=20
> [*]
>=20
> >> svn_update_sourcetree ( ) {
> >>     echo "Updating source tree ${FREEBSD_SRC}"
> >>     cd ${FREEBSD_SRC}
> >> -    svn update > ${WORKDIR}/_.svnupdate.log
> >> +    ${SVN_CMD} update > ${WORKDIR}/_.svnupdate.log
> >>     cd ${TOPDIR}
> >> }
> >>
> >> svn_get_revision ( ) {
> >>     _PWD=3D`pwd`
> >>     cd ${FREEBSD_SRC}
> >> -    SOURCE_VERSION=3D`svn info |grep Revision: |cut -c11-`
> >> +    SOURCE_VERSION=3D`${SVN_CMD} info |grep Revision: |cut -c11-`
> >>     cd $_PWD
> >>     echo "Source version is: ${SOURCE_VERSION:-unknown}";
> >> }
> >> -----
>=20
> --
> WBR, Boris Samorodov (bsam)
> FreeBSD Committer, http://www.FreeBSD.org The Power To Serve
>=20


--Apple-Mail=_559AF028-445E-4F13-9B08-1DDA32A60904
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP using GPGMail

-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - https://gpgtools.org

iQIcBAEBCgAGBQJTrYzFAAoJEGwc0Sh9sBEAWo0P/1HndbBjtbeiVFN5867Lg58c
4hkixd8fwlpoxPxA5IGcWSV1G/cGE1Wv5PASadQfg5DSZ7jKrCgFAmqr2UczTIG+
8oTct32Su9UGGI6OGVQEYebUgB/C7Tr0NS0D8AwoXmxLHdmgzha8eAE2aoqzl4pi
cfXqWFJ6OT1cBUnNyV2cgm9KB3zgr/5FIXCQPOMeBtCS2hzG6LKfK2vfptRAyXVk
plUrDSjcOXYgANWSjyi8JylXf4Z4Gnmp08itQ3jtxI0pJmBqDjjv1WGAccPsmKFP
0H7GMWquJ96d0Uxir16T20HcStCOcaFAbWx6rJvFCg0pYMkeXSNg9mxsYoKlFjeu
gFZhx/ouSkjrjy3xp/mSFAXIT7TYeLjTF0Ao9fiEOe5BI5rrozBqZKuiXxT/R0sK
dPY1xDjPsGqGvk97vVEK0czN3nZWTO4khaB8VCd6JBJkg8NrJpaKvPBDp2s7stAW
QSSIuRx6ARcse7stq24htmNHk81a5vSN1q+8l+RM3i9yK5M4EGA9RfSvy3mJ1/Fb
Z5RhJR+wYNae+8xzPnYYcRaP403NPwLEA0DhyU4kDMYSiuiOIgowiMlh4dabFNBC
ayU4dlBNuCyeyZeW5cC/q9qAKpQO9b+Zw4pUn9ZR/Esm2LIFr2+K04OcHSH96/LD
KA0il6QmFTJN+0iwEm1Z
=K8J+
-----END PGP SIGNATURE-----

--Apple-Mail=_559AF028-445E-4F13-9B08-1DDA32A60904--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AD763CE5-FF5C-46B2-9DC6-D6D419CE4684>