1a59145d5dd903ed9a6d8cc3279b4a2f0f637814 max Mon Oct 12 05:42:04 2020 -0700 fixing previous commit where I went about the makefile change in the wrong way. Email with Lou, no redmine. diff --git src/makefile src/makefile index a254617..6c58b6e 100644 --- src/makefile +++ src/makefile @@ -30,30 +30,36 @@ libs: topLibs hgLib optLib cgi: libs cd hg && ${MAKE} cgi cd utils/bedToBigBed && ${MAKE} cgi cgi-alpha: check-alpha libs logUser cd hg && ${MAKE} alpha cd utils/bedToBigBed && ${MAKE} alpha cgi-beta: check-beta libs logUser cd hg && ${MAKE} beta cd utils/bedToBigBed && ${MAKE} beta +# This log file can be useful when debugging problems on the alpha and beta builds. +logUser: +ifeq (${IS_HGWDEV},yes) + echo ${USER}, $(MAKECMDGOALS), `date` >> ${CGI_BIN}/buildLog.txt +endif + check-alpha: # this will fail if we are not on master branch: git branch | egrep '\* master' > /dev/null check-beta: # this will fail if we are not in a beta checkout: git branch | egrep '\* v[0-9]+_branch' > /dev/null blatSuite: topLibs hgLib cd blat && ${MAKE} cd gfClient && ${MAKE} cd gfServer && ${MAKE} cd webBlat && ${MAKE} cd hg/pslPretty && ${MAKE} cd hg/pslReps && ${MAKE}