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

Diff for /loncom/build/Makefile between versions 1.177.2.3 and 1.196

version 1.177.2.3, 2005/09/29 20:32:05 version 1.196, 2011/03/24 02:04:46
Line 22  SAVE=program.pl.$(TIMESTAMP) Line 22  SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)  LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""  METAMTARGET=""
 MTARGET=""  MTARGET=""
 VERSION=2.0.2  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 128  help_TARGETS: Line 134  help_TARGETS:
  @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 "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 "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 "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 "latex_fmtutil: run utility to maintain TeX format files system-wide."
  @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 141  help_TARGETS: Line 154  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 248  TEST_hosts_tab: Line 263  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 262  TEST_domain_tab: Line 277  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 302  configinstall: Makefile.configinstall Line 317  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 310  install: buildflag VERSION TEST_hosts_ta Line 326  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 344  webserverconf: Line 360  webserverconf:
 # ---------------- 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 379  tardist: Line 384  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" ]
  mv -v $(SOURCE)/loncom/license/about.html.orig \   make postaboutVERSION
  $(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
Line 406  html_parser_check: Line 404  html_parser_check:
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
  tee -a WARNINGS   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) | \
Line 459  reseval_fixup: Line 462  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 479  wrap_setuid: Line 487  wrap_setuid:
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
  tee -a WARNINGS   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
   
   verify_domconfiguser:
    cat $(SOURCE)/doc/loncapafiles/verify_domconfiguser.piml | \
    perl piml_parse.pl  $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    tee -a WARNINGS
   
   latex_fmtutil:
    cat $(SOURCE)/doc/loncapafiles/latex_fmtutil.piml | \
    perl piml_parse.pl  $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    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
  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 chkconfig
Line 496  postinstall: Line 531  postinstall:
  make sendmail_fix   make sendmail_fix
  make ownership_fix   make ownership_fix
  make wrap_setuid   make wrap_setuid
    make latex_fixup
    make picins_check
    make mimetex_version_check
    make verify_domconfiguser
    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 506  VERSION: Line 545  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
    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"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$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
  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 \-\-\>|\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
   
   postaboutVERSION:
    if (test -e $(SOURCE)/loncom/license/about.html.orig) && \
    (diff $(SOURCE)/loncom/license/about.html \
    $(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 \
    $(SOURCE)/loncom/license/about.html > /dev/null); then \
    rm -f $(SOURCE)/loncom/license/about.html.orig; \
    fi
    if (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \
    (diff $(SOURCE)/loncom/license/about.html \
    $(SOURCE)/loncom/license/about.html > /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/license/about.html \
    $(SOURCE)/loncom/license/about.html > /dev/null); then \
    rm -f $(SOURCE)/loncom/loncapa_apache.conf.orig; \
    fi
   
 # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***  # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***
   
 Makefile.configinstall: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml \  Makefile.configinstall: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml \
Line 595  MANIFEST_all: Line 660  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
Removed from v.1.177.2.3  
changed lines
  Added in v.1.196

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