d72fcfd04dee8c6a6362a7dce10157f06b1af6f4 hiram Wed Oct 23 17:49:13 2024 -0700 no longer making the genomes.txt or hub.txt files, obsolete refs #34689 diff --git src/hg/makeDb/doc/asmHubs/asmHubs.mk src/hg/makeDb/doc/asmHubs/asmHubs.mk index 783ae85..535ecd0 100644 --- src/hg/makeDb/doc/asmHubs/asmHubs.mk +++ src/hg/makeDb/doc/asmHubs/asmHubs.mk @@ -1,40 +1,40 @@ # generic makefile to construct the index pages and symlinks # for any assembly hub # # will be included by those individual build directories with the # following variables defined to customize the resulting files: # # destDir, srcDir, orderList, indexName, testIndexName, # statsName, testStatsName, dataName, testDataName, genomesTxt, hubFile # testHubFile, Name and name # the .PHONY will make sure these targets run even if there happens to be # a file by the same name existing. These rules don't make these files, # they are just procedures to run. -.PHONY: sanityCheck makeDirs mkJson mkGenomes symLinks hubIndex asmStats trackData hubTxt groupsTxt +.PHONY: sanityCheck makeDirs mkJson mkGenomes symLinks hubIndex asmStats trackData groupsTxt toolsDir=${HOME}/kent/src/hg/makeDb/doc/asmHubs htdocsHgDownload=/usr/local/apache/htdocs-hgdownload hubsDownload=${htdocsHgDownload}/hubs/${name} asmHubSrc=/hive/data/genomes/asmHubs/${name} downloadDest1=hgdownload1.soe.ucsc.edu downloadDest2=hgdownload2.soe.ucsc.edu # 2024-02-06 hgdownload2.gi.ucsc.edu has address 128.114.198.53 -all:: sanityCheck makeDirs mkJson mkGenomes symLinks hubIndex asmStats trackData hubTxt groupsTxt +all:: sanityCheck makeDirs mkJson mkGenomes symLinks hubIndex asmStats trackData groupsTxt makeDirs: mkdir -p ${destDir} sanityCheck: @goodBad=$$(cut -d'_' -f1-2 ${orderList} | sort | uniq -c | awk '$$1 > 1' | wc -l); \ if [ $$goodBad -ne 0 ]; then \ tsvFile=$$(basename ${orderList}); \ echo "ERROR: duplicate accession in '$$tsvFile'"; \ cut -d'_' -f1-2 ${orderList} | sort | uniq -c | awk '$$1 > 1'; \ exit 255; \ fi sshKeyDownload: ssh -o PasswordAuthentication=no qateam@${downloadDest1} date @@ -45,34 +45,44 @@ sshKeyCheck: sshKeyDownload sshKeyDynablat @printf "# ssh keys to hgdownload and dynablat-01 are good\n" mkJson:: ${toolsDir}/tsvToJson.py ${orderList} > ${destDir}/assemblyList.json 2> ${name}.jsonData.txt # mkGenomes needs symLinks to run before mkGenomes runs, and then # the second symLinks after mkGenomes uses business created by mkGenomes mkGenomes:: @printf "# starting mkGenomes " 1>&2 ${toolsDir}/mkSymLinks.pl ${orderList} @date "+%s %F %T" 1>&2 @rm -f hasChainNets.txt + ${toolsDir}/mkGenomes.pl dynablat-01 4040 ${orderList} > /dev/null + @printf "# finished mkGenomes " 1>&2 + @date "+%s %F %T" 1>&2 + +# temporary mkGenomes to get the single file genomes.txt made on a special +# one time only static list +staticMkGenomes: + @printf "# starting staticMkGenomes " 1>&2 + @date "+%s %F %T" 1>&2 + @rm -f hasChainNets.txt ${toolsDir}/mkGenomes.pl dynablat-01 4040 ${orderList} > ${destDir}/${genomesTxt}.txt rm -f ${destDir}/download.${genomesTxt}.txt cp -p ${destDir}/${genomesTxt}.txt ${destDir}/download.${genomesTxt}.txt - @printf "# finished mkGenomes " 1>&2 + @printf "# finished staticMkGenomes " 1>&2 @date "+%s %F %T" 1>&2 symLinks:: ${toolsDir}/mkSymLinks.pl ${orderList} @[ -d ${hubsDownload} ] && true || mkdir ${hubsDownload} @for html in ${indexName} ${statsName} ${dataName} ; do \ [ -L ${hubsDownload}/$${html}.html ] && true || ln -s ${asmHubSrc}/$${html}.html ${hubsDownload} ; \ [ -L ${hubsDownload}/download.$${html}.html ] && true || ln -s ${asmHubSrc}/download.$${html}.html ${hubsDownload} ; \ done @for txt in groups hub genomes download.genomes ; do \ [ -L ${hubsDownload}/$${txt}.txt ] && true || ln -s ${asmHubSrc}/$${txt}.txt ${hubsDownload} ; \ done @for json in assemblyList ; do \ [ -L ${hubsDownload}/$${json}.json ] && true || ln -s ${asmHubSrc}/$${json}.json ${hubsDownload} ; \ done @@ -89,30 +99,31 @@ sed -e "s#genome.ucsc.edu/h/#genome-test.gi.ucsc.edu/h/#g; s/hgdownload.soe/hgdownload-test.gi/g;" ${destDir}/download.${statsName}.html > ${destDir}/${statsName}.html chmod +x ${destDir}/${statsName}.html ${destDir}/download.${statsName}.html # trackData makes different tables for the test vs. production version # mkHubIndex.pl and mkAsmStats.pl should do this too . . . TBD trackData:: rm -f ${destDir}/${testDataName}.html ${destDir}/${dataName}.html ${destDir}/download.${dataName}.html ${toolsDir}/trackData.pl ${Name} ${name} ${orderList} > ${destDir}/download.${dataName}.html ${toolsDir}/trackData.pl -test ${Name} ${name} ${orderList} > ${destDir}/${dataName}.html chmod +x ${destDir}/${dataName}.html chmod +x ${destDir}/download.${dataName}.html indexPages: hubIndex asmStats trackData echo indexPages done +### obsolete, these hub.txt files are now static 2024-10-23 hubTxt: rm -f ${destDir}/${testHubFile}.txt ${destDir}/${hubFile}.txt sed -e "s#index.html#${indexName}.html#; s#genomes.txt#${genomesTxt}.txt#;" ${srcDir}/${hubTxtFile} > ${destDir}/${hubFile}.txt # all hubs have the same set of groups, no need for any name customization groupsTxt: rm -f ${destDir}/groups.txt rm -f ${destDir}/groups.txt cp -p ${toolsDir}/groups.txt ${destDir}/groups.txt clean:: rm -f ${destDir}/${hubFile}.txt rm -f ${destDir}/${testHubFile}.txt rm -f ${destDir}/groups.txt rm -f ${destDir}/${genomesTxt}.txt