Knobs for src/Make* for SVN "make update" (patch attached)
Brooks Davis
brooks at freebsd.org
Mon Jun 15 18:31:57 UTC 2009
On Sun, Jun 14, 2009 at 11:08:19AM +0100, Mark Murray wrote:
> Hi
>
> Any comments on the attached patch to allow "make update" to work with
> SVN? This time the actual patch is enclosed. :-]
>
> Any brave soul prepared to officially review it? :-)
It basically looks fine to me. I'm not sure why SVNFLAGS needs to be
set at all though. Isn't -rHEAD implicit?
-- Brooks
Content-Description: src_makefile.diff
> Index: Makefile.inc1
> ===================================================================
> --- Makefile.inc1 (revision 194177)
> +++ Makefile.inc1 (working copy)
> @@ -94,6 +94,8 @@
>
> CVS?= cvs
> CVSFLAGS?= -A -P -d -I!
> +SVN?= svn
> +SVNFLAGS?= -r HEAD
> SUP?= /usr/bin/csup
> SUPFLAGS?= -g -L 2
> .if defined(SUPHOST)
> @@ -854,11 +867,25 @@
> .endif
> .endif
> .if defined(CVS_UPDATE)
> - @echo "--------------------------------------------------------------"
> - @echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT}
> - @echo "--------------------------------------------------------------"
> - cd ${.CURDIR}; ${CVS} -R -q update ${CVSFLAGS}
> + @cd ${.CURDIR} ; \
> + if [ -d CVS ] ; then \
> + echo "--------------------------------------------------------------" ; \
> + echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \
> + echo "--------------------------------------------------------------" ; \
> + echo ${CVS} -R -q update ${CVSFLAGS} ; \
> + ${CVS} -R -q update ${CVSFLAGS} ; \
> + fi
> .endif
> +.if defined(SVN_UPDATE)
> + @cd ${.CURDIR} ; \
> + if [ -d .svn ] ; then \
> + echo "--------------------------------------------------------------" ; \
> + echo ">>> Updating ${.CURDIR} using Subversion" ; \
> + echo "--------------------------------------------------------------" ; \
> + echo ${SVN} update ${SVNFLAGS} ; \
> + ${SVN} update ${SVNFLAGS} ; \
> + fi
> +.endif
>
> #
> # ------------------------------------------------------------------------
> _______________________________________________
> freebsd-current at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe at freebsd.org"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20090615/49db546d/attachment.pgp
More information about the freebsd-current
mailing list