Diff for /loncom/build/Makefile between versions 1.162.2.6 and 1.188.2.3

version 1.162.2.6, 2004/08/10 20:05:57 version 1.188.2.3, 2009/01/05 17:22:23
Line 22  SAVE=program.pl.$(TIMESTAMP) Line 22  SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)  LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""  METAMTARGET=""
 MTARGET=""  MTARGET=""
 VERSION=1.1.99.3  VERSION=2.7.99.1
 # The current working definition for "RELEASE" is: changes not in the software,  # The current working definition for "RELEASE" is: changes not in the software,
 # but in the operating system dependent packaging of the software.  Thus, the  # but in the operating system dependent packaging of the software.  Thus, the
 # generic tarball releases do not need to have a release number specified.  # generic tarball releases do not need to have a release number specified.
Line 119  help_TARGETS: Line 119  help_TARGETS:
  @echo "         system"   @echo "         system"
  @echo "sanitycheck: probe for common errors and recommend fixes to"   @echo "sanitycheck: probe for common errors and recommend fixes to"
  @echo "             the user"   @echo "             the user"
    @echo "logcleanup: clean spurious logfile entries"
    @echo "clean_file_permissions: Remove erroneous keys from the  "
    @echo "    file_permissions.db"
  @echo "accesscount_seed: Migrate the access counting mechanism from "   @echo "accesscount_seed: Migrate the access counting mechanism from "
  @echo "    nohist_reseval.db to nohist_accesscount.db."   @echo "    nohist_reseval.db to nohist_accesscount.db."
  @echo "modify_config_files: Perform automatic update of the "   @echo "modify_config_files: Perform automatic update of the "
  @echo "    configuration files for yum and MySQL."   @echo "    configuration files for yum and MySQL."
  @echo "ntpcheck: test to see if ntp is installed and running."   @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 "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 "rpmcheck: test to see if rpms known to confict are installed."
    @echo "wrap_setuid: put a C wrapper around setuid scripts."
           @echo "latex_fixup: regenerate ls-R database for the latex base."
    @echo "picins_check: check for picins.sty, retrieve and rebuild"
    @echo "             filename databases used by LaTeX"
    @echo "mimetex_version_check: check if mimetex.cgi version has changed,"
    @echo "                      if so remove files from mimetexcache."
  @echo "updatequery: solicit the user for machine configuration"   @echo "updatequery: solicit the user for machine configuration"
  @echo "             information; to be incorporated during an update"   @echo "             information; to be incorporated during an update"
  @echo "             procedure (via the UPDATE command)"   @echo "             procedure (via the UPDATE command)"
Line 242  TEST_hosts_tab: Line 254  TEST_hosts_tab:
  else echo "**** ERROR **** hosts.tab not defined!" && \   else echo "**** ERROR **** hosts.tab not defined!" && \
      echo -n "You need to do one of the following within your " && \       echo -n "You need to do one of the following within your " && \
      echo "CVS repository (cd loncapa/loncom)" && \       echo "CVS repository (cd loncapa/loncom)" && \
      echo "   1) ln -s production_hosts.tab hosts.tab" && \       echo "   1) ln -s production_dns_hosts.tab dns_hosts.tab" && \
      echo "   2) ln -s development_hosts.tab hosts.tab" && \       echo "   2) ln -s development_dns_hosts.tab dns_hosts.tab" && \
      echo "or 3) ln -s rawhide_hosts.tab hosts.tab" && \       echo "or 3) ln -s rawhide_hosts.tab hosts.tab" && \
      echo "(you most likely want option #1, production_hosts.tab)" && \       echo "(you most likely want option #1, production_hosts.tab)" && \
      exit 1; \       exit 1; \
Line 256  TEST_domain_tab: Line 268  TEST_domain_tab:
  else echo "**** ERROR **** domain.tab not defined!" && \   else echo "**** ERROR **** domain.tab not defined!" && \
      echo -n "You need to do one of the following within your " && \       echo -n "You need to do one of the following within your " && \
      echo "CVS repository (cd loncapa/loncom)" && \       echo "CVS repository (cd loncapa/loncom)" && \
      echo "   1) ln -s production_domain.tab domain.tab" && \       echo "   1) ln -s production_dns_domain.tab dns_domain.tab" && \
      echo "   2) ln -s development_domain.tab domain.tab" && \       echo "   2) ln -s development_dns_domain.tab dns_domain.tab" && \
      echo "or 3) ln -s rawhide_domain.tab domain.tab" && \       echo "or 3) ln -s rawhide_domain.tab domain.tab" && \
      echo "(you most likely want option #1, production_domain.tab)" && \       echo "(you most likely want option #1, production_domain.tab)" && \
      exit 1; \       exit 1; \
Line 332  hosts_and_domain_tab: TEST_hosts_tab TES Line 344  hosts_and_domain_tab: TEST_hosts_tab TES
   
 webserverconf:  webserverconf:
  cat $(SOURCE)/doc/loncapafiles/webserver.piml | \   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  # ---------------- Top-level files such as README, UPDATE, CHECKRPMS, and TEST
 vanillatar:  vanillatar:
  # --------------------------- Point UPDATE to the internal make process   # --------------------------- Point UPDATE to the internal make process
  echo '#!/bin/sh' > $(SOURCE)/UPDATE   cp  $(SOURCE)/loncom/UPDATE $(SOURCE)/UPDATE
  echo 'touch loncom/build/WARNINGS' >> $(SOURCE)/UPDATE;  
  echo 'ln -s loncom/build/WARNINGS WARNINGS' >> $(SOURCE)/UPDATE;  
  echo 'cd loncom/build; make build' >> $(SOURCE)/UPDATE  
  echo 'make rawinstall' >> $(SOURCE)/UPDATE  
  echo 'make configinstall' >> $(SOURCE)/UPDATE  
  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   # ----------------------------- Point TEST to the internal make process
  echo '#!/bin/sh' > $(SOURCE)/TEST   echo '#!/bin/sh' > $(SOURCE)/TEST
  echo 'cd loncom/build; make test' >> $(SOURCE)/TEST   echo 'cd loncom/build; make test' >> $(SOURCE)/TEST
Line 394  ntpcheck: Line 396  ntpcheck:
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
  tee -a WARNINGS   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
   
   math_random_check:
    cat $(SOURCE)/doc/loncapafiles/math_random_check.piml | \
    perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    tee -a WARNINGS
   
 cron_lpmlcheck:  cron_lpmlcheck:
  cat $(SOURCE)/doc/loncapafiles/cron_lpmlcheck.piml | \   cat $(SOURCE)/doc/loncapafiles/cron_lpmlcheck.piml | \
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
  tee -a WARNINGS   tee -a WARNINGS
   
   chkconfig:
    cat $(SOURCE)/doc/loncapafiles/chkconfig.piml | \
    perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    tee -a WARNINGS
   
 rpmcheck:  rpmcheck:
  cat $(SOURCE)/doc/loncapafiles/rpmcheck.piml | \   cat $(SOURCE)/doc/loncapafiles/rpmcheck.piml | \
Line 410  sanitycheck: Line 426  sanitycheck:
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
  tee -a WARNINGS   tee -a WARNINGS
   
   logcleanup:
    cat $(SOURCE)/doc/loncapafiles/logcleanup.piml | \
    perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    tee -a WARNINGS
   
 updatequery:  updatequery:
  cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \   cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH)   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:  accesscount_seed:
  cat $(SOURCE)/doc/loncapafiles/accesscount_seed.piml | \   cat $(SOURCE)/doc/loncapafiles/accesscount_seed.piml | \
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
Line 429  reseval_fixup: Line 459  reseval_fixup:
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
  tee -a WARNINGS   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:  clearoutoldspreadsheetcache:
  cat $(SOURCE)/doc/loncapafiles/clearoutoldspreadsheetcache.piml | \   cat $(SOURCE)/doc/loncapafiles/clearoutoldspreadsheetcache.piml | \
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
Line 444  ownership_fix: Line 479  ownership_fix:
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
  tee -a WARNINGS   tee -a WARNINGS
   
   wrap_setuid:
    cat $(SOURCE)/doc/loncapafiles/wrap_setuid.piml | \
    perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    tee -a WARNINGS
   
   latex_fixup:
    cat $(SOURCE)/doc/loncapafiles/latex_fixup.piml | \
           perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
           tee -a WARNINGS
   
   picins_check:
    cat $(SOURCE)/doc/loncapafiles/picins_check.piml | \
    perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    tee -a WARNINGS
   
   mimetex_version_check:
    cat $(SOURCE)/doc/loncapafiles/mimetex_version_check.piml | \
    perl piml_parse.pl  $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    tee -a WARNINGS
   
 postinstall:  postinstall:
  make webserverconf   make webserverconf
  make reseval_fixup   make reseval_fixup
    make clean_file_permissions
  make accesscount_seed   make accesscount_seed
    make update_queue_slots
  make modify_config_files   make modify_config_files
  make clearoutoldspreadsheetcache   make clearoutoldspreadsheetcache
    make chkconfig
  make rpmcheck   make rpmcheck
  make ntpcheck   make ntpcheck
    make html_parser_check
  make cron_lpmlcheck   make cron_lpmlcheck
  make sanitycheck   make sanitycheck
    make logcleanup
  make sendmail_fix   make sendmail_fix
  make ownership_fix   make ownership_fix
    make wrap_setuid
    make latex_fixup
    make picins_check
    make mimetex_version_check
 VERSION:  VERSION:
  install -d $(TARGET)/etc   install -d $(TARGET)/etc
  echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release   echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release
Line 467  VERSION: Line 530  VERSION:
   
 aboutVERSION:  aboutVERSION:
  cat $(SOURCE)/loncom/license/about.html | \   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   $(SOURCE)/loncom/license/about.html.new
  mv -v $(SOURCE)/loncom/license/about.html.new \   mv -v $(SOURCE)/loncom/license/about.html.new \
  $(SOURCE)/loncom/license/about.html   $(SOURCE)/loncom/license/about.html
  cat $(SOURCE)/loncom/loncapa_apache.conf | \   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   $(SOURCE)/loncom/loncapa_apache.conf.new
  mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \   mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \
  $(SOURCE)/loncom/loncapa_apache.conf   $(SOURCE)/loncom/loncapa_apache.conf
Line 555  MANIFEST_all: Line 618  MANIFEST_all:
  echo 'loncom/development_hosts.tab' >> $(SOURCE)/MANIFEST   echo 'loncom/development_hosts.tab' >> $(SOURCE)/MANIFEST
  echo 'loncom/production_domain.tab' >> $(SOURCE)/MANIFEST   echo 'loncom/production_domain.tab' >> $(SOURCE)/MANIFEST
  echo 'loncom/development_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   # ------------------ Files needed for dynamically generated directories
  echo 'doc/man' >> $(SOURCE)/MANIFEST   echo 'doc/man' >> $(SOURCE)/MANIFEST
  echo 'doc/lib' >> $(SOURCE)/MANIFEST   echo 'doc/lib' >> $(SOURCE)/MANIFEST
Line 687  BinaryRoot: base_rpm_file_list Line 754  BinaryRoot: base_rpm_file_list
   
 # ======================================== *** MASTER DOCUMENTATION TARGETS ***  # ======================================== *** MASTER DOCUMENTATION TARGETS ***
   
   buildwebsite:
    cd ../../doc/build; perl ./generate_web_pages.pl
   
   
 # Generates CVS:loncom/build/docs; root location of install.lon-capa.org  # Generates CVS:loncom/build/docs; root location of install.lon-capa.org
 doc:  doc:
  install -d docs   install -d docs

Removed from v.1.162.2.6  
changed lines
  Added in v.1.188.2.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>