Diff for /loncom/build/Makefile between versions 1.79 and 1.80

version 1.79, 2002/04/21 16:44:56 version 1.80, 2002/04/21 23:21:06
Line 6 Line 6
 DISTPROBE=`perl ./distprobe`  DISTPROBE=`perl ./distprobe`
 DIST=$(DISTPROBE)  DIST=$(DISTPROBE)
 CATEGORY="development"  CATEGORY="development"
 SOURCE="../.."  SOURCE=../..
 TARGET=""  TARGET=""
 NORESTORECONF="0"  NORESTORECONF="0"
 HOSTNAME=""  HOSTNAME=""
Line 87  NET_hosts_tab: Line 87  NET_hosts_tab:
  MTARGET="hosts_tab" HOSTNAME="$(HOSTNAME)" lpmladm   MTARGET="hosts_tab" HOSTNAME="$(HOSTNAME)" lpmladm
   
 hosts_tab: TEST_hosts_tab  hosts_tab: TEST_hosts_tab
  cat ../../doc/loncapafiles/loncapafiles.lpml | \   cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
  perl xfml_parse.pl ../../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
Line 129  lpmladm: Line 129  lpmladm:
   
 HTML:  HTML:
  install -d HTML   install -d HTML
  cp ../../doc/loncapafiles/*.gif HTML   cp $(SOURCE)/doc/loncapafiles/*.gif HTML
  cat ../../doc/loncapafiles/loncapafiles.lpml | \   cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
  perl lpml_parse.pl html development default ../.. '' > HTML/index.html   perl lpml_parse.pl html development default "$(SOURCE)" '$(TARGET)' \
    > HTML/index.html
   
 status:  status:
  install -d HTML   install -d HTML
  cp ../../doc/loncapafiles/*.gif HTML   cp $(SOURCE)/doc/loncapafiles/*.gif HTML
  cat ../../doc/loncapafiles/loncapafiles.lpml | \   cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
  perl lpml_parse.pl html $(CATEGORY) $(DIST) "../.." "" | \   perl lpml_parse.pl html $(CATEGORY) $(DIST) "$(SOURCE)" "($TARGET)" | \
  perl lpml_html_posteval.pl > \   perl lpml_html_posteval.pl > \
  HTML/filestatus.html   HTML/filestatus.html
   
 statuspost: status  statuspost: status
  cp ../../doc/loncapafiles/*.gif $(TARGET)/home/httpd/html/lon-status   cp $(SOURCE)/doc/loncapafiles/*.gif \
    $(TARGET)/home/httpd/html/lon-status
  cp HTML/filestatus.html \   cp HTML/filestatus.html \
  $(TARGET)/home/httpd/html/lon-status/filestatus.html   $(TARGET)/home/httpd/html/lon-status/filestatus.html
   
Line 151  rpmstatus: Line 153  rpmstatus:
  rpm -qa --queryformat \   rpm -qa --queryformat \
  '%{NAME}\t%{VERSION}\t%{RELEASE}\t%{BUILDTIME}\n' | sort > \   '%{NAME}\t%{VERSION}\t%{RELEASE}\t%{BUILDTIME}\n' | sort > \
  RPMSTATUS/current.tmp   RPMSTATUS/current.tmp
  cat ../../doc/otherfiles/cd_rpms.txt > RPMSTATUS/standard.tmp   cat $(SOURCE)/doc/otherfiles/cd_rpms.txt > RPMSTATUS/standard.tmp
  cat ../../doc/otherfiles/rpm_list.txt > RPMSTATUS/expected.tmp   cat $(SOURCE)/doc/otherfiles/rpm_list.txt > RPMSTATUS/expected.tmp
  perl rpmparse.pl RPMSTATUS/standard.tmp RPMSTATUS/current.tmp \   perl rpmparse.pl RPMSTATUS/standard.tmp RPMSTATUS/current.tmp \
  RPMSTATUS/expected.tmp > RPMSTATUS/rpmstatus.html   RPMSTATUS/expected.tmp > RPMSTATUS/rpmstatus.html
   
Line 165  configinstall: Makefile.configinstall Line 167  configinstall: Makefile.configinstall
  if (test "0" = $(NORESTORECONF)); then \   if (test "0" = $(NORESTORECONF)); then \
  perl loncaparestoreconfigurations suffix .lpmlnew; fi   perl loncaparestoreconfigurations suffix .lpmlnew; fi
   
 Makefile.configinstall: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl  Makefile.configinstall: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
  cat ../../doc/loncapafiles/loncapafiles.lpml | \   cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
  perl lpml_parse.pl configinstall $(CATEGORY) $(DIST) "$(SOURCE)" \   perl lpml_parse.pl configinstall $(CATEGORY) $(DIST) "$(SOURCE)" \
  "$(TARGET)" > Makefile.configinstall   "$(TARGET)" > Makefile.configinstall
   
Line 190  NET_webserverconf: Line 192  NET_webserverconf:
  MTARGET="webserverconf" HOSTNAME="$(HOSTNAME)" lpmladm   MTARGET="webserverconf" HOSTNAME="$(HOSTNAME)" lpmladm
   
 webserverconf:  webserverconf:
  cat ../../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)
   
 sanitycheck:  sanitycheck:
  cat ../../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
   
Line 214  install: TEST_hosts_tab Makefile.install Line 216  install: TEST_hosts_tab Makefile.install
  make warningnote   make warningnote
  echo "You can run 'make test' to see if your system is ready to go!"   echo "You can run 'make test' to see if your system is ready to go!"
   
 Makefile.install: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl  Makefile.install: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
  cat ../../doc/loncapafiles/loncapafiles.lpml | \   cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
  perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" \   perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" \
  "$(TARGET)" > Makefile.install   "$(TARGET)" > Makefile.install
   
Line 224  build: Makefile.build pod2html.sh pod2ma Line 226  build: Makefile.build pod2html.sh pod2ma
  make -f Makefile.build all   make -f Makefile.build all
  make warningnote   make warningnote
   
 Makefile.build: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl  Makefile.build: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
  cat ../../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)" \
  > Makefile.build   > Makefile.build
   
 RPM: BinaryRoot base_rpm_file_list  RPM: BinaryRoot base_rpm_file_list
  cat ../../doc/loncapafiles/loncapafiles.lpml | \   cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
  perl lpml_parse.pl make_rpm $(CATEGORY) $(DIST) $(SOURCE) $(TARGET) \   perl lpml_parse.pl make_rpm $(CATEGORY) $(DIST) $(SOURCE) $(TARGET) \
  > base_customizerpm.xml   > base_customizerpm.xml
  cat base_rpm_file_list.txt | perl make_rpm.pl base 3.2 '' '' \   cat base_rpm_file_list.txt | perl make_rpm.pl base 3.2 '' '' \
Line 255  DPKG: Line 257  DPKG:
  @echo "is LON-CAPA-base."   @echo "is LON-CAPA-base."
   
 base_rpm_file_list:  base_rpm_file_list:
  cat ../../doc/loncapafiles/loncapafiles.lpml | \   cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
  perl lpml_parse.pl rpm_file_list $(CATEGORY) $(DIST) $(SOURCE) \   perl lpml_parse.pl rpm_file_list $(CATEGORY) $(DIST) $(SOURCE) \
  'BinaryRoot' | sort > base_rpm_file_list.txt   'BinaryRoot' | sort > base_rpm_file_list.txt
   
Line 266  BinaryRoot: base_rpm_file_list Line 268  BinaryRoot: base_rpm_file_list
 doc:  doc:
  install -d docs   install -d docs
  install -m 0755 -d docs/icons   install -m 0755 -d docs/icons
  install -m 0644 ../../doc/icons/[^C][^V]* docs/icons   install -m 0644 $(SOURCE)/doc/icons/[^C][^V]* docs/icons
  install -m 0755 -d docs/reconfig   install -m 0755 -d docs/reconfig
  perl doc_template.pl ../../doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  ../../doc/build/reconfig.html > docs/reconfig/index.html   $(SOURCE)/doc/build/reconfig.html > docs/reconfig/index.html
  install -m 0755 -d docs/reconfig/confexamples   install -m 0755 -d docs/reconfig/confexamples
  install -m 0644 ../../doc/build/confexamples/[^C][^V]* \   install -m 0644 $(SOURCE)/doc/build/confexamples/[^C][^V]* \
  docs/reconfig/confexamples   docs/reconfig/confexamples
  perl doc_template.pl ../../doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  ../../doc/build/installindex.html > docs/index.html   $(SOURCE)/doc/build/installindex.html > docs/index.html
  install -m 0755 -d docs/license   install -m 0755 -d docs/license
  perl doc_template.pl ../../doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  ../../doc/build/license.html > docs/license/index.html   $(SOURCE)/doc/build/license.html > docs/license/index.html
  install -m 0755 -d docs/contact   install -m 0755 -d docs/contact
  perl doc_template.pl ../../doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  ../../doc/build/contact.html > docs/contact/index.html   $(SOURCE)/doc/build/contact.html > docs/contact/index.html
  install -m 0755 -d docs/faq   install -m 0755 -d docs/faq
  perl doc_template.pl ../../doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  ../../doc/build/faq.html > docs/faq/index.html   $(SOURCE)/doc/build/faq.html > docs/faq/index.html
  install -m 0755 -d docs/downloads   install -m 0755 -d docs/downloads
  perl doc_template.pl ../../doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  ../../doc/build/download.html > docs/downloads/index.html   $(SOURCE)/doc/build/download.html > docs/downloads/index.html
  install -m 0755 -d docs/install   install -m 0755 -d docs/install
  perl doc_template.pl ../../doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  ../../doc/build/install.html > docs/install/index.html   $(SOURCE)/doc/build/install.html > docs/install/index.html
  install -m 0755 -d docs/upgrade   install -m 0755 -d docs/upgrade
  perl doc_template.pl ../../doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  ../../doc/build/upgrade.html > docs/upgrade/index.html   $(SOURCE)/doc/build/upgrade.html > docs/upgrade/index.html
  cd docs; tar czvpf ../docs.tar.gz .   cd docs; tar czvpf ../docs.tar.gz .
   
 documentation_tree: cvsreport  documentation_tree: cvsreport
  install -d docs   install -d docs
  install ../../doc/build/cvsreport.html docs/cvsreport.html   install $(SOURCE)/doc/build/cvsreport.html docs/cvsreport.html
  install ../../doc/build/doc.html docs/index.html   install $(SOURCE)/doc/build/doc.html docs/index.html
  install -d docs/hardware   install -d docs/hardware
  install ../../doc/hardware/hardware.html docs/hardware/hardware.html   install $(SOURCE)/doc/hardware/hardware.html docs/hardware/hardware.html
  install -d docs/3.1   install -d docs/3.1
  install ../../doc/build/install.html docs/3.1/index.html   install $(SOURCE)/doc/build/install.html docs/3.1/index.html
  install ../../doc/build/instructions_with_cd.html \   install $(SOURCE)/doc/build/instructions_with_cd.html \
  docs/3.1/instructions_with_cd.html   docs/3.1/instructions_with_cd.html
  install ../../doc/build/libraryserverconfiguration.gif \   install $(SOURCE)/doc/build/libraryserverconfiguration.gif \
  docs/3.1/libraryserverconfiguration.gif   docs/3.1/libraryserverconfiguration.gif
  install ../../doc/build/librarysystemsettings.gif \   install $(SOURCE)/doc/build/librarysystemsettings.gif \
  docs/3.1/librarysystemsettings.gif   docs/3.1/librarysystemsettings.gif
  install -d docs/cvsupgrade   install -d docs/cvsupgrade
  install ../../doc/build/cvsupgrade.html docs/cvsupgrade/index.html   install $(SOURCE)/doc/build/cvsupgrade.html docs/cvsupgrade/index.html
  install -d docs/upgrade   install -d docs/upgrade
  install ../../doc/build/upgrade.html docs/upgrade/index.html   install $(SOURCE)/doc/build/upgrade.html docs/upgrade/index.html
  install -d docs/reconfig   install -d docs/reconfig
  install ../../doc/build/reconfig.html docs/reconfig/index.html   install $(SOURCE)/doc/build/reconfig.html docs/reconfig/index.html
  install -d docs/3.1/otherfiles   install -d docs/3.1/otherfiles
  install ../../doc/otherfiles/rpm_list.txt \   install $(SOURCE)/doc/otherfiles/rpm_list.txt \
  docs/3.1/otherfiles/rpm_list.txt   docs/3.1/otherfiles/rpm_list.txt
  install ../../doc/build/loncapanetwork.html docs/loncapanetwork.html   install $(SOURCE)/doc/build/loncapanetwork.html \
  install ../../doc/build/loncapanfs.html docs/loncapanfs.html   docs/loncapanetwork.html
  install ../../doc/build/loncapaappleshares.html \   install $(SOURCE)/doc/build/loncapanfs.html docs/loncapanfs.html
    install $(SOURCE)/doc/build/loncapaappleshares.html \
  docs/loncapaappleshares.html   docs/loncapaappleshares.html
  install ../../doc/build/loncapasqldatabase.html \   install $(SOURCE)/doc/build/loncapasqldatabase.html \
  docs/loncapasqldatabase.html   docs/loncapasqldatabase.html
  install ../../doc/build/loncapapasswords.html \   install $(SOURCE)/doc/build/loncapapasswords.html \
  docs/loncapapasswords.html   docs/loncapapasswords.html
  install ../../doc/build/loncapapasswordauthentication.html \   install $(SOURCE)/doc/build/loncapapasswordauthentication.html \
  docs/loncapapasswordauthentication.html   docs/loncapapasswordauthentication.html
  install ../../doc/build/loncapatimesync.html docs/loncapatimesync.html   install $(SOURCE)/doc/build/loncapatimesync.html docs/loncapatimesync.html
  install ../../doc/build/loncapamathequivalency.html \   install $(SOURCE)/doc/build/loncapamathequivalency.html \
  docs/loncapamathequivalency.html   docs/loncapamathequivalency.html
  tar czvf install.lon-capa.org_docs.tar.gz docs   tar czvf install.lon-capa.org_docs.tar.gz docs
  rm -Rf docs   rm -Rf docs
   
   tardist:
    cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
    perl lpml_parse.pl MANIFEST development default \
    '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' > $(SOURCE)/MANIFEST
    cat $(SOURCE)/doc/loncapafiles/buildfiles.lpml | \
    perl lpml_parse.pl MANIFEST development default \
    '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
    echo 'README' >> $(SOURCE)/MANIFEST
    echo 'UPDATE' >> $(SOURCE)/MANIFEST
    echo 'TEST' >> $(SOURCE)/MANIFEST
    echo '#!/bin/sh' > $(SOURCE)/UPDATE
    echo 'cd loncom/build; make build; make install' >> $(SOURCE)/UPDATE
    echo '#!/bin/sh' > $(SOURCE)/UPDATE
    echo 'cd loncom/build; make test' >> $(SOURCE)/TEST
    chmod a+rx $(SOURCE)/UPDATE
    chmod a+rx $(SOURCE)/TEST
    cp $(SOURCE)/doc/shortest_path_redhat7.2.txt $(SOURCE)/README
    cd $(SOURCE); \
    tar --numeric-owner --files-from MANIFEST -czf loncapa.tar.gz \
    2>WARNINGS || [ "0" == "0" ]
    cat $(SOURCE)/WARNINGS | \
    xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS
    rm -f $(SOURCE)/WARNINGS
    make warningnote
   
 cvsreport:  cvsreport:
   
 clean:  clean:
    rm -f $(SOURCE)/README
    rm -f $(SOURCE)/UPDATE
    rm -f $(SOURCE)/TEST
    rm -f $(SOURCE)/loncapa.tar.gz
  rm -Rf HTML   rm -Rf HTML
  rm -f Makefile.build   rm -f Makefile.build
  rm -f Makefile.install   rm -f Makefile.install
Line 352  clean: Line 384  clean:
  rm -f program.pl*   rm -f program.pl*
  rm -Rf lpmladm.*   rm -Rf lpmladm.*
  make -f Makefile.cvs clean   make -f Makefile.cvs clean
    rm -f WARNINGS

Removed from v.1.79  
changed lines
  Added in v.1.80


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