--- loncom/build/Makefile 2006/01/03 20:00:21 1.180 +++ loncom/build/Makefile 2007/11/28 17:21:09 1.185.2.1 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.180 2006/01/03 20:00:21 albertel Exp $ +# $Id: Makefile,v 1.185.2.1 2007/11/28 17:21:09 albertel Exp $ # TYPICAL USAGE of this Makefile is primarily for two targets: # "make build" and "make install". @@ -22,7 +22,7 @@ SAVE=program.pl.$(TIMESTAMP) LAUNCHSAVE=$(OUTSTREAM) $(SAVE) METAMTARGET="" MTARGET="" -VERSION=CVS_HEAD +VERSION=2.5.99.0 # 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. @@ -128,6 +128,7 @@ help_TARGETS: @echo " configuration files for yum and MySQL." @echo "ntpcheck: test to see if ntp is installed and running." @echo "html_parser_check: test functionality of HTML::Parser." + @echo "math_random_check: test functionality of Math::Random." @echo "cron_lpmlcheck: remove cron file /etc/cron.d/loncapa.lpml." @echo "chkconfig: test runlevels of httpd and loncontrol." @echo "rpmcheck: test to see if rpms known to confict are installed." @@ -395,6 +396,11 @@ html_parser_check: perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ tee -a WARNINGS +math_random_check: + cat $(SOURCE)/doc/loncapafiles/math_random_check.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) | \ @@ -448,6 +454,11 @@ reseval_fixup: perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ tee -a WARNINGS +update_queue_slots: + cat $(SOURCE)/doc/loncapafiles/update_queue_slots.piml | \ + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ + tee -a WARNINGS + clearoutoldspreadsheetcache: cat $(SOURCE)/doc/loncapafiles/clearoutoldspreadsheetcache.piml | \ perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ @@ -473,6 +484,7 @@ postinstall: make reseval_fixup make clean_file_permissions make accesscount_seed + make update_queue_slots make modify_config_files make clearoutoldspreadsheetcache make chkconfig @@ -496,12 +508,12 @@ VERSION: aboutVERSION: cat $(SOURCE)/loncom/license/about.html | \ - perl -e '$$d=`date +"%Y%m%d"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \ + perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \ $(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;}' > \ + perl -e '$$d=`date +"%Y%m%d%H"`;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 @@ -584,6 +596,10 @@ MANIFEST_all: echo 'loncom/development_hosts.tab' >> $(SOURCE)/MANIFEST echo 'loncom/production_domain.tab' >> $(SOURCE)/MANIFEST echo 'loncom/development_domain.tab' >> $(SOURCE)/MANIFEST + echo 'loncom/production_dns_hosts.tab' >> $(SOURCE)/MANIFEST + echo 'loncom/development_dns_hosts.tab' >> $(SOURCE)/MANIFEST + echo 'loncom/production_dns_domain.tab' >> $(SOURCE)/MANIFEST + echo 'loncom/development_dns_domain.tab' >> $(SOURCE)/MANIFEST # ------------------ Files needed for dynamically generated directories echo 'doc/man' >> $(SOURCE)/MANIFEST echo 'doc/lib' >> $(SOURCE)/MANIFEST