diff --git a/GNUmakefile.in b/GNUmakefile.in index 3be5e0efaf92aaae2163b90329bfeb1b2e98f234..78d90d25af457932d399d1dbcfb0ffbb09e61afb 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -62,8 +62,8 @@ endif # # For installation on boss node # -boss-install: install-schemacheck install-sitevarscheck install-dbfillcheck \ - install-genischemacheck install-subdirs install-mkdirs \ +boss-install: install-checks \ + install-subdirs install-mkdirs \ install-setbuildinfo @echo "Boss node installed!" @@ -72,10 +72,24 @@ boss-install-force: install-subdirs install-mkdirs install-setbuildinfo @echo "Boss node installed!" # Skip only the schema checks, but do the other checks. -boss-install-noschemacheck: install-sitevarscheck install-dbfillcheck \ +boss-install-noschemacheck: install-updatecheck \ + install-sitevarscheck install-dbfillcheck \ + install-genischemacheck install-subdirs install-mkdirs \ + install-setbuildinfo + +# Skip the update check. +boss-install-noupdatecheck: install-schemacheck \ + install-sitevarscheck install-dbfillcheck \ install-genischemacheck install-subdirs install-mkdirs \ install-setbuildinfo +# Only the checks: +install-checks: install-updatecheck \ + install-schemacheck \ + install-sitevarscheck \ + install-dbfillcheck install-genischemacheck + @echo "Installation checks completed!" + clrhouse-install: install-subdirs install-mkdirs @echo "CleaingHouse code installed!" @@ -314,6 +328,30 @@ flashboot-install: destdircheck flashboot # A check to see if this is a 'real' install. Kinda hacky, but as far as I can # tell, you can't put ifeq()'s inside of targets # +LIBUPDATEDIRS = -I../install -I../db -I../tbsetup + +ifeq ($(TBROOT),/usr/testbed) +UPDATETESTBED= @cd $(OBJDIR)/install && perl update-testbed +else +UPDATETESTBED= @echo "Skipping update check, since prefix isn't /usr/testbed" +endif +update-testbed: + @echo "Updating the testbed ..." + $(UPDATETESTBED) -i -s + +update-testbed-force: + @echo "Updating the testbed in force mode ..." + $(UPDATETESTBED) -f + +ifeq ($(TBROOT),/usr/testbed) +UPDATECHECK= @cd $(OBJDIR)/install && perl update-testbed -v +else +UPDATECHECK= @echo "Skipping update checks, since prefix isn't /usr/testbed" +endif +install-updatecheck: + @echo "Checking to see if updates need to be run" + $(UPDATECHECK) + ifeq ($(TBROOT),/usr/testbed) SCHEMACHECK= cd $(OBJDIR)/db && perl schemacheck else @@ -384,7 +422,9 @@ elabinelab: # By default, make any target by descending into subdirectories. %: %-subdirs ; -.PHONY: post-install install-mkdirs clrhouse-install install +.PHONY: post-install install-mkdirs clrhouse-install install \ + boss-install-noupdatecheck boss-install-noschemacheck \ + boss-install-force # Get rid of a bunch of nasty built-in implicit rules. .SUFFIXES: