diff options
| -rwxr-xr-x | customrc | 5 | ||||
| -rwxr-xr-x | env.bash | 6 | ||||
| -rwxr-xr-x | sb | 61 | ||||
| -rwxr-xr-x | sbe/build/citest/setup-env | 8 |
4 files changed, 69 insertions, 11 deletions
@@ -2,9 +2,9 @@ # Never checkin this file other than changes in BACKING_BUILD # If you want to change location of default sandbox root, enable SANDBOXROOT -#export SANDBOXROOT=~/workspace/ +export SANDBOXROOT=$SBEROOT # If you want to change name of default sandbox, enable SANDBOXNAME -#export SANDBOXNAME=sbe_simics_sandbox +export SANDBOXNAME=test_sb #export WORKSPACE=<set it to your root ppe directory. This is required if you # to use build script locally> @@ -12,4 +12,3 @@ export MACHINE=NIMBUS export BACKING_BUILD=/esw/fips910/Builds/b0314a_1612.910/ export SIMICSOPTIONS="-nre" - @@ -1,12 +1,12 @@ ROOTDIR=. +export SBEROOT=`pwd` if [ -e ./customrc ]; then source ./customrc fi -export PATH=${PATH}:`pwd`/tools/ppetracepp - -export SBEROOT=`pwd` +export PATH=${PATH}:${SBEROOT}/import/chips/p9/xip/bin/ +export PATH=${PATH}:${SBEROOT}/tools/ppetracepp/ if [ -n "${SANDBOXROOT}" ]; then if [ -n "${SANDBOXNAME}" ]; then @@ -0,0 +1,61 @@ +#!/bin/sh + +sb_helptext() +{ + echo "SBE Utility Script" + + case $1 in + workon) + echo " Topic 'workon'" + echo + echo " Usage:" + echo " sb workon" + echo + echo " Sources necessary environment files for building sbe" + echo " and begins a new shell. The workon may be left via 'exit'." + echo + echo " See also:" + echo " customrc" + ;; + *) + echo " Usage:" + echo " sb <cmd>" + echo " sb help [<cmd>|<topic>]" + echo + echo " Available Commands:" + echo " workon" + echo + esac +} + +sb_workon() +{ + if [ -n "${SBE_INSIDE_WORKON}" ]; then + echo "Already in a workon." + exit -1 + else + export SBE_INSIDE_WORKON=1 + echo "Setting environment variables..." + source ./env.bash + echo "Spawning new shell with devtoolset 2..." + scl enable devtoolset-2 bash + fi +} + +if [ 0 == $# ]; then + sb_helptext + exit -1 +fi + +FIRST_PARAM=$1 +shift + +case ${FIRST_PARAM} in +workon) + sb_workon $* + ;; +*) + sb_helptext $* + exit -1 + ;; +esac diff --git a/sbe/build/citest/setup-env b/sbe/build/citest/setup-env index 4d458700..124d3a8e 100755 --- a/sbe/build/citest/setup-env +++ b/sbe/build/citest/setup-env @@ -20,14 +20,12 @@ then export SANDBOXROOT=${SBEROOT} fi -if [ -z $SANDBOXNAME ]; +if [ -z $SANDBOXNAME ] || [ $RUNNING_UNDER_JENKINS -eq 1 ]; then export SANDBOXNAME=${SBECI_SANDBOX} fi -if [ -z $SANDBOXBASE ]; -then - export SANDBOXBASE=${SANDBOXROOT}/${SANDBOXNAME} -fi + +export SANDBOXBASE=${SANDBOXROOT}/${SANDBOXNAME} if [ -z $SANDBOXRC ]; then |
