b17b303019d5e7b395b04ef620885f07c30e169d braney Tue Jul 16 17:14:07 2013 -0700 uncomment out the git pull in the beta target diff --git src/hg/htdocs/makefile src/hg/htdocs/makefile index 3804011..a140408 100644 --- src/hg/htdocs/makefile +++ src/hg/htdocs/makefile @@ -1,37 +1,37 @@ include ../../inc/common.mk GIT = git GITUP = ${GIT} pull FIND=gitFiles 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} + ${GITUP} ${MAKE} doInstall destDir=qateam@hgwbeta:${DOCUMENTROOT} # 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: