diff options
| author | John W. De Boskey <jwd@FreeBSD.org> | 2002-11-02 06:00:06 +0000 |
|---|---|---|
| committer | John W. De Boskey <jwd@FreeBSD.org> | 2002-11-02 06:00:06 +0000 |
| commit | d751ad7f198d2724627522c22635b787d6481d88 (patch) | |
| tree | 02985beb5f77e9660f7576407b45183d4fafdae6 /release/Makefile | |
| parent | 5ee0a409fc8dd3961aad72fbfad58eaf2af2b289 (diff) | |
| download | src-d751ad7f198d2724627522c22635b787d6481d88.tar.gz src-d751ad7f198d2724627522c22635b787d6481d88.zip | |
Add CVSARGS for cvs arguments (vs. cvs subcommand arguments).
Allow the cvs command to be prefixed by using CVSPREFIX.
Notes
Notes:
svn path=/head/; revision=106327
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/release/Makefile b/release/Makefile index 50578121f987..5444397f93d9 100644 --- a/release/Makefile +++ b/release/Makefile @@ -32,9 +32,16 @@ BUILDNAME?=${BASE}-${DATE}-SNAP #CHROOTDIR=/junk/release # If this is a -stable snapshot, then set #RELEASETAG=RELENG_4 -# If you want to add other options to CVS commands, then set +# +# To add other options to the CVS subcommands (co,up), set #CVSCMDARGS="-D '01/01/2002 00:00:00 UTC'" # +# To add other options to the CVS command, set +#CVSARGS="-lfq" +# +# To prefix the cvs command +#CVSPREFIX="/usr/bin/time" +# # Non-zero if ${RELEASETAG} is in the form "RELENG_ver_RELEASE"; we # are building an official release. Otherwise, we are building for # a branch. @@ -300,10 +307,10 @@ rerelease release: fi .if !defined(RELEASETAG) cd ${CHROOTDIR}/usr && rm -rf src && \ - cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASESRCMODULE} + ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASESRCMODULE} .else cd ${CHROOTDIR}/usr && rm -rf src && \ - cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${RELEASETAG} ${RELEASESRCMODULE} + ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${RELEASETAG} ${RELEASESRCMODULE} .endif .if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES}) cd ${CHROOTDIR}/usr/src && patch ${PATCH_FLAGS} < ${LOCAL_PATCHES} @@ -313,22 +320,22 @@ rerelease release: .endif .if !defined(NOPORTS) .if defined(PORTSRELEASETAG) - cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${PORTSRELEASETAG} ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES} + cd ${CHROOTDIR}/usr && rm -rf ports && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${PORTSRELEASETAG} ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES} .else - cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES} + cd ${CHROOTDIR}/usr && rm -rf ports && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES} .endif .elif defined(DOMINIMALDOCPORTS) && ${DOMINIMALDOCPORTS} == "YES" .if defined(PORTSRELEASETAG) - cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${PORTSRELEASETAG} ${MINIMALDOCPORTS} + cd ${CHROOTDIR}/usr && rm -rf ports && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${PORTSRELEASETAG} ${MINIMALDOCPORTS} .else - cd ${CHROOTDIR}/usr && rm -rf ports && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P ${MINIMALDOCPORTS} + cd ${CHROOTDIR}/usr && rm -rf ports && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${MINIMALDOCPORTS} .endif .endif .if !defined(NODOC) .if defined(DOCRELEASETAG) - cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${DOCRELEASETAG} ${RELEASEDOCMODULE} + cd ${CHROOTDIR}/usr && rm -rf doc && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${DOCRELEASETAG} ${RELEASEDOCMODULE} .else - cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASEDOCMODULE} + cd ${CHROOTDIR}/usr && rm -rf doc && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASEDOCMODULE} .endif if [ -d ${RELEASEDISTFILES}/ ]; then \ cp -rp ${RELEASEDISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \ @@ -348,20 +355,20 @@ rerelease release: .if make(rerelease) .if !defined(RELEASENOUPDATE) .if !defined(RELEASETAG) - cd ${CHROOTDIR}/usr/src && cvs -R -q update ${CVSCMDARGS} -P -d -A + cd ${CHROOTDIR}/usr/src && ${CVSPREFIX} cvs -R ${CVSARGS} -q update ${CVSCMDARGS} -P -d -A .else - cd ${CHROOTDIR}/usr/src && cvs -R -q update ${CVSCMDARGS} -P -d -r ${RELEASETAG} + cd ${CHROOTDIR}/usr/src && ${CVSPREFIX} cvs -R ${CVSARGS} -q update ${CVSCMDARGS} -P -d -r ${RELEASETAG} .endif .if !defined(NOPORTS) - cd ${CHROOTDIR}/usr/ports && cvs -R -q update ${CVSCMDARGS} -P -d + cd ${CHROOTDIR}/usr/ports && ${CVSPREFIX} cvs -R ${CVSARGS} -q update ${CVSCMDARGS} -P -d .endif .if defined(DOMINIMALDOCPORTS) && ${DOMINIMALDOCPORTS} == "YES" for i in ${MINIMALDOCPORTS}; do \ - ( cd ${CHROOTDIR}/usr/$$i && cvs -R -q update ${CVSCMDARGS} -P -d ) ; \ + ( cd ${CHROOTDIR}/usr/$$i && ${CVSPREFIX} cvs -R ${CVSARGS} -q update ${CVSCMDARGS} -P -d ) ; \ done .endif .if !defined(NODOC) - cd ${CHROOTDIR}/usr/doc && cvs -R -q update ${CVSCMDARGS} -P -d + cd ${CHROOTDIR}/usr/doc && ${CVSPREFIX} cvs -R ${CVSARGS} -q update ${CVSCMDARGS} -P -d .endif .endif .endif |