Print this page
4027 remove CLOSED_BUILD

Split Close
Expand all
Collapse all
          --- old/usr/src/tools/scripts/nightly.sh
          +++ new/usr/src/tools/scripts/nightly.sh
↓ open down ↓ 885 lines elided ↑ open up ↑
 886  886                  for i
 887  887                  do
 888  888                          arg="$arg \"$i\""
 889  889                  done
 890  890                  eval su $STAFFER -c \'$arg\'
 891  891          fi
 892  892  }
 893  893  
 894  894  #
 895  895  # Verify that the closed tree is present if it needs to be.
 896      -# Sets CLOSED_IS_PRESENT for future use.
 897  896  #
 898  897  function check_closed_tree {
 899      -        if [ -z "$CLOSED_IS_PRESENT" ]; then
 900      -                if [ -d $CODEMGR_WS/usr/closed ]; then
 901      -                        CLOSED_IS_PRESENT="yes"
 902      -                else
 903      -                        CLOSED_IS_PRESENT="no"
 904      -                fi
 905      -                export CLOSED_IS_PRESENT
 906      -        fi
 907      -        if [[ "$CLOSED_IS_PRESENT" = no && ! -d "$ON_CLOSED_BINS" ]]; then
 908      -                #
 909      -                # If it's an old (pre-split) tree or an empty
 910      -                # workspace, don't complain.
 911      -                #
 912      -                if grep -s CLOSED_BUILD $SRC/Makefile.master > /dev/null; then
 913      -                        echo "If the closed sources are not present," \
 914      -                            "ON_CLOSED_BINS"
 915      -                        echo "must point to the closed binaries tree."
 916      -                        build_ok=n
 917      -                        exit 1
 918      -                fi
      898 +        if [[ ! -d "$ON_CLOSED_BINS" ]]; then
      899 +                echo "If the closed sources are not present," \
      900 +                    "ON_CLOSED_BINS"
      901 +                echo "must point to the closed binaries tree."
      902 +                build_ok=n
      903 +                exit 1
 919  904          fi
 920  905  }
 921  906  
 922  907  function obsolete_build {
 923  908          echo "WARNING: Obsolete $1 build requested; request will be ignored"
 924  909  }
 925  910  
 926  911  #
 927  912  # wrapper over wsdiff.
 928  913  # usage: do_wsdiff LABEL OLDPROTO NEWPROTO
↓ open down ↓ 2248 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX