f1e2c1529d1222a0793a30bc4997a65e6f6694c9 markd Wed Jan 22 07:40:55 2025 -0800 run docker as current user diff --git src/utils/qa/weeklybld/makeUserApps.csh src/utils/qa/weeklybld/makeUserApps.csh index 3a92b619d44..b9bcd35b98b 100755 --- src/utils/qa/weeklybld/makeUserApps.csh +++ src/utils/qa/weeklybld/makeUserApps.csh @@ -25,32 +25,40 @@ if ( $err ) then echo "error running git clone and checkout of kent in $BUILDDIR/userApps : $err [${0}: `date`]" exit 1 endif cd .. set BINDIR=linux.$MACHTYPE set DESTDIR=$BUILDDIR/userApps/ # must end in slash because of makefile weirdness rm -rf $DESTDIR$BINDIR mkdir $DESTDIR$BINDIR # configure settings like SSL and BAM in common.mk echo "Configuring settings on userApp sandbox $BRANCHNN $HOST [${0}: `date`]" $WEEKLYBLD/configureSandbox.csh . $WEEKLYBLD/downloadBuildSettings.mk +# change this to false to use local make rather than Docker +set useDocker=true + cd kent/src +if ("$useDocker" == "true") then + $WEEKLYBLD/userAppsCompileInDocker $BUILDDIR > make.log +else make -j 12 BINDIR=$BINDIR DESTDIR=$DESTDIR userApps > make.log +endif + ./utils/userApps/mkREADME.sh $DESTDIR$BINDIR FOOTER.txt cd ../.. # copy everything if 64 bit if ("$HOST" == "hgwdev") then #clear out the old and copy in the new foreach f ( ${DESTDIR}${BINDIR}/* ) echo $f switch ($f) # these three go in the blat subdirectory case ${DESTDIR}${BINDIR}/blat: case ${DESTDIR}${BINDIR}/gfClient: case ${DESTDIR}${BINDIR}/gfServer: case ${DESTDIR}${BINDIR}/gfPcr: case ${DESTDIR}${BINDIR}/isPcr: