e92e04e2d6dcf943fb7977d8591817233803fe54 hiram Wed Apr 20 12:49:11 2022 -0700 do the copy of assemblyRequest.html to htdocs-beta before the rsync to hgwbeta statements refs #29237 diff --git src/hg/htdocs/makefile src/hg/htdocs/makefile index a363f1e..059097d 100644 --- src/hg/htdocs/makefile +++ src/hg/htdocs/makefile @@ -28,33 +28,33 @@ ifeq (${DOCUMENTROOT_USER},) DOCUMENTROOT_USER=${DOCUMENTROOT}-${USER} endif user: if test -d ${DOCUMENTROOT_USER}; then \ ${MAKE} doInstall destDir=${DOCUMENTROOT_USER} ; \ fi alpha: ${MAKE} doInstall destDir=${DOCUMENTROOT} beta: ${GITUP} + cp -p --remove-destination ${DOCUMENTROOT}/assemblyRequest.html ${DOCUMENTROOT}-beta/assemblyRequest.html ${MAKE} doInstall destDir=qateam@hgwbeta:${DOCUMENTROOT} ${MAKE} doInstall destDir=${DOCUMENTROOT}-beta - cp -p --remove-destination ${DOCUMENTROOT}/assemblyRequest.html ${DOCUMENTROOT}-beta/assemblyRequest.html # Run rsync. Care is taken to preserve times and modes on files. rsync is # smart about recreating files under the current users so that times and # permissions may be 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 = --whole-file --times --recursive --omit-dir-times --relative --cvs-exclude --exclude='makefile' --exclude='cpAndLinkToResourceFiles.pl' --exclude='style/*' doInstall: umask 002; rsync ${rsyncOpts} ${excl} ${incl} `$(FIND)` ${destDir} # Other targets that may be invoked by ../makefile: compile: install: alpha