[BACK]Return to Makefile CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / build

Diff for /loncom/build/Makefile between versions 1.190.8.6 and 1.220

version 1.190.8.6, 2011/10/10 00:59:51 version 1.220, 2019/11/07 17:16:32
Line 26  SAVE=program.pl.$(TIMESTAMP) Line 26  SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)  LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""  METAMTARGET=""
 MTARGET=""  MTARGET=""
 VERSION=2.10.1  VERSION=CVS_HEAD
 SHOWVERSION=$(VERSION)  SHOWVERSION=$(VERSION)
 NEXTVERSION=2.11  NEXTVERSION=2.12
 ifeq (CVS_HEAD,${VERSION})  ifeq (CVS_HEAD,${VERSION})
 SHOWVERSION=$(NEXTVERSION).$(VERSION)  SHOWVERSION=$(NEXTVERSION).$(VERSION)
 endif  endif
Line 56  help: Line 56  help:
   
 help_OPTIONS:  help_OPTIONS:
  @echo "* ADJUSTABLE OPTIONS *"   @echo "* ADJUSTABLE OPTIONS *"
  @echo "(option) DIST can be redhat7, debian, redhat6.2, or default"   @echo "(option) DIST can be centosN (N = 5, 6, 7 or 8), rhesN (N = 4, 5, 6, 7 or 8),"
  @echo "         You probably do not need to specify this; it is"   @echo "         scientificN (N = 5, 6 or 7), oracleN (N = 6, 7 or 8),"
  @echo "         automatically probed for."   @echo "         or slesN (N = 9, 10, 11, 12 or 15), or debianN (N = 5 or 6),"
    @echo "         or ubuntuN (N= 6, 8, 10, 12, 14, 16 or 18), or fedoraN (N = 1 .. 31),"
    @echo "         or suseN.M (N.M: 9.2 .. 13.2), or default."
    @echo "         It is unlikely you would ever need to specify this,"
    @echo "         as it is automatically probed for."
  @echo "(option) CATEGORY can be 'runtime' or 'development'; currently"   @echo "(option) CATEGORY can be 'runtime' or 'development'; currently"
  @echo "         the 'development' setting is the most reliable;"   @echo "         the 'development' setting is the most reliable;"
  @echo "         eventually, production machines should be using the"   @echo "         eventually, production machines should be using the"
Line 136  help_TARGETS: Line 140  help_TARGETS:
  @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 "langcheck: test to see if root bash and OS are using English."
  @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 "html_parser_check: test functionality of HTML::Parser."
  @echo "math_random_check: test functionality of Math::Random."   @echo "math_random_check: test functionality of Math::Random."
Line 149  help_TARGETS: Line 154  help_TARGETS:
  @echo "mimetex_version_check: check if mimetex.cgi version has changed,"   @echo "mimetex_version_check: check if mimetex.cgi version has changed,"
  @echo "                      if so remove files from mimetexcache."   @echo "                      if so remove files from mimetexcache."
  @echo "latex_fmtutil: run utility to maintain TeX format files system-wide."   @echo "latex_fmtutil: run utility to maintain TeX format files system-wide."
    @echo "lcmathcomplex: set nvsize in LCMathComplex, if different from default."
    @echo "removenolongerused: check if there are files from previous
    @echo "                    LON-CAPA version; if so, prompt for removal."
  @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 267  TEST_hosts_tab: Line 275  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_dns_hosts.tab dns_hosts.tab" && \       echo "   1) ln -s production_hosts.tab hosts.tab" && \
      echo "   2) ln -s development_dns_hosts.tab dns_hosts.tab" && \       echo "   2) ln -s development_hosts.tab 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)" && \
        echo " and also one of the following within your " && \
        echo "CVS repository (cd loncapa/loncom)" && \
        echo "   1) ln -s production_dns_hosts.tab dns_hosts.tab" && \
        echo "   2) ln -s development_dns_hosts.tab dns_hosts.tab" && \
        echo "(you most likely want option #1, production_dns_hosts.tab)" && \
      exit 1; \       exit 1; \
  fi   fi
   
Line 281  TEST_domain_tab: Line 294  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_dns_domain.tab dns_domain.tab" && \       echo "   1) ln -s production_domain.tab domain.tab" && \
      echo "   2) ln -s development_dns_domain.tab dns_domain.tab" && \       echo "   2) ln -s development_domain.tab 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)" && \
        echo " and also one of the following within your " && \
        echo "CVS repository (cd loncapa/loncom)" && \
        echo "   1) ln -s production_dns_domain.tab dns_domain.tab" && \
        echo "   2) ln -s development_dns_domain.tab dns_domain.tab" && \
        echo "(you most likely want option #1, production_dns_domain.tab)" && \
      exit 1; \       exit 1; \
  fi   fi
   
Line 398  tardist: Line 416  tardist:
  rm -f $(SOURCE)/tar_WARNINGS   rm -f $(SOURCE)/tar_WARNINGS
  make warningnote   make warningnote
   
   langcheck:
    cat $(SOURCE)/doc/loncapafiles/langcheck.piml | \
    perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    tee -a WARNINGS
   
 ntpcheck:  ntpcheck:
  cat $(SOURCE)/doc/loncapafiles/ntpcheck.piml | \   cat $(SOURCE)/doc/loncapafiles/ntpcheck.piml | \
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
Line 516  latex_fmtutil: Line 539  latex_fmtutil:
  perl piml_parse.pl  $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl  $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
  tee -a WARNINGS   tee -a WARNINGS
   
   lcmathcomplex:
    cat $(SOURCE)/doc/loncapafiles/lcmathcomplex.piml | \
    perl piml_parse.pl  $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    tee -a WARNINGS
   
   removenolongerused:
    cat $(SOURCE)/doc/loncapafiles/removenolongerused.piml | \
    perl piml_parse.pl  $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH)
   
 postinstall:  postinstall:
  make postaboutVERSION   make postaboutVERSION
  make webserverconf   make webserverconf
Line 525  postinstall: Line 557  postinstall:
  make update_queue_slots   make update_queue_slots
  make modify_config_files   make modify_config_files
  make clearoutoldspreadsheetcache   make clearoutoldspreadsheetcache
    make langcheck
  make chkconfig   make chkconfig
  make rpmcheck   make rpmcheck
  make ntpcheck   make ntpcheck
Line 533  postinstall: Line 566  postinstall:
  make sanitycheck   make sanitycheck
  make logcleanup   make logcleanup
  make sendmail_fix   make sendmail_fix
  make ownership_fix  
  make wrap_setuid   make wrap_setuid
  make latex_fixup   make latex_fixup
  make picins_check   make picins_check
  make mimetex_version_check   make mimetex_version_check
  make verify_domconfiguser   make verify_domconfiguser
  make latex_fmtutil   make latex_fmtutil
    make lcmathcomplex
    sed -i "s/\x08\x08*/.../g" WARNINGS
 VERSION:  VERSION:
  install -d $(TARGET)/etc   install -d $(TARGET)/etc
    if (test -e /etc/loncapa-release); then \
    cp -p -v /etc/loncapa-release /etc/loncapa-release.prev; \
    fi
  echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release   echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release
  date +"%Y%m%d" >> $(TARGET)/etc/loncapa-release   date +"%Y%m%d" >> $(TARGET)/etc/loncapa-release
  install -d $(TARGET)/home/httpd/html/lon-status   install -d $(TARGET)/home/httpd/html/lon-status
Line 551  VERSION: Line 588  VERSION:
 aboutVERSION:  aboutVERSION:
  cp -p -v $(SOURCE)/loncom/license/about.html \   cp -p -v $(SOURCE)/loncom/license/about.html \
  $(SOURCE)/loncom/license/about.html.orig   $(SOURCE)/loncom/license/about.html.orig
  cp -p -v $(SOURCE)/loncom/loncapa_apache.conf \  
  $(SOURCE)/loncom/loncapa_apache.conf.orig  
  cat $(SOURCE)/loncom/license/about.html | \   cat $(SOURCE)/loncom/license/about.html | \
  perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \   perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$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
    touch --date="$(shell echo `perl getcvsdate.pl \
    $(SOURCE)/loncom/license/CVS/Entries about.html`)" \
    $(SOURCE)/loncom/license/about.html
    cp -p -v $(SOURCE)/loncom/loncapa_apache.conf \
    $(SOURCE)/loncom/loncapa_apache.conf.orig
  cat $(SOURCE)/loncom/loncapa_apache.conf | \   cat $(SOURCE)/loncom/loncapa_apache.conf | \
  perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \   perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$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
    touch --date="$(shell echo `perl getcvsdate.pl \
    $(SOURCE)/loncom/CVS/Entries loncapa_apache.conf`)" \
    $(SOURCE)/loncom/loncapa_apache.conf
   
 postaboutVERSION:  postaboutVERSION:
  if (test -e $(SOURCE)/loncom/license/about.html.orig) && \   if (test -e $(SOURCE)/loncom/license/about.html.orig) && \
  (diff $(SOURCE)/loncom/license/about.html \   (diff $(SOURCE)/loncom/license/about.html.orig \
  $(SOURCE)/loncom/license/about.html > /dev/null); then \   $(SOURCE)/loncom/license/about.html > /dev/null); then \
  mv -v $(SOURCE)/loncom/license/about.html.orig \   mv -v $(SOURCE)/loncom/license/about.html.orig \
  $(SOURCE)/loncom/license/about.html; \   $(SOURCE)/loncom/license/about.html; \
  elif (test -e $(SOURCE)/loncom/license/about.html.orig) && \   elif (test -e $(SOURCE)/loncom/license/about.html.orig) && \
  !(diff $(SOURCE)/loncom/license/about.html \   !(diff $(SOURCE)/loncom/license/about.html.orig \
  $(SOURCE)/loncom/license/about.html > /dev/null); then \   $(SOURCE)/loncom/license/about.html > /dev/null); then \
  rm -f $(SOURCE)/loncom/license/about.html.orig; \   rm -f $(SOURCE)/loncom/license/about.html.orig; \
  fi   fi
    touch --date="$(shell echo `perl getcvsdate.pl \
    $(SOURCE)/loncom/license/CVS/Entries about.html`)" \
    $(SOURCE)/loncom/license/about.html
  if (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \   if (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \
  (diff $(SOURCE)/loncom/license/about.html \   (diff $(SOURCE)/loncom/loncapa_apache.conf.orig \
  $(SOURCE)/loncom/license/about.html > /dev/null); then \   $(SOURCE)/loncom/loncapa_apache.conf > /dev/null); then \
  mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \   mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \
  $(SOURCE)/loncom/loncapa_apache.conf; \   $(SOURCE)/loncom/loncapa_apache.conf; \
  elif (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \   elif (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \
  !(diff $(SOURCE)/loncom/license/about.html \   !(diff $(SOURCE)/loncom/loncapa_apache.conf.orig \
  $(SOURCE)/loncom/license/about.html > /dev/null); then \   $(SOURCE)/loncom/loncapa_apache.conf > /dev/null); then \
  rm -f $(SOURCE)/loncom/loncapa_apache.conf.orig; \   rm -f $(SOURCE)/loncom/loncapa_apache.conf.orig; \
  fi   fi
    touch --date="$(shell echo `perl getcvsdate.pl \
    $(SOURCE)/loncom/CVS/Entries loncapa_apache.conf`)" \
    $(SOURCE)/loncom/loncapa_apache.conf
   
 # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***  # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***
   
Removed from v.1.190.8.6  
changed lines
  Added in v.1.220

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