--- loncom/build/Makefile 2003/06/17 01:19:02 1.149 +++ loncom/build/Makefile 2004/12/15 19:59:05 1.171.2.1 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.149 2003/06/17 01:19:02 albertel Exp $ +# $Id: Makefile,v 1.171.2.1 2004/12/15 19:59:05 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=0.99.2 +VERSION=1.2.99.1 # 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. @@ -119,13 +119,23 @@ 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 "html_parser_check: test functionality of HTML::Parser." + @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" @@ -295,11 +305,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 @@ -323,7 +333,8 @@ hosts_and_domain_tab: TEST_hosts_tab TES webserverconf: cat $(SOURCE)/doc/loncapafiles/webserver.piml | \ - perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ + tee -a WARNINGS # ---------------- Top-level files such as README, UPDATE, CHECKRPMS, and TEST vanillatar: @@ -337,6 +348,7 @@ vanillatar: echo 'make updatequery' >> $(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 @@ -364,17 +376,42 @@ 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 + +html_parser_check: + cat $(SOURCE)/doc/loncapafiles/html_parser_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) | \ + 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) | \ @@ -384,6 +421,20 @@ updatequery: cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \ perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH) +run_searchcat: + cat $(SOURCE)/doc/loncapafiles/run_searchcat.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) | \ @@ -399,17 +450,32 @@ 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 html_parser_check + 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 | \ @@ -417,6 +483,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 *** @@ -521,16 +592,16 @@ MANIFEST_cvs: # ------------------- MANIFEST the building, testing and standard loncapa files MANIFEST_lpml: cat $(SOURCE)/doc/loncapafiles/buildfiles.lpml | \ - perl lpml_parse.pl MANIFEST development default \ + perl lpml_parse.pl MANIFEST development $(DIST) \ '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST cat $(SOURCE)/doc/loncapafiles/testfiles.lpml | \ - perl lpml_parse.pl MANIFEST development default \ + perl lpml_parse.pl MANIFEST development $(DIST) \ '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST cat $(SOURCE)/doc/loncapafiles/installfiles.lpml | \ - perl lpml_parse.pl MANIFEST development default \ + perl lpml_parse.pl MANIFEST development $(DIST) \ '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \ - perl lpml_parse.pl MANIFEST development default \ + perl lpml_parse.pl MANIFEST development $(DIST) \ '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST # ------------ Files for top-level (the vanilla layer that the user first sees) @@ -628,6 +699,10 @@ BinaryRoot: base_rpm_file_list # ======================================== *** MASTER DOCUMENTATION TARGETS *** +buildwebsite: + cd ../../doc/build; perl ./generate_web_pages.pl + + # Generates CVS:loncom/build/docs; root location of install.lon-capa.org doc: install -d docs