[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.200

version 1.190.8.6, 2011/10/10 00:59:51 version 1.200, 2012/01/27 23:50:57
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.11
 ifeq (CVS_HEAD,${VERSION})  ifeq (CVS_HEAD,${VERSION})
Line 136  help_TARGETS: Line 136  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 398  tardist: Line 399  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 525  postinstall: Line 531  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 539  postinstall: Line 546  postinstall:
  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 
 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 551  VERSION: Line 558  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.200

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