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

version 1.146, 2003/05/29 21:47:12 version 1.150.2.1, 2003/07/24 22:23:28
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.1  VERSION=0.99.4
 # 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 91  help_TARGETS: Line 91  help_TARGETS:
  @echo "                          (horizontal testing)"   @echo "                          (horizontal testing)"
  @echo "TEST_web_layer: mimic a login and various vertical actions on "   @echo "TEST_web_layer: mimic a login and various vertical actions on "
  @echo "                a LON-CAPA system"   @echo "                a LON-CAPA system"
  @echo "TEST_hosts_tab: make sure that a loncapa/loncom/hosts.tab"   @echo "TEST_hosts_and_domain_tab: make sure that a "
  @echo "                file is specified for installation"   @echo "        loncapa/loncom/hosts.tab and loncapa/loncom/domain.tab"
    @echo "        file is specified for installation"
  @echo "TEST_html2ps: test for the presence of html2ps which is needed"   @echo "TEST_html2ps: test for the presence of html2ps which is needed"
  @echo "              for making a PDF compilation for pdfdoc"   @echo "              for making a PDF compilation for pdfdoc"
  @echo "*** GENERAL TARGETS SUCH AS 'build' AND 'install' ***"   @echo "*** GENERAL TARGETS SUCH AS 'build' AND 'install' ***"
Line 107  help_TARGETS: Line 108  help_TARGETS:
  @echo "rawinstall: just install files, links and directories without"   @echo "rawinstall: just install files, links and directories without"
  @echo "            any bells or whistles (e.g. double-checking"   @echo "            any bells or whistles (e.g. double-checking"
  @echo "            configurations, fine-tuning webserver, etc.)"   @echo "            configurations, fine-tuning webserver, etc.)"
  @echo "hosts_tab: install the hosts.tab to the filesystem"   @echo "hosts_and_domain_tab: install the hosts.tab and domain.tab" 
    @echo "                      to the filesystem"
  @echo "webserverconf: fine-tune the web server configuration;"   @echo "webserverconf: fine-tune the web server configuration;"
  @echo "               make sure the proper 'Include' statements"   @echo "               make sure the proper 'Include' statements"
  @echo "               are appended to httpd.conf"   @echo "               are appended to httpd.conf"
Line 138  help_TARGETS: Line 140  help_TARGETS:
  @echo "*** TARGETS FOR OPERATING ON FILESYSTEMS ACROSS THE NETWORK ***"   @echo "*** TARGETS FOR OPERATING ON FILESYSTEMS ACROSS THE NETWORK ***"
  @echo "lpmladm: coordinates username=lpmladm mediated secure shell"   @echo "lpmladm: coordinates username=lpmladm mediated secure shell"
  @echo "         processes; needed for the NET_* targets"   @echo "         processes; needed for the NET_* targets"
  @echo "NET_hosts_tab: install the hosts.tab to a filesystem elsewhere"   @echo "NET_hosts_and_domain_tab: install the hosts.tab and domain.tab"
  @echo "               on the network"   @echo "                          to a filesystem elsewhere"
    @echo "                          on the network"
  @echo "NET_webserverconf: fine-tune the web server configuration on a"   @echo "NET_webserverconf: fine-tune the web server configuration on a"
  @echo "                   filesystem elsewhere on the network"   @echo "                   filesystem elsewhere on the network"
  @echo "NET_rawinstall: launch the rawinstall target on a filesystem"   @echo "NET_rawinstall: launch the rawinstall target on a filesystem"
Line 237  TEST_hosts_tab: Line 240  TEST_hosts_tab:
      exit 1; \       exit 1; \
  fi   fi
   
   TEST_domain_tab:
    @echo "Testing domain.tab"
    @if (test -e ../domain.tab); then \
    echo "there is a defined link or file; assume okay"; \
    else echo "**** ERROR **** domain.tab not defined!" && \
        echo -n "You need to do one of the following within your " && \
        echo "CVS repository (cd loncapa/loncom)" && \
        echo "   1) ln -s production_domain.tab domain.tab" && \
        echo "   2) ln -s development_domain.tab domain.tab" && \
        echo "or 3) ln -s rawhide_domain.tab domain.tab" && \
        echo "(you most likely want option #1, production_domain.tab)" && \
        exit 1; \
    fi
   
 TEST_html2ps:  TEST_html2ps:
  @if (test -e /usr/local/html2ps/bin/html2ps); then \   @if (test -e /usr/local/html2ps/bin/html2ps); then \
  echo "I can find html2ps; assume okay"; \   echo "I can find html2ps; assume okay"; \
Line 268  configinstall: Makefile.configinstall Line 285  configinstall: Makefile.configinstall
  if (test "0" = $(NORESTORECONF)); then \   if (test "0" = $(NORESTORECONF)); then \
  perl loncaparestoreconfigurations suffix .lpmlnew; fi   perl loncaparestoreconfigurations suffix .lpmlnew; fi
   
 install: buildflag VERSION TEST_hosts_tab Makefile.install Makefile  install: buildflag VERSION TEST_hosts_tab TEST_domain_tab Makefile.install Makefile
  echo -n "" > WARNINGS   echo -n "" > WARNINGS
  make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \   make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
  directories   directories
Line 293  rawinstall: VERSION Makefile.install Mak Line 310  rawinstall: VERSION Makefile.install Mak
  make SOURCE="$(SOURCE)" TARGET="$(TARGET)" \   make SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
  NORESTORECONF="$(NORESTORECONF)" configinstall   NORESTORECONF="$(NORESTORECONF)" configinstall
   
 hosts_tab: TEST_hosts_tab  hosts_and_domain_tab: TEST_hosts_tab TEST_domain_tab
  cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \   cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
  perl xfml_parse.pl $(SOURCE)/doc/loncapafiles/valid_hosts.xfml | \   perl xfml_parse.pl $(SOURCE)/doc/loncapafiles/valid_hosts.xfml | \
  perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" \   perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" \
  "$(TARGET)" > Makefile.install   "$(TARGET)" > Makefile.install
  make -f Makefile.install directories   make -f Makefile.install directories
  make -f Makefile.install files   make -f Makefile.install files
  @echo "If hosts.tab has changed, restart httpd and loncontrol:"   @echo "If hosts.tab or domain.tab has changed, restart httpd and loncontrol:"
  @echo "   /etc/rc.d/init.d/httpd restart"   @echo "   /etc/rc.d/init.d/httpd restart"
  @echo "   /etc/rc.d/init.d/loncontrol restart"   @echo "   /etc/rc.d/init.d/loncontrol restart"
   
Line 318  vanillatar: Line 335  vanillatar:
  echo 'make rawinstall' >> $(SOURCE)/UPDATE   echo 'make rawinstall' >> $(SOURCE)/UPDATE
  echo 'make configinstall' >> $(SOURCE)/UPDATE   echo 'make configinstall' >> $(SOURCE)/UPDATE
  echo 'make updatequery' >> $(SOURCE)/UPDATE   echo 'make updatequery' >> $(SOURCE)/UPDATE
  echo 'make hosts_tab' >> $(SOURCE)/UPDATE   echo 'make hosts_and_domain_tab' >> $(SOURCE)/UPDATE
  echo 'make postinstall' >> $(SOURCE)/UPDATE   echo 'make postinstall' >> $(SOURCE)/UPDATE
  echo 'make aboutVERSION' >> $(SOURCE)/UPDATE   echo 'make aboutVERSION' >> $(SOURCE)/UPDATE
  echo 'make warningnote' >> $(SOURCE)/UPDATE   echo 'make warningnote' >> $(SOURCE)/UPDATE
Line 451  lpmladm: Line 468  lpmladm:
  echo "**** ERROR **** Incorrect METAMTARGET"; \   echo "**** ERROR **** Incorrect METAMTARGET"; \
  fi   fi
   
 NET_hosts_tab:  NET_hosts_and_domain_tab:
  make TIMESTAMP=`date +"%s"` METAMTARGET="TRANSPORT" \   make TIMESTAMP=`date +"%s"` METAMTARGET="TRANSPORT" \
  MTARGET="hosts_tab" HOSTNAME="$(HOSTNAME)" lpmladm   MTARGET="hosts_and_domain_tab" HOSTNAME="$(HOSTNAME)" lpmladm
   
 NET_webserverconf:  NET_webserverconf:
  make TIMESTAMP=`date +"%s"` METAMTARGET="LAUNCH" \   make TIMESTAMP=`date +"%s"` METAMTARGET="LAUNCH" \
Line 477  MANIFEST_all: Line 494  MANIFEST_all:
  echo 'loncom/rawhide_hosts.tab' >> $(SOURCE)/MANIFEST   echo 'loncom/rawhide_hosts.tab' >> $(SOURCE)/MANIFEST
  echo 'loncom/production_hosts.tab' >> $(SOURCE)/MANIFEST   echo 'loncom/production_hosts.tab' >> $(SOURCE)/MANIFEST
  echo 'loncom/development_hosts.tab' >> $(SOURCE)/MANIFEST   echo 'loncom/development_hosts.tab' >> $(SOURCE)/MANIFEST
    echo 'loncom/production_domain.tab' >> $(SOURCE)/MANIFEST
    echo 'loncom/development_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.146  
changed lines
  Added in v.1.150.2.1


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