Diff for /loncom/build/Makefile between versions 1.160 and 1.188.2.1

version 1.160, 2004/06/08 15:18:35 version 1.188.2.1, 2008/12/10 16:11:36
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.0  VERSION=2.7.99.0
 # 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 "    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 "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."   @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 "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 237  TEST_hosts_tab: Line 252  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 251  TEST_domain_tab: Line 266  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 327  hosts_and_domain_tab: TEST_hosts_tab TES Line 342  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 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 388  ntpcheck: Line 394  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:
    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:  rpmcheck:
  cat $(SOURCE)/doc/loncapafiles/rpmcheck.piml | \   cat $(SOURCE)/doc/loncapafiles/rpmcheck.piml | \
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
Line 398  sanitycheck: Line 424  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) | \
  tee -a WARNINGS   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:  reseval_fixup:
  cat $(SOURCE)/doc/loncapafiles/reseval_fixup.piml | \   cat $(SOURCE)/doc/loncapafiles/reseval_fixup.piml | \
  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 427  ownership_fix: Line 477  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
   
 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 clearoutoldspreadsheetcache   make clearoutoldspreadsheetcache
    make chkconfig
  make rpmcheck   make rpmcheck
  make ntpcheck   make ntpcheck
    make html_parser_check
    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
 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 448  VERSION: Line 522  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 536  MANIFEST_all: Line 610  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 561  MANIFEST_cvs: Line 639  MANIFEST_cvs:
 # ------------------- MANIFEST the building, testing and standard loncapa files  # ------------------- MANIFEST the building, testing and standard loncapa files
 MANIFEST_lpml:  MANIFEST_lpml:
  cat $(SOURCE)/doc/loncapafiles/buildfiles.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   '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
  cat $(SOURCE)/doc/loncapafiles/testfiles.lpml | \   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   '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
  cat $(SOURCE)/doc/loncapafiles/installfiles.lpml | \   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   '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
  cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \   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   '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
   
 # ------------ Files for top-level (the vanilla layer that the user first sees)  # ------------ Files for top-level (the vanilla layer that the user first sees)
Line 668  BinaryRoot: base_rpm_file_list Line 746  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.160  
changed lines
  Added in v.1.188.2.1


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.