[LON-CAPA-cvs] cvs: loncom /build Makefile

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 17 Jun 2003 01:19:02 -0000


albertel		Mon Jun 16 21:19:02 2003 EDT

  Modified files:              
    /loncom/build	Makefile 
  Log:
  - BUG#1756, make sure make build has a valid domain.tab link
  
  
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.148 loncom/build/Makefile:1.149
--- loncom/build/Makefile:1.148	Fri Jun 13 18:13:09 2003
+++ loncom/build/Makefile	Mon Jun 16 21:19:02 2003
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.148 2003/06/13 22:13:09 albertel Exp $
+# $Id: Makefile,v 1.149 2003/06/17 01:19:02 albertel Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -91,8 +91,9 @@
 	@echo "                          (horizontal testing)"
 	@echo "TEST_web_layer: mimic a login and various vertical actions on "
 	@echo "                a LON-CAPA system"
-	@echo "TEST_hosts_tab: make sure that a loncapa/loncom/hosts.tab"
-	@echo "                file is specified for installation"
+	@echo "TEST_hosts_and_domain_tab: make sure that a "
+	@echo "        loncapa/loncom/hosts.tab and loncapa/loncom/domain.tab"
+	@echo "        file is specified for installation"
 	@echo "TEST_html2ps: test for the presence of html2ps which is needed"
 	@echo "              for making a PDF compilation for pdfdoc"
 	@echo "*** GENERAL TARGETS SUCH AS 'build' AND 'install' ***"
@@ -107,7 +108,8 @@
 	@echo "rawinstall: just install files, links and directories without"
 	@echo "            any bells or whistles (e.g. double-checking"
 	@echo "            configurations, fine-tuning webserver, etc.)"
-	@echo "hosts_tab: install the hosts.tab to the filesystem"
+	@echo "hosts_and_domain_tab: install the hosts.tab and domain.tab" 
+	@echo "                      to the filesystem"
 	@echo "webserverconf: fine-tune the web server configuration;"
 	@echo "               make sure the proper 'Include' statements"
 	@echo "               are appended to httpd.conf"
@@ -138,8 +140,9 @@
 	@echo "*** TARGETS FOR OPERATING ON FILESYSTEMS ACROSS THE NETWORK ***"
 	@echo "lpmladm: coordinates username=lpmladm mediated secure shell"
 	@echo "         processes; needed for the NET_* targets"
-	@echo "NET_hosts_tab: install the hosts.tab to a filesystem elsewhere"
-	@echo "               on the network"
+	@echo "NET_hosts_and_domain_tab: install the hosts.tab and domain.tab"
+	@echo "                          to a filesystem elsewhere"
+	@echo "                          on the network"
 	@echo "NET_webserverconf: fine-tune the web server configuration on a"
 	@echo "                   filesystem elsewhere on the network"
 	@echo "NET_rawinstall: launch the rawinstall target on a filesystem"
@@ -237,6 +240,20 @@
 	     exit 1; \
 	fi
 
+TEST_domain_tab:
+	@echo "Testing domain.tab"
+	@if (test -e ../domain.tab); then \
+		echo "there is a defined link or file; assume okay"; \
+	else echo "**** ERROR **** domain.tab not defined!" && \
+	     echo -n "You need to do one of the following within your " && \
+	     echo "CVS repository (cd loncapa/loncom)" && \
+	     echo "   1) ln -s production_domain.tab domain.tab" && \
+	     echo "   2) ln -s development_domain.tab domain.tab" && \
+	     echo "or 3) ln -s rawhide_domain.tab domain.tab" && \
+	     echo "(you most likely want option #1, production_domain.tab)" && \
+	     exit 1; \
+	fi
+
 TEST_html2ps:
 	@if (test -e /usr/local/html2ps/bin/html2ps); then \
 		echo "I can find html2ps; assume okay"; \
@@ -268,7 +285,7 @@
 	if (test "0" = $(NORESTORECONF)); then \
 	perl loncaparestoreconfigurations suffix .lpmlnew; fi
 
-install: buildflag VERSION TEST_hosts_tab Makefile.install Makefile
+install: buildflag VERSION TEST_hosts_tab TEST_domain_tab Makefile.install Makefile
 	echo -n "" > WARNINGS
 	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
 	directories
@@ -293,14 +310,14 @@
 	make SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
 	NORESTORECONF="$(NORESTORECONF)" configinstall
 
-hosts_tab: TEST_hosts_tab
+hosts_and_domain_tab: TEST_hosts_tab TEST_domain_tab
 	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
 	perl xfml_parse.pl $(SOURCE)/doc/loncapafiles/valid_hosts.xfml | \
 	perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" \
 	"$(TARGET)" > Makefile.install
 	make -f Makefile.install directories
 	make -f Makefile.install files
-	@echo "If hosts.tab has changed, restart httpd and loncontrol:"
+	@echo "If hosts.tab or domain.tab has changed, restart httpd and loncontrol:"
 	@echo "   /etc/rc.d/init.d/httpd restart"
 	@echo "   /etc/rc.d/init.d/loncontrol restart"
 
@@ -318,7 +335,7 @@
 	echo 'make rawinstall' >> $(SOURCE)/UPDATE
 	echo 'make configinstall' >> $(SOURCE)/UPDATE
 	echo 'make updatequery' >> $(SOURCE)/UPDATE
-	echo 'make hosts_tab' >> $(SOURCE)/UPDATE
+	echo 'make hosts_and_domain_tab' >> $(SOURCE)/UPDATE
 	echo 'make postinstall' >> $(SOURCE)/UPDATE
 	echo 'make aboutVERSION' >> $(SOURCE)/UPDATE
 	echo 'make warningnote' >> $(SOURCE)/UPDATE
@@ -451,9 +468,9 @@
 		echo "**** ERROR **** Incorrect METAMTARGET"; \
 	fi
 
-NET_hosts_tab:
+NET_hosts_and_domain_tab:
 	make TIMESTAMP=`date +"%s"` METAMTARGET="TRANSPORT" \
-	MTARGET="hosts_tab" HOSTNAME="$(HOSTNAME)" lpmladm
+	MTARGET="hosts_and_domain_tab" HOSTNAME="$(HOSTNAME)" lpmladm
 
 NET_webserverconf:
 	make TIMESTAMP=`date +"%s"` METAMTARGET="LAUNCH" \