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

Diff for /loncom/build/Makefile between versions 1.190.8.7.2.2 and 1.191

version 1.190.8.7.2.2, 2012/02/08 02:19:12 version 1.191, 2010/04/03 01:13:47
Line 13  DIST=$(DISTPROBE) Line 13  DIST=$(DISTPROBE)
 CATEGORY="development"  CATEGORY="development"
 SOURCE=../..  SOURCE=../..
 TARGET=""  TARGET=""
 CURRSHELL=`echo $(SHELL)`  
 ifneq ('/bin/bash',${CURRSHELL})  
 CURRSHELL=/bin/bash  
 endif  
 NORESTORECONF="0"  NORESTORECONF="0"
 HOSTNAME=""  HOSTNAME=""
 LAUNCH=| perl  LAUNCH=| perl
Line 26  SAVE=program.pl.$(TIMESTAMP) Line 22  SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)  LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""  METAMTARGET=""
 MTARGET=""  MTARGET=""
 VERSION=2.10.1-MITr.1  VERSION=CVS_HEAD
 SHOWVERSION=$(VERSION)  
 NEXTVERSION=2.11  
 ifeq (CVS_HEAD,${VERSION})  
 SHOWVERSION=$(NEXTVERSION).$(VERSION)  
 endif  
 #  
 # 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 136  help_TARGETS: Line 126  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 159  help_TARGETS: Line 148  help_TARGETS:
  @echo "         /home/httpd/html/lon-status/version.txt"   @echo "         /home/httpd/html/lon-status/version.txt"
  @echo "aboutVERSION: place version information inside about.html"   @echo "aboutVERSION: place version information inside about.html"
  @echo "              and loncapa_apache.conf"   @echo "              and loncapa_apache.conf"
  @echo "postaboutVERSION: restore default version <!-- VERSION --> to"  
  @echo "                  about.html and loncapa_apache.conf"  
  @echo "*** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***"   @echo "*** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***"
  @echo "Makefile.configinstall: generate a Makefile for configuration"   @echo "Makefile.configinstall: generate a Makefile for configuration"
  @echo "                        files; built dynamically from"   @echo "                        files; built dynamically from"
Line 322  configinstall: Makefile.configinstall Line 309  configinstall: Makefile.configinstall
   
 install: buildflag VERSION TEST_hosts_tab TEST_domain_tab Makefile.install Makefile  install: buildflag VERSION TEST_hosts_tab TEST_domain_tab Makefile.install Makefile
  echo -n "" > WARNINGS   echo -n "" > WARNINGS
  make aboutVERSION  
  make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \   make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
  directories   directories
  make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" files   make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" files
Line 331  install: buildflag VERSION TEST_hosts_ta Line 317  install: buildflag VERSION TEST_hosts_ta
  NORESTORECONF="$(NORESTORECONF)" configinstall   NORESTORECONF="$(NORESTORECONF)" configinstall
  make postinstall   make postinstall
  make warningnote   make warningnote
 # @echo "You can now run 'make test' to see if your system is ready to go!"   @echo "You can now run 'make test' to see if your system is ready to go!"
 # @echo "NOTE THAT YOUR SYSTEM MUST HAVE MYSQL WITH A USER=\"www\" AND"  # @echo "NOTE THAT YOUR SYSTEM MUST HAVE MYSQL WITH A USER=\"www\" AND"
 # @echo -n "PASSWORD=\"localhostkey\" FOR www\@localhost"  # @echo -n "PASSWORD=\"localhostkey\" FOR www\@localhost"
 # @echo -n "(YOU MAY NEED TO REINITIALIZE YOUR MYSQL www\@localhost USER)"  # @echo -n "(YOU MAY NEED TO REINITIALIZE YOUR MYSQL www\@localhost USER)"
Line 389  tardist: Line 375  tardist:
  else \   else \
  ln -s . $(DIRTARGET); \   ln -s . $(DIRTARGET); \
  fi   fi
    cp -v $(SOURCE)/loncom/license/about.html \
    $(SOURCE)/loncom/license/about.html.orig
    cp -v $(SOURCE)/loncom/loncapa_apache.conf \
    $(SOURCE)/loncom/loncapa_apache.conf.orig
  make aboutVERSION   make aboutVERSION
  cd $(SOURCE); \   cd $(SOURCE); \
  tar --no-recursion --numeric-owner --files-from MANIFEST \   tar --no-recursion --numeric-owner --files-from MANIFEST \
  -h -czf $(DIRTARGET).tar.gz 2>tar_WARNINGS || [ "0" == "0" ]   -h -czf $(DIRTARGET).tar.gz 2>tar_WARNINGS || [ "0" == "0" ]
  make postaboutVERSION   mv -v $(SOURCE)/loncom/license/about.html.orig \
    $(SOURCE)/loncom/license/about.html
    mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \
    $(SOURCE)/loncom/loncapa_apache.conf
  cat $(SOURCE)/tar_WARNINGS | \   cat $(SOURCE)/tar_WARNINGS | \
  xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS   xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS
  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 523  latex_fmtutil: Line 511  latex_fmtutil:
  tee -a WARNINGS   tee -a WARNINGS
   
 postinstall:  postinstall:
  make postaboutVERSION  
  make webserverconf   make webserverconf
  make reseval_fixup   make reseval_fixup
  make clean_file_permissions   make clean_file_permissions
Line 531  postinstall: Line 518  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 546  postinstall: Line 532  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 
  sed -i "s/\x08\x08*/.../g" WARNINGS  
 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 557  VERSION: Line 542  VERSION:
  date +"%Y%m%d" >> $(TARGET)/home/httpd/html/lon-status/version.txt   date +"%Y%m%d" >> $(TARGET)/home/httpd/html/lon-status/version.txt
   
 aboutVERSION:  aboutVERSION:
  cp -p -v $(SOURCE)/loncom/license/about.html \  
  $(SOURCE)/loncom/license/about.html.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 \-\-\>/$(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
  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 \-\-\>/$(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
  touch --date="$(shell echo `perl getcvsdate.pl \  
  $(SOURCE)/loncom/CVS/Entries loncapa_apache.conf`)" \  
  $(SOURCE)/loncom/loncapa_apache.conf  
   
 postaboutVERSION:  
  if (test -e $(SOURCE)/loncom/license/about.html.orig) && \  
  (diff $(SOURCE)/loncom/license/about.html.orig \  
  $(SOURCE)/loncom/license/about.html > /dev/null); then \  
  mv -v $(SOURCE)/loncom/license/about.html.orig \  
  $(SOURCE)/loncom/license/about.html; \  
  elif (test -e $(SOURCE)/loncom/license/about.html.orig) && \  
  !(diff $(SOURCE)/loncom/license/about.html.orig \  
  $(SOURCE)/loncom/license/about.html > /dev/null); then \  
  rm -f $(SOURCE)/loncom/license/about.html.orig; \  
  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) && \  
  (diff $(SOURCE)/loncom/loncapa_apache.conf.orig \  
  $(SOURCE)/loncom/loncapa_apache.conf > /dev/null); then \  
  mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \  
  $(SOURCE)/loncom/loncapa_apache.conf; \  
  elif (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \  
  !(diff $(SOURCE)/loncom/loncapa_apache.conf.orig \  
  $(SOURCE)/loncom/loncapa_apache.conf > /dev/null); then \  
  rm -f $(SOURCE)/loncom/loncapa_apache.conf.orig; \  
  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 ***
   
Line 617  Makefile.configinstall: $(SOURCE)/doc/lo Line 564  Makefile.configinstall: $(SOURCE)/doc/lo
 Makefile.build: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl  Makefile.build: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
  cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \   cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
  perl lpml_parse.pl build $(CATEGORY) $(DIST) "$(SOURCE)" "$(TARGET)" \   perl lpml_parse.pl build $(CATEGORY) $(DIST) "$(SOURCE)" "$(TARGET)" \
  "$(CURRSHELL)" > Makefile.build   > Makefile.build
   
 Makefile.install: alwaysrun  Makefile.install: alwaysrun
  cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \   cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
Removed from v.1.190.8.7.2.2  
changed lines
  Added in v.1.191

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