From 38e64a37c58e4c9b56b87a49811928d472637c32 Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Tue, 20 Oct 2015 13:42:27 -0400 Subject: [PATCH] 6339 env file could figure out CODEMGR_WS automatically Reviewed by: Dan McDonald Reviewed by: Yuri Pankov Approved by: Gordon Ross --- usr/src/tools/env/illumos.sh | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/usr/src/tools/env/illumos.sh b/usr/src/tools/env/illumos.sh index eb41bc72569c..34d66065da28 100644 --- a/usr/src/tools/env/illumos.sh +++ b/usr/src/tools/env/illumos.sh @@ -47,21 +47,9 @@ # export NIGHTLY_OPTIONS='-FnCDAlmprt' -# -# -- PLEASE READ THIS -- -# -# The variables GATE and CODEMGR_WS must always be customised to -# match your workspace/gate location!! -# -# -- PLEASE READ THIS -- -# - -# This is a variable for the rest of the script - GATE doesn't matter to -# nightly itself -export GATE='testws' - -# CODEMGR_WS - where is your workspace at (or what should nightly name it) -export CODEMGR_WS="$HOME/ws/$GATE" +# CODEMGR_WS - where is your workspace at +#export CODEMGR_WS="$HOME/ws/illumos-gate" +export CODEMGR_WS="`git rev-parse --show-toplevel`" # Maximum number of dmake jobs. The recommended number is 2 + NCPUS, # where NCPUS is the number of logical CPUs on your build system. @@ -160,7 +148,7 @@ export MULTI_PROTO="no" # when the release slips (nah) or you move an environment file to a new # release # -export VERSION="$GATE" +export VERSION="`git describe --long --all HEAD | cut -d/ -f2-`" # # the RELEASE and RELEASE_DATE variables are set in Makefile.master;