0d26e52fe661e726d8a34faf7d06d11595cc5879 galt Thu Dec 11 12:17:15 2014 -0800 Adding some helpful reminder comments to htdocs makefile about rsyncing files which have not been checked in yet. diff --git src/hg/htdocs/makefile src/hg/htdocs/makefile index 19f032b..7132fcf 100644 --- src/hg/htdocs/makefile +++ src/hg/htdocs/makefile @@ -1,38 +1,45 @@ include ../../inc/common.mk GIT = git GITUP = ${GIT} pull FIND=gitFiles +# if you need to pick up files not checked-in yet for rsync, +# you can run it like this: +# +# make FIND=find +# +# but be careful as it will rsync everything over including junk + 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} ${MAKE} doInstall destDir=qateam@hgwbeta:${DOCUMENTROOT} ${MAKE} doInstall destDir=${DOCUMENTROOT}-beta # 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 --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 clean: