--- loncom/build/Makefile 2003/08/05 12:52:23 1.153 +++ loncom/build/Makefile 2005/07/08 01:31:08 1.176 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.153 2003/08/05 12:52:23 www Exp $ +# $Id: Makefile,v 1.176 2005/07/08 01:31:08 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.4 +VERSION=CVS_HEAD # 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,6 +119,18 @@ help_TARGETS: @echo " system" @echo "sanitycheck: probe for common errors and recommend fixes to" @echo " the user" + @echo "clean_file_permissions: Remove erroneous keys from the " + @echo " file_permissions.db" + @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 "chkconfig: test runlevels of httpd and loncontrol." + @echo "rpmcheck: test to see if rpms known to confict are installed." + @echo "wrap_setuid: put a C wrapper around setuid scripts." @echo "updatequery: solicit the user for machine configuration" @echo " information; to be incorporated during an update" @echo " procedure (via the UPDATE command)" @@ -325,7 +337,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: @@ -339,6 +352,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 @@ -381,6 +395,31 @@ tardist: 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 + +chkconfig: + cat $(SOURCE)/doc/loncapafiles/chkconfig.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) | \ @@ -390,6 +429,25 @@ 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) + +clean_file_permissions: + cat $(SOURCE)/doc/loncapafiles/clean_file_permissions.piml | \ + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ + tee -a WARNINGS + +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) | \ @@ -405,12 +463,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 + +wrap_setuid: + cat $(SOURCE)/doc/loncapafiles/wrap_setuid.piml | \ + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ + tee -a WARNINGS + postinstall: make webserverconf make reseval_fixup + make clean_file_permissions + make accesscount_seed + make modify_config_files make clearoutoldspreadsheetcache + make chkconfig + make rpmcheck + make ntpcheck + make html_parser_check + make cron_lpmlcheck make sanitycheck make sendmail_fix + make ownership_fix + make wrap_setuid VERSION: install -d $(TARGET)/etc @@ -535,16 +613,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) @@ -642,6 +720,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