Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed setting of directories to seperate NSS specifics from

Browse Source 
commonly used directories


git-svn-id: svn://10.0.0.236/trunk@100675 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sonmi%netscape.com
2001-08-09 20:53:22 +00:00
parent 88cf3b5fcb
commit 1dfb72c5aa
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/security/nss/tests/header
View File

@@ -140,6 +140,9 @@ KILL_SELFSERV=OFF # if sourcing script sets this to on cleanup will also
if [ -z "$UX_MASTERBUILD" ]
then
UX_MASTERBUILD=y2sun2_Solaris8
#if [ ! -d $UX_MASTERBUILD ] ; then
#UX_MASTERBUILD=y2sun2_Solaris8_forte6
#fi
fi
if [ -z "$NT_MASTERBUILD" ]
then
@@ -200,6 +203,7 @@ glob_init()
. $QASCRIPT_DIR/set_environment #finds out if we are running on Windows
Debug "OPerating system: $os_name $os_full"
if [ $O_WIN = "ON" ] ; then
win_set_tmp
write_to_tmpfile
MASTERBUILD=$NT_MASTERBUILD
fi
@@ -323,9 +327,9 @@ copy_to_local()
local_dirs()
{
Debug "Set directories for local QA"
if [ "$O_WIN" = "ON" ] ; then
win_set_tmp
fi
#if [ "$O_WIN" = "ON" ] ; then
#win_set_tmp
#fi
NSS_VER_DIR=${LOCAL_MOZROOT} # on local builds NSS_VER_DIR and DAILY_BUILD are
# set to the LOCAL_MOZROOT, since it is not sure
# if ../../../.. (NSS_VER_DIR) even exists
@@ -370,7 +374,7 @@ tbx_dirs()
{
Debug "Set directories for tinderbox"
if [ "$O_WIN" = "ON" ] ; then
win_set_d1 #also gets the TMP straight and we need the NSS_VER_DIR later
win_set_d1 # we need the NSS_VER_DIR later
else
NSS_VER_DIR="$UX_D0"/nss$NSSVER
fi
@@ -435,7 +439,7 @@ init_dirs()
#BCDIST=/share/builds/mccrel/nss/${BC_MASTER}/${MASTERBUILD}/mozilla/dist
BCDIST=${NSS_VER_DIR}/../${BC_MASTER}/${MASTERBUILD}/mozilla/dist
if [ ! -d $BCDIST ] ; then
ask "Backward compatibility dierectory $BCDIST does not exist, continue" "y" "n" || Exit
ask "Backward compatibility directory $BCDIST does not exist, continue" "y" "n" || Exit
fi
fi
@@ -738,7 +742,7 @@ eval_opts()
win_set_tmp()
{
TMP=`echo "$TMP" | sed -e 's/\\\/\//g'`
TMP=`echo "$TMP" | sed -e 's/ /\/t/g' -e 's//\/b/' -e 's/\\\/\//g'`
Debug "TMP reformated to $TMP"
}
@@ -749,7 +753,7 @@ win_set_tmp()
win_set_d1()
{
Debug "set Windows Directories..."
win_set_tmp
#win_set_tmp
if [ "$O_CYGNUS" = ON ]
then
NSS_VER_DIR=/cygdrive/w/nss/nss$NSSVER