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

Diff for /loncom/build/Makefile between versions 1.150.2.1 and 1.177.4.2

version 1.150.2.1, 2003/07/24 22:23:28 version 1.177.4.2, 2005/12/19 22:57:40
Line 22  SAVE=program.pl.$(TIMESTAMP) Line 22  SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)  LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""  METAMTARGET=""
 MTARGET=""  MTARGET=""
 VERSION=0.99.4  VERSION=2.0.99.1
 # 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 "html_parser_check: test functionality of HTML::Parser."
    @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 "wrap_setuid: put a C wrapper around setuid scripts."
  @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)"
  @echo "postinstall: double-check things after installation"   @echo "postinstall: double-check things after installation"
  @echo "VERSION: tag the filesystem with version information inside"   @echo "VERSION: tag the filesystem with version information inside"
  @echo "         /etc/loncapa-release"   @echo "         /etc/loncapa-release and"
    @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 "*** 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 295  install: buildflag VERSION TEST_hosts_ta Line 310  install: buildflag VERSION TEST_hosts_ta
  NORESTORECONF="$(NORESTORECONF)" configinstall   NORESTORECONF="$(NORESTORECONF)" configinstall
  make postinstall   make postinstall
  make warningnote   make warningnote
  echo "You can 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)"
  echo -n "Please see http://install.lon-capa.org/ for more information"  # @echo -n "Please see http://install.lon-capa.org/ for more information"
   
 rawinstall: VERSION Makefile.install Makefile  rawinstall: VERSION Makefile.install Makefile
  echo -n "" > WARNINGS   echo -n "" > WARNINGS
Line 323  hosts_and_domain_tab: TEST_hosts_tab TES Line 338  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:
Line 337  vanillatar: Line 353  vanillatar:
  echo 'make updatequery' >> $(SOURCE)/UPDATE   echo 'make updatequery' >> $(SOURCE)/UPDATE
  echo 'make hosts_and_domain_tab' >> $(SOURCE)/UPDATE   echo 'make hosts_and_domain_tab' >> $(SOURCE)/UPDATE
  echo 'make postinstall' >> $(SOURCE)/UPDATE   echo 'make postinstall' >> $(SOURCE)/UPDATE
    echo 'make run_searchcat' >> $(SOURCE)/UPDATE
  echo 'make aboutVERSION' >> $(SOURCE)/UPDATE   echo 'make aboutVERSION' >> $(SOURCE)/UPDATE
  echo 'make warningnote' >> $(SOURCE)/UPDATE   echo 'make warningnote' >> $(SOURCE)/UPDATE
  # ----------------------------- Point TEST to the internal make process   # ----------------------------- Point TEST to the internal make process
Line 364  tardist: Line 381  tardist:
  fi   fi
  cp -v $(SOURCE)/loncom/license/about.html \   cp -v $(SOURCE)/loncom/license/about.html \
  $(SOURCE)/loncom/license/about.html.orig   $(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 \   mv -v $(SOURCE)/loncom/license/about.html.orig \
  $(SOURCE)/loncom/license/about.html   $(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
   
   ntpcheck:
    cat $(SOURCE)/doc/loncapafiles/ntpcheck.piml | \
    perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    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
   
   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:
    cat $(SOURCE)/doc/loncapafiles/rpmcheck.piml | \
    perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    tee -a WARNINGS
   
 sanitycheck:  sanitycheck:
  cat $(SOURCE)/doc/loncapafiles/sanitycheck.piml | \   cat $(SOURCE)/doc/loncapafiles/sanitycheck.piml | \
  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:
    cat $(SOURCE)/doc/loncapafiles/accesscount_seed.piml | \
    perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    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) | \
Line 399  sendmail_fix: Line 469  sendmail_fix:
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
  tee -a WARNINGS   tee -a WARNINGS
   
   ownership_fix:
    cat $(SOURCE)/doc/loncapafiles/ownership_fix.piml | \
    perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    tee -a WARNINGS
   
   wrap_setuid:
    cat $(SOURCE)/doc/loncapafiles/wrap_setuid.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 modify_config_files
  make clearoutoldspreadsheetcache   make clearoutoldspreadsheetcache
    make chkconfig
    make rpmcheck
    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 wrap_setuid
   
 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
  date +"%Y%m%d" >> $(TARGET)/etc/loncapa-release   date +"%Y%m%d" >> $(TARGET)/etc/loncapa-release
    install -d $(TARGET)/home/httpd/html/lon-status
    echo -n "$(VERSION)-" > $(TARGET)/home/httpd/html/lon-status/version.txt
    date +"%Y%m%d" >> $(TARGET)/home/httpd/html/lon-status/version.txt
   
 aboutVERSION:  aboutVERSION:
  cat $(SOURCE)/loncom/license/about.html | \   cat $(SOURCE)/loncom/license/about.html | \
Line 417  aboutVERSION: Line 511  aboutVERSION:
  $(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 | \
    perl -e '$$d=`date +"%Y%m%d"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \
    $(SOURCE)/loncom/loncapa_apache.conf.new
    mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \
    $(SOURCE)/loncom/loncapa_apache.conf
   
 # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***  # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***
   
Line 521  MANIFEST_cvs: Line 620  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 628  BinaryRoot: base_rpm_file_list Line 727  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.150.2.1  
changed lines
  Added in v.1.177.4.2

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