--- loncom/build/Makefile	2003/01/24 01:21:30	1.143
+++ loncom/build/Makefile	2004/08/10 15:36:34	1.162.2.5
@@ -1,7 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# Scott Harrison, your friendly neighborhood volunteer
-# $Id: Makefile,v 1.143 2003/01/24 01:21:30 harris41 Exp $
+# $Id: Makefile,v 1.162.2.5 2004/08/10 15:36:34 albertel Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -23,7 +22,7 @@ SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
-VERSION=0.6.1
+VERSION=1.1.99.3
 # The current working definition for "RELEASE" is: changes not in the software,
 # but in the operating system dependent packaging of the software.  Thus, the
 # generic tarball releases do not need to have a release number specified.
@@ -92,8 +91,9 @@ help_TARGETS:
 	@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' ***"
@@ -108,7 +108,8 @@ help_TARGETS:
 	@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"
@@ -118,13 +119,22 @@ help_TARGETS:
 	@echo "         system"
 	@echo "sanitycheck: probe for common errors and recommend fixes to"
 	@echo "             the user"
+	@echo "accesscount_seed: Migrate the access counting mechanism from "
+	@echo "    nohist_reseval.db to nohist_accesscount.db."
+	@echo "modify_config_files: Perform automatic update of the "
+	@echo "    configuration files for yum and MySQL."
+	@echo "ntpcheck: test to see if ntp is installed and running."
+	@echo "cron_lpmlcheck: remove cron file /etc/cron.d/loncapa.lpml."
+	@echo "rpmcheck: test to see if rpms known to confict are installed."
 	@echo "updatequery: solicit the user for machine configuration"
 	@echo "             information; to be incorporated during an update"
 	@echo "             procedure (via the UPDATE command)"
 	@echo "postinstall: double-check things after installation"
 	@echo "VERSION: tag the filesystem with version information inside"
-	@echo "         /etc/loncapa-release"
+	@echo "         /etc/loncapa-release and"
+	@echo "         /home/httpd/html/lon-status/version.txt"
 	@echo "aboutVERSION: place version information inside about.html"
+	@echo "              and loncapa_apache.conf"
 	@echo "*** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***"
 	@echo "Makefile.configinstall: generate a Makefile for configuration"
 	@echo "                        files; built dynamically from"
@@ -139,8 +149,9 @@ help_TARGETS:
 	@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"
@@ -238,6 +249,20 @@ TEST_hosts_tab:
 	     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"; \
@@ -269,7 +294,7 @@ configinstall: Makefile.configinstall
 	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
@@ -279,11 +304,11 @@ install: buildflag VERSION TEST_hosts_ta
 	NORESTORECONF="$(NORESTORECONF)" configinstall
 	make postinstall
 	make warningnote
-	echo "You can run 'make test' to see if your system is ready to go!"
-	echo "NOTE THAT YOUR SYSTEM MUST HAVE MYSQL WITH A USER=\"www\" AND"
-	echo -n "PASSWORD=\"localhostkey\" FOR www\@localhost"
-	echo -n "(YOU MAY NEED TO REINITIALIZE YOUR MYSQL www\@localhost USER)"
-	echo -n "Please see http://install.lon-capa.org/ for more information"
+	@echo "You can now run 'make test' to see if your system is ready to go!"
+#	@echo "NOTE THAT YOUR SYSTEM MUST HAVE MYSQL WITH A USER=\"www\" AND"
+#	@echo -n "PASSWORD=\"localhostkey\" FOR www\@localhost"
+#	@echo -n "(YOU MAY NEED TO REINITIALIZE YOUR MYSQL www\@localhost USER)"
+#	@echo -n "Please see http://install.lon-capa.org/ for more information"
 
 rawinstall: VERSION Makefile.install Makefile
 	echo -n "" > WARNINGS
@@ -294,14 +319,14 @@ rawinstall: VERSION Makefile.install Mak
 	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"
 
@@ -319,8 +344,9 @@ vanillatar:
 	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 run_searchcat' >> $(SOURCE)/UPDATE
 	echo 'make aboutVERSION' >> $(SOURCE)/UPDATE
 	echo 'make warningnote' >> $(SOURCE)/UPDATE
 	# ----------------------------- Point TEST to the internal make process
@@ -334,7 +360,7 @@ vanillatar:
 	chmod a+rx $(SOURCE)/TEST
 	chmod a+rx $(SOURCE)/CHECKRPMS
 	# -------------------------------- Copy README to the vanilla top-level
-	cp -v $(SOURCE)/doc/shortest_path_redhat7.2.txt $(SOURCE)/README
+	#cp -v $(SOURCE)/doc/shortest_path_redhat7.2.txt $(SOURCE)/README
 
 tardist:
 	make MANIFEST_all
@@ -348,17 +374,37 @@ tardist:
 	fi
 	cp -v $(SOURCE)/loncom/license/about.html \
 	$(SOURCE)/loncom/license/about.html.orig
+	cp -v $(SOURCE)/loncom/loncapa_apache.conf \
+	$(SOURCE)/loncom/loncapa_apache.conf.orig
 	make aboutVERSION
 	cd $(SOURCE); \
 	tar --no-recursion --numeric-owner --files-from MANIFEST \
 	-h -czf $(DIRTARGET).tar.gz 2>tar_WARNINGS || [ "0" == "0" ]
 	mv -v $(SOURCE)/loncom/license/about.html.orig \
 	$(SOURCE)/loncom/license/about.html
+	mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \
+	$(SOURCE)/loncom/loncapa_apache.conf
 	cat $(SOURCE)/tar_WARNINGS | \
 	xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS
 	rm -f $(SOURCE)/tar_WARNINGS
 	make warningnote
 
+ntpcheck:
+	cat $(SOURCE)/doc/loncapafiles/ntpcheck.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+cron_lpmlcheck:
+	cat $(SOURCE)/doc/loncapafiles/cron_lpmlcheck.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+
+rpmcheck:
+	cat $(SOURCE)/doc/loncapafiles/rpmcheck.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 sanitycheck:
 	cat $(SOURCE)/doc/loncapafiles/sanitycheck.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
@@ -368,6 +414,16 @@ updatequery:
 	cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH)
 
+accesscount_seed:
+	cat $(SOURCE)/doc/loncapafiles/accesscount_seed.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+modify_config_files:
+	cat $(SOURCE)/doc/loncapafiles/modify_config_files.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 reseval_fixup:
 	cat $(SOURCE)/doc/loncapafiles/reseval_fixup.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
@@ -383,17 +439,31 @@ sendmail_fix:
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+ownership_fix:
+	cat $(SOURCE)/doc/loncapafiles/ownership_fix.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 postinstall:
 	make webserverconf
 	make reseval_fixup
+	make accesscount_seed
+	make modify_config_files
 	make clearoutoldspreadsheetcache
+	make rpmcheck
+	make ntpcheck
+	make cron_lpmlcheck
 	make sanitycheck
 	make sendmail_fix
+	make ownership_fix
 
 VERSION:
 	install -d $(TARGET)/etc
 	echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release
 	date +"%Y%m%d" >> $(TARGET)/etc/loncapa-release
+	install -d $(TARGET)/home/httpd/html/lon-status
+	echo -n "$(VERSION)-" > $(TARGET)/home/httpd/html/lon-status/version.txt
+	date +"%Y%m%d" >> $(TARGET)/home/httpd/html/lon-status/version.txt
 
 aboutVERSION:
 	cat $(SOURCE)/loncom/license/about.html | \
@@ -401,6 +471,11 @@ aboutVERSION:
 	$(SOURCE)/loncom/license/about.html.new
 	mv -v $(SOURCE)/loncom/license/about.html.new \
 	$(SOURCE)/loncom/license/about.html
+	cat $(SOURCE)/loncom/loncapa_apache.conf | \
+	perl -e '$$d=`date +"%Y%m%d"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \
+	$(SOURCE)/loncom/loncapa_apache.conf.new
+	mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \
+	$(SOURCE)/loncom/loncapa_apache.conf
 
 # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***
 
@@ -452,9 +527,9 @@ lpmladm:
 		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" \
@@ -478,6 +553,8 @@ MANIFEST_all:
 	echo 'loncom/rawhide_hosts.tab' >> $(SOURCE)/MANIFEST
 	echo 'loncom/production_hosts.tab' >> $(SOURCE)/MANIFEST
 	echo 'loncom/development_hosts.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/production_domain.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/development_domain.tab' >> $(SOURCE)/MANIFEST
 	# ------------------ Files needed for dynamically generated directories
 	echo 'doc/man' >> $(SOURCE)/MANIFEST
 	echo 'doc/lib' >> $(SOURCE)/MANIFEST