8168a89f56c1aacda65d39ddf612b78a501a0d2c max Wed Apr 30 12:07:56 2025 -0700 Allowing to be on a beta branch when doing make alpha. This may sound strange, but if we do not allow this, I don't know how a mirror can build into the normal alpha directory /usr/local/apache/cgi-bin/ while being on the beta branch. Mirrors should not be on the master branch, they should be on the beta branch, as that's our release. No idea why this has never come up before. diff --git src/makefile src/makefile index 9a50766ec7f..7543c906c35 100644 --- src/makefile +++ src/makefile @@ -56,36 +56,36 @@ 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 + # this will fail if we are not on master or beta branch: + git branch | egrep '\* master|beta' > /dev/null check-beta: # this will fail if we are not in a beta checkout: - git branch | egrep '\* v[0-9]+_branch|beta' > /dev/null + git branch | egrep '\* v[0-9]+_branch' > /dev/null BLAT_SUITE_DIRS = blat gfClient gfServer webBlat hg/pslPretty hg/pslReps \ hg/pslSort utils/nibFrag utils/faToNib utils/faToTwoBit utils/twoBitToFa \ utils/twoBitInfo isPcr blatz blatSuite: ${BLAT_SUITE_DIRS:%=%.blatSuite} %.blatSuite: topLibs hgLib ${MAKE} -C $* # all of these application makefiles have been updated to include use # of DESTDIR and BINDIR # common subdirs uses by multiple targets STD_DIRS = ameme index dnaDust protDust weblet aladdin primeMate fuse meta tagStorm \