d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework the checking out of the doc, src, and ports trees a bit to make it

Browse Source 
more manageable.
- Add some helper variables (CVS_{SRC,DOC,PORTS}ARGS) to be used when
  using CVS to checkout files.  We stick release tags in these helper
  variables if they are defined and then use only one cvs command instead
  of two cvs commands with an .ifdef to choose between them.
- rm the old src/doc/ports directories as separate commands from the
  CVS comands so that the rm commands don't need to be duplicated.
- Simplify the DOMINIMALDOCPORTS case by overriding RELEASEPORTSMODULE to
  be ${MINIMALDOCPORTS} thus removing yet another nearly-duplicate cvs
  command in an .ifdef.
- Add support for grabbing src/ and doc/ from external directories
  specified via EXTSRCDIR and EXTDOCDIR instead of from CVS.  The same
  is not done for ports/ quite yet as the DOMINIMALDOCPORTS case is a
  bit tricky.

The rerelease target scripts have not been changed to use the helper
variables yet, so there is still some room for improvement.

Submitted by:	kuriyama (4)
This commit is contained in:
John Baldwin 2002-11-15 22:03:25 +00:00
parent 22eef9d51e
commit d9d84e0728
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=106963
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
release/Makefile
View File

@ -104,6 +104,7 @@ RELNOTES_LANG?= en_US.ISO8859-1
.if defined(NOPORTS) && !defined(NODOC)
DOMINIMALDOCPORTS= YES
.include "Makefile.inc.docports"
RELEASEPORTSMODULE= ${MINIMALDOCPORTS}
.endif
# Helper variable
@ -300,6 +301,21 @@ WMAKEENV!= echo MAKEFLAGS=\"-m ${.CURDIR}/../share/mk\"; \
cd ${.CURDIR}/..; ${CROSSMAKE} -f Makefile.inc1 -V WMAKEENV
WMAKE= ${WMAKEENV} ${MAKE}
CVS_SRCARGS= -P
.if defined(RELEASETAG)
CVS_SRCARGS+= -r ${RELEASETAG}
.endif
CVS_DOCARGS= -P
.if defined(DOCRELEASETAG)
CVS_DOCARGS+= -r ${DOCRELEASETAG}
.endif
CVS_PORTSARGS= -P
.if defined(PORTSRELEASETAG)
CVS_PORTSARGS+= -r ${PORTSRELEASETAG}
.endif
rerelease release:
.if !defined(CHROOTDIR) || !defined(BUILDNAME) || !defined(CVSROOT)
@echo "To make a release you must set CHROOTDIR, BUILDNAME and CVSROOT" && false
@ -327,37 +343,33 @@ rerelease release:
if [ -f /etc/resolv.conf ]; then \
cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \
fi
.if !defined(RELEASETAG)
cd ${CHROOTDIR}/usr && rm -rf src && \
${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASESRCMODULE}
rm -rf ${CHROOTDIR}/usr/src
.if defined(EXTSRCDIR)
cd ${CHROOTDIR}/usr && \
cp -R ${EXTSRCDIR} src
.else
cd ${CHROOTDIR}/usr && rm -rf src && \
${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${RELEASETAG} ${RELEASESRCMODULE}
cd ${CHROOTDIR}/usr && \
${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_SRCARGS} ${RELEASESRCMODULE}
.endif
.if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES})
cd ${CHROOTDIR}/usr/src && patch ${PATCH_FLAGS} < ${LOCAL_PATCHES}
.endif
.if defined(LOCAL_SCRIPT) && exists(${LOCAL_SCRIPT})
cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT}
.endif
rm -rf ${CHROOTDIR}/usr/ports
.if !defined(NOPORTSATALL)
cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_PORTSARGS} ${RELEASEPORTSMODULE}
.endif
.if !defined(NOPORTS)
.if defined(PORTSRELEASETAG)
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 && ${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 && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${PORTSRELEASETAG} ${MINIMALDOCPORTS}
.else
cd ${CHROOTDIR}/usr && rm -rf ports && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${MINIMALDOCPORTS}
.endif
cd ${CHROOTDIR}/usr/ports && ${MAKEREADMES}
.endif
.if !defined(NODOC)
.if defined(DOCRELEASETAG)
cd ${CHROOTDIR}/usr && rm -rf doc && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${DOCRELEASETAG} ${RELEASEDOCMODULE}
rm -rf ${CHROOTDIR}/usr/doc
.if defined(EXTDOCDIR)
cd ${CHROOTDIR}/usr && cp -R ${EXTDOCDIR} doc
.else
cd ${CHROOTDIR}/usr && rm -rf doc && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASEDOCMODULE}
cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_DOCARGS} ${RELEASEDOCMODULE}
.endif
if [ -d ${RELEASEDISTFILES}/ ]; then \
cp -rp ${RELEASEDISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \