From 5110237a5c8166de8ba374fce724cf2ab8758812 Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Wed, 16 Oct 2013 07:24:01 -0400 Subject: [PATCH] 4030 remove useless nightly/bldenv options Reviewed by: Andy Stormont Reviewed by: Richard Lowe Approved by: Richard Lowe --- usr/src/tools/scripts/bldenv.sh | 80 +------- usr/src/tools/scripts/nightly.1 | 38 +--- usr/src/tools/scripts/nightly.sh | 407 ++------------------------------------- 3 files changed, 16 insertions(+), 509 deletions(-) diff --git a/usr/src/tools/scripts/bldenv.sh b/usr/src/tools/scripts/bldenv.sh index 9ffdb67839..f5e732886b 100644 --- a/usr/src/tools/scripts/bldenv.sh +++ b/usr/src/tools/scripts/bldenv.sh @@ -42,33 +42,6 @@ function usage exit 2 } -function is_source_build -{ - "${flags.s.e}" || "${flags.s.d}" || "${flags.s.h}" || "${flags.s.o}" - return $? -} - -# -# single function for setting -S flag and doing error checking. -# usage: set_S_flag -# where is the source build type ("E", "D", ...). -# -function set_S_flag -{ - if is_source_build; then - print 'Can only build one source variant at a time.' - exit 1 - fi - - case "$1" in - "E") flags.s.e=true ;; - "D") flags.s.d=true ;; - "H") flags.s.h=true ;; - "O") flags.s.o=true ;; - *) usage ;; - esac -} - typeset -r USAGE=$'+ [-?\n@(#)\$Id: bldenv (OS/Net) 2008-04-06 \$\n] [-author?OS/Net community ] @@ -89,16 +62,6 @@ typeset -r USAGE=$'+ like clobber, install and _msg, which otherwise require digging through large build logs to figure out what is being done.] -[+?bldenv is also useful if you run into build issues with the - source product or when generating OpenSolaris deliverables. - If a source product build is flagged, the environment is set - up for building the indicated source product tree, which is - assumed to have already been created. If the OpenSolaris - deliverables flag (-O) is set in NIGHTLY_OPTIONS, the - environment is set up for building just the open source. - This includes using an alternate proto area, as well as - using the closed binaries in $CODEMGR_WS/closed.skel (which - is assumed to already exist).] [+?By default, bldenv will invoke the shell specified in $SHELL. If $SHELL is not set or is invalid, csh will be used.] @@ -108,14 +71,6 @@ typeset -r USAGE=$'+ [d?set up environment for doing DEBUG builds (default is non-DEBUG)] [t?set up environment to use the tools in usr/src/tools (this is the default, use +t to use the tools from /opt/onbld)] -[S]:[option?Build a variant of the source product. -The value of \aoption\a must be one of the following:]{ - [+E?build the exportable source variant of the source product.] - [+D?build the domestic source (exportable + crypt) variant of - the source product.] - [+H?build hybrid source (binaries + deleted source).] - [+O?simulate an OpenSolaris (open source only) build.] -} [command] @@ -188,7 +143,6 @@ while getopts -a "${progname}" "${USAGE}" OPT ; do +d) flags.d=false SUFFIX="-nd" ;; t) flags.t=true ;; +t) flags.t=false ;; - S) set_S_flag "$OPTARG" ;; \?) usage ;; esac done @@ -273,16 +227,13 @@ shift # must match the getopts in nightly.sh OPTIND=1 NIGHTLY_OPTIONS="-${NIGHTLY_OPTIONS#-}" -while getopts '+0AaBCDdFfGIilMmNnOopRrS:tUuWwXxz' FLAG "$NIGHTLY_OPTIONS" +while getopts '+0AaBCDdFfGIilMmNnopRrtUuWwXxz' FLAG "$NIGHTLY_OPTIONS" do case "$FLAG" in - O) flags.O=true ;; - +O) flags.O=false ;; o) flags.o=true ;; +o) flags.o=false ;; t) flags.t=true ;; +t) flags.t=false ;; - S) set_S_flag "$OPTARG" ;; *) ;; esac done @@ -313,32 +264,9 @@ else unset EXTRA_CFLAGS fi -[[ "${flags.O}" == "true" ]] && export MULTI_PROTO="yes" - # update build-type variables PKGARCHIVE="${PKGARCHIVE}${SUFFIX}" -# Append source version -if "${flags.s.e}" ; then - VERSION+=":EXPORT" - SRC="${EXPORT_SRC}/usr/src" -fi - -if "${flags.s.d}" ; then - VERSION+=":DOMESTIC" - SRC="${EXPORT_SRC}/usr/src" -fi - -if "${flags.s.h}" ; then - VERSION+=":HYBRID" - SRC="${EXPORT_SRC}/usr/src" -fi - -if "${flags.s.o}" ; then - VERSION+=":OPEN_ONLY" - SRC="${OPEN_SRCDIR}/usr/src" -fi - # Set PATH for a build PATH="/opt/onbld/bin:/opt/onbld/bin/${MACH}:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/bin:/usr/sbin:/usr/ucb:/usr/etc:/usr/openwin/bin:/usr/sfw/bin:/opt/sfw/bin:." if [[ "${SUNWSPRO}" != "" ]]; then @@ -410,12 +338,6 @@ fi [[ "$MULTI_PROTO" == "yes" ]] && export ROOT="${ROOT}${SUFFIX}" -if "${flags.O}" ; then - print "OpenSolaris closed binary generation requires " - print "closed tree" - exit 1 -fi - ENVLDLIBS1="-L$ROOT/lib -L$ROOT/usr/lib" ENVCPPFLAGS1="-I$ROOT/usr/include" MAKEFLAGS=e diff --git a/usr/src/tools/scripts/nightly.1 b/usr/src/tools/scripts/nightly.1 index 01c4d287ac..577fe292a1 100644 --- a/usr/src/tools/scripts/nightly.1 +++ b/usr/src/tools/scripts/nightly.1 @@ -231,32 +231,8 @@ Integration engineer default group of options (-mpu) Default group of options for building a release (-mp) .LP -.B Source Build options -.TP 10 -.B \-S E | D | H -Build the Export, Domestic, or Hybrid source product. Only Export and -Domestic are truly buildable at this time. -.TP 10 -.B \-S O -Simulate an OpenSolaris build on a full tree. This can be used by -internal developers to ensure that they haven't broken the build for -external developers. -.LP -Source build options only make sense for a full internal tree (open -and closed source). Only one source build option can be specified at -a time. - -.LP .B Miscellaneous options .TP 10 -.B \-O -generate deliverables for OpenSolaris. Tarballs containing signed -cryptographic binaries and binaries -of closed-source components are put in $CODEMGR_WS. (The -cryptographic tarballs are copies of the -ones that are put in the parent directory of -$PKGARCHIVE.) -.TP 10 .B \-V VERS set the build version string to VERS, overriding VERSION .TP @@ -350,10 +326,6 @@ targets. It should be expressed in terms of $CODEMGR_WS. If $MULTI_PROTO is "no", $ROOT may contain a DEBUG or non-DEBUG build. If $MULTI_PROTO is "yes", $ROOT contains the DEBUG build and $ROOT-nd contains the non-DEBUG build. -.LP -For OpenSolaris deliveries (\fB\-O\fR), $ROOT-closed contains a parallel -proto area containing the DEBUG build of just usr/closed components, and -$ROOT-nd-closed contains the non-DEBUG equivalent. .RE .LP .B TOOLS_ROOT @@ -532,12 +504,6 @@ corresponding variable for Mercurial or Subversion, which are assumed to be installed in the default path. .RE .LP -.B OPEN_SRCDIR -.RS 5 -The open source tree is copied to this directory when simulating an -OpenSolaris build (\fB\-S O\fR). It defaults to $CODEMGR_WS/open_src. -.LP -.RE .B ON_CLOSED_BINS .RS 5 OpenSolaris builds do not contain the closed source tree. Instead, @@ -583,9 +549,7 @@ If "no" (the default), .I nightly will reuse $ROOT for both the DEBUG and non-DEBUG builds. If "yes", the DEBUG build will go in $ROOT and the non-DEBUG build will go in -$ROOT-nd. Other values will be treated as "no". Use of the -.B \-O -flag forces MULTI_PROTO to "yes". +$ROOT-nd. Other values will be treated as "no". .RE .LP .SH NIGHTLY HOOK ENVIRONMENT VARIABLES diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh index a60ddcef4f..6b911466dd 100644 --- a/usr/src/tools/scripts/nightly.sh +++ b/usr/src/tools/scripts/nightly.sh @@ -230,126 +230,6 @@ function rename_files { done } -# -# Copy some or all of the source tree. -# -# Returns 0 for success, non-zero for failure. -# -# usage: copy_source CODEMGR_WS DESTDIR LABEL SRCROOT -# -function copy_source { - WS=$1 - DEST=$2 - label=$3 - srcroot=$4 - - printf "\n==== Creating %s source from %s (%s) ====\n\n" \ - "$DEST" "$WS" "$label" | tee -a $mail_msg_file >> $LOGFILE - - printf "cleaning out %s\n" "$DEST." >> $LOGFILE - rm -rf "$DEST" >> $LOGFILE 2>&1 - - printf "creating %s\n" "$DEST." >> $LOGFILE - mkdir -p "$DEST" 2>> $LOGFILE - - if (( $? != 0 )) ; then - printf "failed to create %s\n" "$DEST" | - tee -a $mail_msg_file >> $LOGFILE - build_ok=n - return 1 - fi - cd "$WS" - - printf "populating %s\n" "$DEST." >> $LOGFILE - - case "$SCM_TYPE" in - teamware) - find $srcroot -name 's\.*' -a -type f -print | \ - sed -e 's,SCCS\/s.,,' | \ - grep -v '/\.del-*' | \ - cpio -pd $DEST >>$LOGFILE 2>&1 - if (( $? != 0 )) ; then - printf "cpio failed for %s\n" "$DEST" | - tee -a $mail_msg_file >> $LOGFILE - build_ok=n - return 1 - fi - ;; - mercurial) - copy_source_mercurial $DEST $srcroot - if (( $? != 0 )) ; then - build_ok=n - return 1 - fi - ;; - *) - build_ok=n - echo "Tree copy is not supported for workspace type" \ - "$SCM_TYPE" | tee -a $mail_msg_file >> $LOGFILE - return 1 - ;; - esac - - return 0 -} - -# -# Mercurial-specific copy code for copy_source(). -# -# Returns 0 for success, non-zero for failure. -# -# usage: copy_source_mercurial destdir srcroot -# -function copy_source_mercurial { - typeset dest=$1 - typeset srcroot=$2 - - hg locate -I "$srcroot" | cpio -pd "$dest" >>$LOGFILE 2>&1 - if (( $? != 0 )) ; then - printf "cpio failed for %s\n" "$dest" | - tee -a $mail_msg_file >> $LOGFILE - return 1 - fi - - return 0 -} - -# -# function to create (but not build) the export/crypt source tree. -# usage: set_up_source_build CODEMGR_WS DESTDIR MAKE_TARGET -# Sets SRC to the modified source tree, for use by the caller when it -# builds the tree. -# -function set_up_source_build { - WS=$1 - DEST=$2 - MAKETARG=$3 - - copy_source $WS $DEST $MAKETARG usr - if (( $? != 0 )); then - echo "\nCould not copy source tree for source build." | - tee -a $mail_msg_file >> $LOGFILE - build_ok=n - return - fi - - SRC=${DEST}/usr/src - - cd $SRC - rm -f ${MAKETARG}.out - echo "making ${MAKETARG} in ${SRC}." >> $LOGFILE - /bin/time $MAKE -e ${MAKETARG} 2>&1 | \ - tee -a $SRC/${MAKETARG}.out >> $LOGFILE - echo "\n==== ${MAKETARG} build errors ====\n" >> $mail_msg_file - egrep ":" $SRC/${MAKETARG}.out | \ - egrep -e "(^${MAKE}:|[ ]error[: \n])" | \ - egrep -v "Ignoring unknown host" | \ - egrep -v "warning" >> $mail_msg_file - - echo "clearing state files." >> $LOGFILE - find . -name '.make*' -exec rm -f {} \; -} - # Return library search directive as function of given root. function myldlibs { echo "-L$1/lib -L$1/usr/lib" @@ -382,11 +262,6 @@ function build { ORIGROOT=$ROOT [ $MULTIPROTO = no ] || export ROOT=$ROOT$SUFFIX - if [[ "$O_FLAG" = y ]]; then - echo "\nSetting CLOSEDROOT= ${ROOT}-closed\n" >> $LOGFILE - export CLOSEDROOT=${ROOT}-closed - fi - export ENVLDLIBS1=`myldlibs $ROOT` export ENVCPPFLAGS1=`myheaders $ROOT` @@ -909,18 +784,13 @@ if [ "$TEAMWARE" = "" ]; then export TEAMWARE fi -USAGE='Usage: nightly [-in] [+t] [-V VERS ] [ -S E|D|H|O ] +USAGE='Usage: nightly [-in] [+t] [-V VERS ] Where: -i Fast incremental options (no clobber, lint, check) -n Do not do a bringover +t Use the build tools in $ONBLD_TOOLS/bin -V VERS set the build version string to VERS - -S Build a variant of the source product - E - build exportable source - D - build domestic source (exportable + crypt) - H - build hybrid source (binaries + deleted source) - O - build (only) open source file in Bourne shell syntax that sets and exports variables that configure the operation of this script and many of @@ -938,7 +808,6 @@ NIGHTLY_OPTIONS variable in the as follows: -I integration engineer default group of options (-ampu) -M do not run pmodes (safe file permission checker) -N do not run protocmp - -O generate OpenSolaris deliverables -R default group of options for building a release (-mp) -U update proto area in the parent -V VERS set the build version string to VERS @@ -958,11 +827,6 @@ NIGHTLY_OPTIONS variable in the as follows: -w report on differences between previous and current proto areas -z compress cpio archives with gzip -W Do not report warnings (freeware gate ONLY) - -S Build a variant of the source product - E - build exportable source - D - build domestic source (exportable + crypt) - H - build hybrid source (binaries + deleted source) - O - build (only) open source ' # # A log file will be generated under the name $LOGFILE @@ -982,7 +846,6 @@ M_FLAG=n m_FLAG=n N_FLAG=n n_FLAG=n -O_FLAG=n o_FLAG=n P_FLAG=n p_FLAG=n @@ -995,60 +858,23 @@ V_FLAG=n W_FLAG=n w_FLAG=n X_FLAG=n -SD_FLAG=n -SE_FLAG=n -SH_FLAG=n -SO_FLAG=n # XMOD_OPT= # build_ok=y -function is_source_build { - [ "$SE_FLAG" = "y" -o "$SD_FLAG" = "y" -o \ - "$SH_FLAG" = "y" -o "$SO_FLAG" = "y" ] - return $? -} - # # examine arguments # -# -# single function for setting -S flag and doing error checking. -# usage: set_S_flag -# where is the source build type ("E", "D", ...). -# -function set_S_flag { - if is_source_build; then - echo "Can only build one source variant at a time." - exit 1 - fi - if [ "$1" = "E" ]; then - SE_FLAG=y - elif [ "$1" = "D" ]; then - SD_FLAG=y - elif [ "$1" = "H" ]; then - SH_FLAG=y - elif [ "$1" = "O" ]; then - SO_FLAG=y - else - echo "$USAGE" - exit 1 - fi -} - OPTIND=1 -while getopts +inS:tV: FLAG +while getopts +intV: FLAG do case $FLAG in i ) i_FLAG=y; i_CMD_LINE_FLAG=y ;; n ) n_FLAG=y ;; - S ) - set_S_flag $OPTARG - ;; +t ) t_FLAG=n ;; V ) V_FLAG=y @@ -1207,7 +1033,7 @@ check_closed_tree # NIGHTLY_OPTIONS=-${NIGHTLY_OPTIONS#-} OPTIND=1 -while getopts +ABCDdFfGIilMmNnOoPpRrS:TtUuWwXxz FLAG $NIGHTLY_OPTIONS +while getopts +ABCDdFfGIilMmNnoPpRrTtUuWwXxz FLAG $NIGHTLY_OPTIONS do case $FLAG in A ) A_FLAG=y @@ -1240,8 +1066,6 @@ do ;; n ) n_FLAG=y ;; - O ) O_FLAG=y - ;; o ) o_FLAG=y ;; P ) P_FLAG=y @@ -1253,9 +1077,6 @@ do ;; r ) r_FLAG=y ;; - S ) - set_S_flag $OPTARG - ;; T ) T_FLAG=y ;; # obsolete +t ) t_FLAG=n @@ -1447,23 +1268,6 @@ if [ "$X_FLAG" = "y" ]; then fi fi -# Append source version -if [ "$SE_FLAG" = "y" ]; then - VERSION="${VERSION}:EXPORT" -fi - -if [ "$SD_FLAG" = "y" ]; then - VERSION="${VERSION}:DOMESTIC" -fi - -if [ "$SH_FLAG" = "y" ]; then - VERSION="${VERSION}:MODIFIED_SOURCE_PRODUCT" -fi - -if [ "$SO_FLAG" = "y" ]; then - VERSION="${VERSION}:OPEN_ONLY" -fi - TMPDIR="/tmp/nightly.tmpdir.$$" export TMPDIR rm -rf ${TMPDIR} @@ -1699,11 +1503,6 @@ function allprotos { roots="$roots $ROOT-nd" fi - if [[ $O_FLAG = y ]]; then - roots="$roots $ROOT-closed" - [ $MULTI_PROTO = yes ] && roots="$roots $ROOT-nd-closed" - fi - echo $roots } @@ -1783,43 +1582,18 @@ if [ "$T_FLAG" = "y" ]; then obsolete_build TRACE | tee -a $mail_msg_file >> $LOGFILE fi -if is_source_build; then - if [ "$i_FLAG" = "y" -o "$i_CMD_LINE_FLAG" = "y" ]; then - echo "WARNING: the -S flags do not support incremental" \ - "builds; forcing clobber\n" | tee -a $mail_msg_file >> $LOGFILE - i_FLAG=n - i_CMD_LINE_FLAG=n - fi - if [ "$N_FLAG" = "n" ]; then - echo "WARNING: the -S flags do not support protocmp;" \ - "protocmp disabled\n" | \ - tee -a $mail_msg_file >> $LOGFILE - N_FLAG=y - fi - if [ "$l_FLAG" = "y" ]; then - echo "WARNING: the -S flags do not support lint;" \ - "lint disabled\n" | tee -a $mail_msg_file >> $LOGFILE - l_FLAG=n - fi - if [ "$C_FLAG" = "y" ]; then - echo "WARNING: the -S flags do not support cstyle;" \ - "cstyle check disabled\n" | tee -a $mail_msg_file >> $LOGFILE - C_FLAG=n - fi -else - if [ "$N_FLAG" = "y" ]; then - if [ "$p_FLAG" = "y" ]; then - cat <> $LOGFILE +if [ "$N_FLAG" = "y" ]; then + if [ "$p_FLAG" = "y" ]; then + cat <> $LOGFILE WARNING: the p option (create packages) is set, but so is the N option (do not run protocmp); this is dangerous; you should unset the N option EOF - else - cat <> $LOGFILE + else + cat <> $LOGFILE Warning: the N option (do not run protocmp) is set; it probably shouldn't be EOF - fi - echo "" | tee -a $mail_msg_file >> $LOGFILE fi + echo "" | tee -a $mail_msg_file >> $LOGFILE fi if [ "$D_FLAG" = "n" -a "$l_FLAG" = "y" ]; then @@ -1875,8 +1649,6 @@ if [ "$t_FLAG" = "n" ]; then fi fi -[ "$O_FLAG" = y ] && MULTI_PROTO=yes - case $MULTI_PROTO in yes|no) ;; *) @@ -1992,7 +1764,7 @@ if [ "$i_FLAG" = "n" -a -d "$SRC" ]; then egrep -v "Ignoring unknown host" \ >> $mail_msg_file - if [[ "$t_FLAG" = "y" || "$O_FLAG" = "y" ]]; then + if [[ "$t_FLAG" = "y" ]]; then echo "\n==== Make tools clobber at `date` ====\n" >> $LOGFILE cd ${TOOLS} rm -f ${TOOLS}/clobber-${MACH}.out @@ -2259,13 +2031,6 @@ else echo "\n==== No bringover to $CODEMGR_WS ====\n" >> $LOGFILE fi -if [[ "$O_FLAG" = y ]]; then - build_ok=n - echo "OpenSolaris binary deliverables need usr/closed." \ - | tee -a "$mail_msg_file" >> $LOGFILE - exit 1 -fi - # Safeguards [[ -v CODEMGR_WS ]] || fatal_error "Error: Variable CODEMGR_WS not set." [[ -d "${CODEMGR_WS}" ]] || fatal_error "Error: ${CODEMGR_WS} is not a directory." @@ -2340,7 +2105,7 @@ fi # # Build and use the workspace's tools if requested # -if [[ "$t_FLAG" = "y" || "$O_FLAG" = y ]]; then +if [[ "$t_FLAG" = "y" ]]; then set_non_debug_build_flags build_tools ${TOOLS_PROTO} @@ -2356,111 +2121,14 @@ if [ "$X_FLAG" = "y" ]; then copy_ihv_proto fi -if [ "$i_FLAG" = "y" -a "$SH_FLAG" = "y" ]; then - echo "\n==== NOT Building base OS-Net source ====\n" | \ - tee -a $LOGFILE >> $mail_msg_file -else - # timestamp the start of the normal build; the findunref tool uses it. - touch $SRC/.build.tstamp - - normal_build -fi - -# -# Generate the THIRDPARTYLICENSE files if needed. This is done after -# the build, so that dynamically-created license files are there. -# It's done before findunref to help identify license files that need -# to be added to tools/opensolaris/license-list. -# -if [ "$O_FLAG" = y -a "$build_ok" = y ]; then - echo "\n==== Generating THIRDPARTYLICENSE files ====\n" | - tee -a "$mail_msg_file" >> "$LOGFILE" +# timestamp the start of the normal build; the findunref tool uses it. +touch $SRC/.build.tstamp - if [ -d $ROOT/licenses/usr ]; then - ( cd $ROOT/licenses ; \ - mktpl $SRC/pkg/license-list ) >> "$LOGFILE" 2>&1 - if (( $? != 0 )) ; then - echo "Couldn't create THIRDPARTYLICENSE files" | - tee -a "$mail_msg_file" >> "$LOGFILE" - fi - else - echo "No licenses found under $ROOT/licenses" | - tee -a "$mail_msg_file" >> "$LOGFILE" - fi -fi +normal_build ORIG_SRC=$SRC BINARCHIVE=${CODEMGR_WS}/bin-${MACH}.cpio.Z -if [ "$SE_FLAG" = "y" -o "$SD_FLAG" = "y" -o "$SH_FLAG" = "y" ]; then - save_binaries -fi - - -# EXPORT_SRC comes after CRYPT_SRC since a domestic build will need -# $SRC pointing to the export_source usr/src. - -if [ "$SE_FLAG" = "y" -o "$SD_FLAG" = "y" -o "$SH_FLAG" = "y" ]; then - if [ "$SD_FLAG" = "y" -a $build_ok = y ]; then - set_up_source_build ${CODEMGR_WS} ${CRYPT_SRC} CRYPT_SRC - fi - - if [ $build_ok = y ]; then - set_up_source_build ${CODEMGR_WS} ${EXPORT_SRC} EXPORT_SRC - fi -fi - -if [ "$SD_FLAG" = "y" -a $build_ok = y ]; then - # drop the crypt files in place. - cd ${EXPORT_SRC} - echo "\nextracting crypt_files.cpio.Z onto export_source.\n" \ - >> ${LOGFILE} - zcat ${CODEMGR_WS}/crypt_files.cpio.Z | \ - cpio -idmucvB 2>/dev/null >> ${LOGFILE} - if [ "$?" = "0" ]; then - echo "\n==== DOMESTIC extraction succeeded ====\n" \ - >> $mail_msg_file - else - echo "\n==== DOMESTIC extraction failed ====\n" \ - >> $mail_msg_file - fi - -fi - -if [ "$SO_FLAG" = "y" -a "$build_ok" = y ]; then - # - # Copy the open sources into their own tree. - # If copy_source fails, it will have already generated an - # error message and set build_ok=n, so we don't need to worry - # about that here. - # - copy_source $CODEMGR_WS $OPEN_SRCDIR OPEN_SOURCE usr/src -fi - -if [ "$SO_FLAG" = "y" -a "$build_ok" = y ]; then - SRC=$OPEN_SRCDIR/usr/src -fi - -if is_source_build && [ $build_ok = y ] ; then - # remove proto area(s) here, since we don't clobber - rm -rf `allprotos` - if [ "$t_FLAG" = "y" ]; then - set_non_debug_build_flags - ORIG_TOOLS=$TOOLS - # - # SRC was set earlier to point to the source build - # source tree (e.g., $EXPORT_SRC). - # - TOOLS=${SRC}/tools - TOOLS_PROTO=${TOOLS}/${TOOLS_PROTO_REL}; export TOOLS_PROTO - build_tools ${TOOLS_PROTO} - if [[ $? != 0 ]]; then - use_tools ${TOOLS_PROTO} - fi - fi - - normal_build -fi # # There are several checks that need to look at the proto area, but @@ -2836,53 +2504,6 @@ fi # steps need to come after findunref and are commented below. # -# If we are doing an OpenSolaris _source_ build (-S O) then we do -# not have usr/closed available to us to generate closedbins from, -# so skip this part. -if [ "$SO_FLAG" = n -a "$O_FLAG" = y -a "$build_ok" = y ]; then - echo "\n==== Generating OpenSolaris tarballs ====\n" | \ - tee -a $mail_msg_file >> $LOGFILE - - cd $CODEMGR_WS - - # - # This step grovels through the package manifests, so it - # must come after findunref. - # - # We assume no DEBUG vs non-DEBUG package content variation - # here; if that changes, then the "make all" in $SRC/pkg will - # need to be moved into the conditionals and repeated for each - # different build. - # - echo "Generating closed binaries tarball(s)..." >> $LOGFILE - closed_basename=on-closed-bins - if [ "$D_FLAG" = y ]; then - bindrop "$closed_basename" >>"$LOGFILE" 2>&1 - if (( $? != 0 )) ; then - echo "Couldn't create DEBUG closed binaries." | - tee -a $mail_msg_file >> $LOGFILE - build_ok=n - fi - fi - if [ "$F_FLAG" = n ]; then - bindrop -n "$closed_basename-nd" >>"$LOGFILE" 2>&1 - if (( $? != 0 )) ; then - echo "Couldn't create non-DEBUG closed binaries." | - tee -a $mail_msg_file >> $LOGFILE - build_ok=n - fi - fi - - echo "Generating README.opensolaris..." >> $LOGFILE - cat $SRC/tools/opensolaris/README.opensolaris.tmpl | \ - mkreadme_osol $CODEMGR_WS/README.opensolaris >> $LOGFILE 2>&1 - if (( $? != 0 )) ; then - echo "Couldn't create README.opensolaris." | - tee -a $mail_msg_file >> $LOGFILE - build_ok=n - fi -fi - # Verify that the usual lists of files, such as exception lists, # contain only valid references to files. If the build has failed, # then don't check the proto area. -- 2.11.4.GIT