src/utils/qa/weeklybld/buildUtils.csh 1.19

Index: src/utils/qa/weeklybld/buildUtils.csh
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/utils/qa/weeklybld/buildUtils.csh,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -B -U 1000000 -r1.18 -r1.19
--- src/utils/qa/weeklybld/buildUtils.csh	25 May 2010 06:42:17 -0000	1.18
+++ src/utils/qa/weeklybld/buildUtils.csh	28 May 2010 23:20:25 -0000	1.19
@@ -1,85 +1,92 @@
 #!/bin/tcsh
 # Build utils into /cluster/bin/$MACHTYPE on dev or beta from branch or tip
 # specify "tip" as command line parm 1 to build from tip sandbox 
 
 cd $WEEKLYBLD
 
 set MAKEPARAMS=""
 if ( "$MACHTYPE" == "i386" ) then
     if ( "$HOST" != "$BOX32" ) then
 	echo "error: you must run this script on $BOX32! [${0}: `date`]"
 	exit 1
     endif
     # hack to force use of gcc34 on titan rather than the newer gcc (4.1) which makes binaries
     # that can't run on our x86_4 machines.
     set MAKEPARAMS="CC=gcc34"
 endif
 if ( "$MACHTYPE" == "x86_64" ) then
     if ( "$HOST" != "hgwbeta" ) then
 	echo "error: you must run this script on hgwbeta! [${0}: `date`]"
 	exit 1
     endif
 endif
 
 set branch=v${BRANCHNN}_branch
 
 if ( "$1" == "tip" ) then
     set base=$BUILDDIR/tip
     echo "updating tip sandbox on $HOST [${0}: `date`]"
     cd $base/kent
     cvs up -dP  >& /dev/null
     echo "done updating tip sandbox"
     cd $WEEKLYBLD
 else
     set base=$BUILDDIR/$branch
 endif
 
 if ( -d ~/bin/${MACHTYPE}.orig ) then
  echo "restoring from last failed symlink. on $HOST [${0}: `date`]"
  ./unsymtrick.csh
 endif
 if ( ! -d ~/bin/${MACHTYPE}.cluster ) then
  echo "something messed up in symlink on $HOST [${0}: `date`]"
  exit 1
 endif
 
+# Hiram changed default script location
+# which we must now over-ride.
+# wonder if we should put this into 
+# the sandbox config thing like we do for
+# the SSH and BAM configs
+setenv SCRIPTS /cluster/bin/scripts
+
 # Symlink Trick safe now
 echo "Symlink Trick. on $HOST [${0}: `date`]"
 ./symtrick.csh
 
 echo
 echo "Building src utils. on $HOST [${0}: `date`]"
 cd $base/kent/src
 echo "Before make utils on $HOST [${0}: `date`]"
 if ( "$HOST" != "$BOX32" ) then
     # -j is having a side-effect?
     make $MAKEPARAMS utils >& make.utils.log
 else
-    make -j 8 $MAKEPARAMS utils >& make.utils.log
+    make -j 16 $MAKEPARAMS utils >& make.utils.log
 endif
 echo "After make utils on $HOST [${0}: `date`]"
 make $MAKEPARAMS blatSuite >>& make.utils.log
 echo "After make blatSuite on $HOST [${0}: `date`]"
 sed -i -e "s/-DJK_WARN//g" make.utils.log
 sed -i -e "s/-Werror//g" make.utils.log
 sed -i -e "s/gbWarn//g" make.utils.log
 #-- to check for errors: 
 set res = `/bin/egrep -i "error|warn" make.utils.log`
 set wc = `echo "$res" | wc -w` 
 if ( "$wc" != "0" ) then
  echo "errs found on $HOST"
  echo "$res"
  $WEEKLYBLD/unsymtrick.csh
  exit 1
 endif
 
 # Undo Symlink trick
 $WEEKLYBLD/unsymtrick.csh
 echo "Restore: undoing Symlink Trick. on $HOST [${0}: `date`]"
 
 echo
 echo "Build of Utils on $HOST complete. [${0}: `date`]"
 echo
 
 exit 0