CGI loaders working

ucscGenomeBrowser · Jan 29, 2025 · 1c002ea · 1c002ea
1 parent 4d1132f
commit 1c002ea
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,8 +14,8 @@ src/htslib/version.h
 *.gcno
 
 .emacs.bak/
-src/hg/pslCDnaFilter/algo.msg
-src/hg/pslCDnaFilter/usage.msg
+src/hg/pslCDnaFilter/algo.h
+src/hg/pslCDnaFilter/usage.h
 
 compiled/
 
@@ -26,7 +26,7 @@ compiled/
 src/hg/hgGateway/hgGateway.html.h
 src/hg/hgPhyloPlace/phyloPlace
 src/isPcr/webPcr/webPcr
-src/utils/pslMap/usage.msg
+src/utils/pslMap/usage.h
 src/webBlat/webBlat
 
 # test results
@@ -54,7 +54,7 @@ src/hg/liftAcross/tests/testOut.bed
 src/hg/liftAcross/tests/testOutput.gp
 src/hg/sqlToXml/test/visiGeneXml/out.xml
 src/hg/utils/bedMergeAdjacent/tests/output.bed
-src/hg/utils/overlapSelect/usage.msg
+src/hg/utils/overlapSelect/usage.h
 src/utils/bedGeneParts/firstCodingSplice.out
 src/utils/bedGeneParts/firstExon.out
 src/utils/bedGeneParts/introns.out

diff --git a/src/hg/makeDb/hgGoldGapGl/makefile b/src/hg/makeDb/hgGoldGapGl/makefile
@@ -1,5 +1,5 @@
 kentSrc = ../../..
-A = hgGoldGapGl hgLoadGap
+iA = hgGoldGapGl hgLoadGap
 extraHeaders = ntContig.h
 extraObjects = ntContig.o
 include ${kentSrc}/inc/userApp.mk
diff --git a/src/hg/makeDb/hgLoadBed/makefile b/src/hg/makeDb/hgLoadBed/makefile
@@ -1,4 +1,5 @@
 kentSrc = ../../..
 A = hgLoadBed
+SQL_FILES = ../../lib/encode/encodePeak.sql ../../lib/pgSnp.sql ../../lib/bedDetail.sql ../../lib/bigPsl.as ../../lib/barChartBed.sql ../../lib/interact.sql
 include ${kentSrc}/inc/cgiLoader.mk
 
diff --git a/src/hg/makeDb/hgLoadMaf/makefile b/src/hg/makeDb/hgLoadMaf/makefile
@@ -1,5 +1,5 @@
 kentSrc = ../../..
 A = hgLoadMaf hgLoadMafSummary
-include ${kentSrc}/inc/userApp.mk
+include ${kentSrc}/inc/cgiLoader.mk
 
 
diff --git a/src/hg/utils/hubCheck/makefile b/src/hg/utils/hubCheck/makefile
@@ -1,3 +1,3 @@
 kentSrc = ../../..
 A = hubCheck
-include ${kentSrc}/inc/userApp.mk
+include ${kentSrc}/inc/cgiLoader.mk
diff --git a/src/hg/utils/pslToBigPsl/makefile b/src/hg/utils/pslToBigPsl/makefile
@@ -1,3 +1,3 @@
 kentSrc = ../../..
 A = pslToBigPsl
-include $(kentSrc)/inc/userApp.mk
+include $(kentSrc)/inc/cgiLoader.mk
diff --git a/src/inc/cgiLoader.mk b/src/inc/cgiLoader.mk
@@ -10,18 +10,19 @@
 ########################################################################
 
 include ${kentSrc}/inc/userApp.mk
+include ${kentSrc}/inc/cgiVars.mk
 
-cgi:: compile
+# this target uses CGI_BIN_DEST set in cgiVars.mk to do any of the CGI targers
+cgi_any:: compile
 	chmod a+rx ${A:%=%${EXE}}
-	${MKDIR} ${CGI_BIN}-${USER}/loader; \
-	mv -f ${A:%=%${EXE}} ${CGI_BIN}-${USER}/loader/
-
-alpha:: compile
-	${MKDIR} ${CGI_BIN}/loader; \
-	${STRIP} ${A:%=%${EXE}}
-	cp -f ${A:%=%${EXE}} ${CGI_BIN}/loader/
+	${MKDIR} ${CGI_BIN_DEST}/loader
+	chmod a+rx ${A:%=%${EXE}}
+	mv -f ${A:%=%${EXE}} ${CGI_BIN_DEST}/loader/
+	for F in ${SQL_FILES}; do \
+	    B=`basename $$F` ; \
+	    cp -fp $$F ${CGI_BIN_DEST}/loader/$$B ; \
+	done
 
-beta:: compile
-	${MKDIR} ${CGI_BIN}-beta/loader; \
-	${STRIP} ${A:%=%${EXE}}
-	cp -f ${A:%=%${EXE}} ${CGI_BIN}-beta/loader/
+cgi:: cgi_any
+alpha:: cgi_any
+beta:: cgi_any
diff --git a/src/inc/cgiVars.mk b/src/inc/cgiVars.mk
@@ -0,0 +1,26 @@
+# common variables for CGIs and CGI loader programs
+
+ifeq (${CGI_BIN_USER},)
+    CGI_BIN_USER=${CGI_BIN}-${USER}
+endif
+
+ifeq (${CGI_BIN_BETA},)
+    CGI_BIN_BETA=${CGI_BIN}-beta
+endif
+
+# these rules set CGI_BIN_DEST to the right cgi-bin directory depending 
+# on the main goal (my (default), alpha or beta)
+# this won't work if you supply multiple goals "(make my alpha beta")
+# but we do not seem to do that
+CGI_BIN_DEST=${CGI_BIN}
+ifeq ($(MAKECMDGOALS),my)
+    CGI_BIN_DEST=${CGI_BIN}-${USER}
+endif
+ifeq ($(MAKECMDGOALS),)
+    CGI_BIN_DEST=${CGI_BIN}-${USER}
+endif
+ifeq ($(MAKECMDGOALS),beta) 
+    CGI_BIN_DEST=${CGI_BIN}-beta
+endif
+
+
diff --git a/src/inc/cgi_build_rules.mk b/src/inc/cgi_build_rules.mk
@@ -1,27 +1,5 @@
 #	Common set of build rules for CGI binaries
-
-ifeq (${CGI_BIN_USER},)
-    CGI_BIN_USER=${CGI_BIN}-${USER}
-endif
-
-ifeq (${CGI_BIN_BETA},)
-    CGI_BIN_BETA=${CGI_BIN}-beta
-endif
-
-# these rules set CGI_BIN_DEST to the right cgi-bin directory depending 
-# on the main goal (my (default), alpha or beta)
-# this won't work if you supply multiple goals "(make my alpha beta")
-# but we do not seem to do that
-CGI_BIN_DEST=${CGI_BIN}
-ifeq ($(MAKECMDGOALS),my)
-    CGI_BIN_DEST=${CGI_BIN}-${USER}
-endif
-ifeq ($(MAKECMDGOALS),)
-    CGI_BIN_DEST=${CGI_BIN}-${USER}
-endif
-ifeq ($(MAKECMDGOALS),beta) 
-    CGI_BIN_DEST=${CGI_BIN}-beta
-endif
+include ${kentSrc}/inc/cgiVars.mk
 
 my:: compile
 	chmod a+rx $A${EXE}