05eb41c63af8ccd369f76b022d3cf1faab5543c2 braney Thu May 26 16:25:07 2022 -0700 changes to support curated hubs diff --git src/hg/makeDb/trackDb/makefile src/hg/makeDb/trackDb/makefile index 924de20..42ccc5a 100644 --- src/hg/makeDb/trackDb/makefile +++ src/hg/makeDb/trackDb/makefile @@ -205,114 +205,118 @@ # BUILD_TRIX = /bin/true BUILD_TRIX = ./buildTrix HIVE_TRIX = /hive/data/inside/trix DATA_TRIX = /data/trix ALPHA_MACHINE = hgwdev.gi.ucsc.edu BETA_MACHINE = qateam@hgwbeta.soe.ucsc.edu PUBLIC_MACHINE = qateam@hgw0.soe.ucsc.edu # For the new demo-$USER machines, the "USER" passed in to makefile contains a hyphen which # needs to be replaced with an underscore for mysql table names. USERTABLE = $(shell echo ${USER} | sed -e 's/-/_/g') update: ${DBS:%=%_update} ${MKDIR} ${CGI_BIN}-${USER}/encode %_update: - ./loadTracks -addVersion ${EXTRA} trackDb_${USERTABLE} hgFindSpec_${USERTABLE} $* + ./loadTracks -noHtmlCheck -strict -addVersion ${EXTRA} trackDb_${USERTABLE} hgFindSpec_${USERTABLE} $* ./checkMetaDb alpha metaDb_${USERTABLE} $* # now build the relatedTracks table for each db ./buildRelatedTracks relatedTrack_${USERTABLE} $* rm -rf /dev/shm/trackDbCache/$*.trackDb_${USERTABLE} + ./maybeBuildHub ${USER} trackDb_${USERTABLE} $* # if you want to test track search tool with your own trix file # rm -f ${DBS:%=${HIVE_TRIX}/%_trackDb_${USERTABLE}.{ixx,ix}} # HGDB_TRACKDB=trackDb_${USERTABLE} ${BUILD_TRIX} trackDb_${USERTABLE} metaDb_${USERTABLE} ${CGI_BIN}-${USER}/encode/cv.ra ${ALPHA_MACHINE} ${HIVE_TRIX} ${DBS} # you'll also need to set browser.trixPath to point to your trix file # see kent/src/product/ex.hg/conf for details alpha: clean ${GIT} pull ${MKDIR} ${CGI_BIN}/encode ${MAKE} alpha_all alpha_all: ${DBS:%=%_alpha} %_alpha: - ./loadTracks -addVersion ${EXTRA} -release=alpha trackDb hgFindSpec $* + ./loadTracks -noHtmlCheck -strict -addVersion ${EXTRA} -release=alpha trackDb hgFindSpec $* ./checkMetaDb alpha metaDb $* rm -f ${HIVE_TRIX}/$*_trackDb.{ixx,ix} HGDB_TRACKDB=trackDb ${BUILD_TRIX} trackDb metaDb cv/alpha/cv.ra ${ALPHA_MACHINE} ${HIVE_TRIX} $* ./makeTrixLinks trackDb ${HIVE_TRIX} $* # now build the relatedTracks table for each db ./buildRelatedTracks relatedTrack $* rm -rf /dev/shm/trackDbCache/$*.trackDb + ./maybeBuildHub alpha trackDb $* onbeta: /cluster/home/${USER}/.hg.conf.beta betaTest: onbeta clean ${MAKE} betaTest_all betaTest_all: ${DBS:%=%_betaTest} beta: onbeta clean ${GIT} pull ${MAKE} beta_all beta_all: ${DBS:%=%_beta} %_betaTest: # now do loads on hgwbeta HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./loadTracks -addVersion ${EXTRA} -strict -remoteLogin=${BETA_MACHINE} -release=beta trackDb_betaTest hgFindSpec_betaTest $* %_beta: # now do loads on hgwbeta -ssh ${BETA_MACHINE} find /gbdb/$* -type f -size +1c > $*.gbdbList.txt HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./loadTracks -addVersion ${EXTRA} -strict -gbdbList=$*.gbdbList.txt -release=beta trackDb hgFindSpec $* rm -f $*.gbdbList.txt HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./checkMetaDb beta metaDb $* HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta HGDB_TRACKDB=trackDb ${BUILD_TRIX} trackDb metaDb cv/beta/cv.ra ${BETA_MACHINE} ${DATA_TRIX} $* # now make files for hgwdev-beta (we share the tables with hgwbeta) HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta HGDB_TRACKDB=trackDb ${BUILD_TRIX} trackDb metaDb cv/beta/cv.ra ${ALPHA_MACHINE} ${HIVE_TRIX} $* # now build the relatedTracks table for each db HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./buildRelatedTracks relatedTrack $* -ssh ${BETA_MACHINE} rm -rf /dev/shm/trackDbCache/$*.trackDb + HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta HGDB_TRACKDB=trackDb ./maybeBuildHub beta trackDb $* publicTest: onbeta clean ${MAKE} publicTest_all publicTest_all: ${DBS:%=%_publicTest} public: onbeta clean ${GIT} pull ${MAKE} public_all public_all: ${DBS:%=%_public} %_publicTest: -ssh ${PUBLIC_MACHINE} find /gbdb/$* -type f -size +1c > $*.gbdbList.txt HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./loadTracks -addVersion ${EXTRA} -strict -gbdbList=$*.gbdbList.txt -release=public trackDb_publicTest hgFindSpecTest_publicTest $* rm -f $*.gbdbList.txt %_public: -ssh ${PUBLIC_MACHINE} find /gbdb/$* -type f -size +1c > $*.gbdbList.txt HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./loadTracks -addVersion ${EXTRA} -strict -gbdbList=$*.gbdbList.txt -release=public trackDb_public hgFindSpec_public $* rm -f $*.gbdbList.txt HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./checkMetaDb public metaDb_public $* HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta HGDB_TRACKDB=trackDb_public ${BUILD_TRIX} trackDb_public metaDb_public cv/public/cv.ra ${BETA_MACHINE} ${DATA_TRIX} $* # now build the relatedTracks table for each db HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta ./buildRelatedTracks relatedTrack_public $* -ssh ${BETA_MACHINE} rm -rf /dev/shm/trackDbCache/$*.trackDb_public + HGDB_CONF=/cluster/home/${USER}/.hg.conf.beta HGDB_TRACKDB=trackDb_public ./maybeBuildHub public trackDb_public $* # this will fail if we are not in a beta checkout: checkbeta: ${GIT} branch | egrep '^[*] v[0-9]+_branch' > /dev/null # not sure if anyone actually uses the target below. It used to be "beta". buildBeta: checkbeta clean strict encodeReport: ${GIT} pull ./loadTracks ${EXTRA} trackDb_encodeReport hgFindSpec ${DBS} listDbs: @echo "# databases listed in trackDb/makefile DBS variable, with table counts" @for D in ${DBS}; do \