7354574f49260362fdabce3552b6602fbe515ea4 maximilianh Wed Apr 30 16:54:57 2025 +0200 allowing builds on the beta tag alone, required to build the tree on a beta checkout so the install script does not have to lookup the current version number but can just do a git clone of beta and start the build diff --git src/makefile src/makefile index 8071b6a4add..9a50766ec7f 100644 --- src/makefile +++ src/makefile @@ -61,31 +61,31 @@ 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 + git branch | egrep '\* v[0-9]+_branch|beta' > /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 \