1e6ea3ebb56bf3e31a4d8070f872d1eb45195cc3 craft Tue Jun 29 15:07:34 2010 -0700 Moved gitFiles to a makefile variable in htdocs, to allow an override. Builds off a tag must not reference the repository. This change allows an override, e.g. make FIND=find, for such builds. diff --git src/hg/htdocs/makefile src/hg/htdocs/makefile index 7879a27..81d9e63 100644 --- src/hg/htdocs/makefile +++ src/hg/htdocs/makefile @@ -1,78 +1,79 @@ HTDOCS=/usr/local/apache/htdocs HTDOCS_USER=${HTDOCS}-${USER} # NOTES: # - much of this is current repeats in the hgdownload htdocs makefile # - all symlinks are built by the doSymLink target GIT = git GITUP = ${GIT} pull -q +FIND=gitFiles user: ${GITUP} ${MAKE} doInstall destDir=${HTDOCS_USER} extra=doSymLink alpha: ${GITUP} ${MAKE} doInstall destDir=${HTDOCS} extra=doSymLink beta: ${GITUP} ${MAKE} doInstall destDir=${HTDOCS} extra=doSymLink alphaCancerPublic: ${GITUP} cancerGenomics index.html ${MAKE} doInstallCancerPublic destDir=${HTDOCS} extra=doSymLink alphaCancerSU2C: ${GITUP} cancerGenomics index.html ${MAKE} doInstallCancerSU2C destDir=${HTDOCS} extra=doSymLink alphaCancerTCGA: ${GITUP} cancerGenomics index.html ${MAKE} doInstallCancerTCGA destDir=${HTDOCS} extra=doSymLink # Recursive target to do install to destDir, with extra excludes excl and # specific includes in incl. The variable extra are extra targets to depend # on. This queries git to find out the list of files to install, so avoid the # usual crud that collects in directories. doInstall: doRsync ${extra} doInstallCancerPublic: doRsync ${extra} mv ${destDir}/index.html ${destDir}/index.html.org ln -sf ${destDir}/cancerGenomics/index.cancerGenomics.html ${destDir}/index.html mv index.html index.html.org doInstallCancerSU2C: doRsync ${extra} mv ${destDir}/index.html ${destDir}/index.html.org ln -sf ${destDir}/cancerGenomics/index.cancerGenomics.su2c.html ${destDir}/index.html mv index.html index.html.org doInstallCancerTCGA: doRsync ${extra} mv ${destDir}/index.html ${destDir}/index.html.org ln -sf ${destDir}/cancerGenomics/index.cancerGenomics.tcga.html ${destDir}/index.html mv index.html index.html.org # Run rsync. Care is taking to preserve times and mode on files. rsync is # smart about recreating file under the current users so that times and # permissions maybe modified. However, problems happen when a directory # is not owned by the current users. These options attemp to work around it. # use care in changing rsyncOpts = --times --recursive --executability --omit-dir-times --relative --cvs-exclude --exclude='makefile' doRsync: - umask 002; rsync ${rsyncOpts} ${excl} ${incl} `gitFiles` ${destDir} + umask 002; rsync ${rsyncOpts} ${excl} ${incl} `$(FIND)` ${destDir} # build symbolic links doSymLink: doRsync ln -sfn ../trash ${destDir}/trash ln -sfn goldenPath ${destDir}/goldenpath ln -sfn /gbdb/visiGene ${destDir}/visiGene ln -sfn ENCODE ${destDir}/encode ln -sfn Branchiostoma_lanceolatum.jpg ${destDir}/images/Branchiostoma_floridae.jpg ln -sfn Rhesus_macaque.jpg ${destDir}/images/Macaca_mulatta.jpg mkdir -p ${destDir}/RNA-img ln -sfn /gbdb/hg18/RNA-img ${destDir}/RNA-img/hg18 ln -sfn /gbdb/hg19/RNA-img ${destDir}/RNA-img/hg19 ln -sfn /gbdb/mm9/RNA-img ${destDir}/RNA-img/mm9 ln -sfn /gbdb/rn4/RNA-img ${destDir}/RNA-img/rn4