Diff for /loncom/build/Makefile between versions 1.83 and 1.105

version 1.83, 2002/04/25 22:40:45 version 1.105, 2002/05/09 04:58:03
Line 8  DIST=$(DISTPROBE) Line 8  DIST=$(DISTPROBE)
 CATEGORY="development"  CATEGORY="development"
 SOURCE=../..  SOURCE=../..
 TARGET=""  TARGET=""
   DIRTARGET=loncapa
 NORESTORECONF="0"  NORESTORECONF="0"
 HOSTNAME=""  HOSTNAME=""
 LAUNCH=| perl  LAUNCH=| perl
Line 18  METAMTARGET="" Line 19  METAMTARGET=""
 MTARGET=""  MTARGET=""
 VERSION=0.1  VERSION=0.1
   
 help:   help:
  @echo "*** You need to specify a valid target ***"   @echo "*** You need to specify a valid target ***"
  @echo "NOTE: You can specify options to your Makefile target."   @echo "NOTE: You can specify options to your Makefile target."
  @echo "(option) DIST can be redhat7.1, debian, redhat6.2, or default"   @echo "(option) DIST can be redhat7, debian, redhat6.2, or default"
  @echo "(option) CATEGORY can be runtime or development"   @echo "(option) CATEGORY can be runtime or development"
  @echo "(option) SOURCE is an absolute or relative directory path"   @echo "(option) SOURCE is an absolute or relative directory path"
  @echo "(option) TARGET is an absolute or relative directory path"   @echo "(option) TARGET is an absolute or relative directory path"
Line 77  TEST_hosts_tab: Line 78  TEST_hosts_tab:
  echo "there is a defined link; assume okay"; \   echo "there is a defined link; assume okay"; \
  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" && \       echo "CVS repository (cd loncapa/loncom)" && \
      echo "   1) cd ../; ln -s production_hosts.tab hosts.tab" && \       echo "   1) ln -s production_hosts.tab hosts.tab" && \
      echo "   2) cd ../; ln -s development_hosts.tab hosts.tab" && \       echo "   2) ln -s development_hosts.tab hosts.tab" && \
      echo "or 3) cd ../; 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; \
  fi   fi
Line 203  sanitycheck: Line 204  sanitycheck:
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
  tee -a WARNINGS   tee -a WARNINGS
   
   updatequery:
    cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \
    perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
    tee -a WARNINGS
   
 postinstall:  postinstall:
  make webserverconf   make webserverconf
  make sanitycheck   make sanitycheck
Line 225  Makefile.install: $(SOURCE)/doc/loncapaf Line 231  Makefile.install: $(SOURCE)/doc/loncapaf
  "$(TARGET)" > Makefile.install   "$(TARGET)" > Makefile.install
   
 build: Makefile.build pod2html.sh pod2man.sh  build: Makefile.build pod2html.sh pod2man.sh
    install -d $(SOURCE)/doc/man
    install -d $(SOURCE)/doc/scripts
    install -d $(SOURCE)/doc/lib/perl/Apache
  echo -n "" > WARNINGS   echo -n "" > WARNINGS
  make -f Makefile.build all   make -f Makefile.build all
  make warningnote   make warningnote
Line 281  BinaryRoot: base_rpm_file_list Line 290  BinaryRoot: base_rpm_file_list
 # 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
    @if (test -e installation_manual.pdf); then \
    cp -vf installation_manual.pdf docs/.; \
    else \
    touch docs/installation_manual.pdf; \
    fi
  install -m 0755 -d docs/icons   install -m 0755 -d docs/icons
  install -m 0644 $(SOURCE)/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
    cd docs; ln -fs installation_manual.pdf index.pdf
    cd docs/reconfig; ln -fs ../installation_manual.pdf index.pdf
  perl doc_template.pl $(SOURCE)/doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  $(SOURCE)/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
Line 292  doc: Line 308  doc:
  perl doc_template.pl $(SOURCE)/doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  $(SOURCE)/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
    cd docs/license; ln -fs ../installation_manual.pdf index.pdf
  perl doc_template.pl $(SOURCE)/doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  $(SOURCE)/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
    cd docs/contact; ln -fs ../installation_manual.pdf index.pdf
  perl doc_template.pl $(SOURCE)/doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  $(SOURCE)/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
    cd docs/faq; ln -fs ../installation_manual.pdf index.pdf
  perl doc_template.pl $(SOURCE)/doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  $(SOURCE)/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
    cd docs/downloads; ln -fs ../installation_manual.pdf download.pdf
  perl doc_template.pl $(SOURCE)/doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  $(SOURCE)/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
    cd docs/install; ln -fs ../installation_manual.pdf install.pdf
  perl doc_template.pl $(SOURCE)/doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  $(SOURCE)/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
    cd docs/upgrade; ln -fs ../installation_manual.pdf upgrade.pdf
  perl doc_template.pl $(SOURCE)/doc/templates/template.html \   perl doc_template.pl $(SOURCE)/doc/templates/template.html \
  $(SOURCE)/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  pdfdoc: TEST_html2ps
  install -d docs   install -d pdfdoc
  install $(SOURCE)/doc/build/cvsreport.html docs/cvsreport.html   /usr/local/html2ps/bin/html2ps -D \
  install $(SOURCE)/doc/build/doc.html docs/index.html   $(SOURCE)/doc/build/installindex_noform.html > pdfdoc/installindex.ps
  install -d docs/hardware   /usr/local/html2ps/bin/html2ps -D \
  install $(SOURCE)/doc/hardware/hardware.html \   $(SOURCE)/doc/build/reconfig.html | \
  docs/hardware/hardware.html   perl -nle 's/\[EXAMPLE\]/\[EXAMPLE \(at end of document\)\]/g;print' \
  install -d docs/3.1   > pdfdoc/reconfig.ps
  install $(SOURCE)/doc/build/install.html docs/3.1/index.html   /usr/local/html2ps/bin/html2ps -D \
  install $(SOURCE)/doc/build/instructions_with_cd.html \   $(SOURCE)/doc/build/install.html > pdfdoc/install.ps
  docs/3.1/instructions_with_cd.html   /usr/local/html2ps/bin/html2ps -D \
  install $(SOURCE)/doc/build/libraryserverconfiguration.gif \   $(SOURCE)/doc/build/upgrade.html > pdfdoc/upgrade.ps
  docs/3.1/libraryserverconfiguration.gif   /usr/local/html2ps/bin/html2ps -D \
  install $(SOURCE)/doc/build/librarysystemsettings.gif \   $(SOURCE)/doc/build/faq.html > pdfdoc/faq.ps
  docs/3.1/librarysystemsettings.gif   /usr/local/html2ps/bin/html2ps -D \
  install -d docs/cvsupgrade   $(SOURCE)/doc/build/download.html > pdfdoc/download.ps
  install $(SOURCE)/doc/build/cvsupgrade.html docs/cvsupgrade/index.html   /usr/local/html2ps/bin/html2ps -D \
  install -d docs/upgrade   $(SOURCE)/doc/build/contact.html > pdfdoc/contact.ps
  install $(SOURCE)/doc/build/upgrade.html docs/upgrade/index.html   /usr/local/html2ps/bin/html2ps -D \
  install -d docs/reconfig   $(SOURCE)/doc/build/license.html > pdfdoc/license.ps
  install $(SOURCE)/doc/build/reconfig.html docs/reconfig/index.html  #       This creates a bad confexamples.ps... so take the long way around
  install -d docs/3.1/otherfiles  # cd $(SOURCE)/doc/build/confexamples; \
  install $(SOURCE)/doc/otherfiles/rpm_list.txt \  # mpage -P- -1 -H [^C]* > ../../../loncom/build/pdfdoc/confexamples.ps
  docs/3.1/otherfiles/rpm_list.txt   install -d pdfdoc/confexamples
  install $(SOURCE)/doc/build/loncapanetwork.html \   cd $(SOURCE)/doc/build/confexamples; \
  docs/loncapanetwork.html   find . -type f | cut -b3- | grep -v '^C' | perl -nle \
  install $(SOURCE)/doc/build/loncapanfs.html docs/loncapanfs.html   '`mpage -P- -1 -H $$_ > ../../../loncom/build/pdfdoc/confexamples/$$_.ps`;'
  install $(SOURCE)/doc/build/loncapaappleshares.html \   echo '' > pdfdoc/contents.txt
  docs/loncapaappleshares.html   echo '' >> pdfdoc/contents.txt
  install $(SOURCE)/doc/build/loncapasqldatabase.html \   echo '          The Learning Online Network' >> pdfdoc/contents.txt
  docs/loncapasqldatabase.html   echo '                    with the' >> pdfdoc/contents.txt
  install $(SOURCE)/doc/build/loncapapasswords.html \   echo '     Computer-Assisted Personalized Approach' >> \
  docs/loncapapasswords.html   pdfdoc/contents.txt
  install $(SOURCE)/doc/build/loncapapasswordauthentication.html \   echo '' >> pdfdoc/contents.txt
  docs/loncapapasswordauthentication.html   echo '' >> pdfdoc/contents.txt
  install $(SOURCE)/doc/build/loncapatimesync.html \   echo 'CONTENTS' >> pdfdoc/contents.txt
  docs/loncapatimesync.html   echo '--------' >> pdfdoc/contents.txt
  install $(SOURCE)/doc/build/loncapamathequivalency.html \   echo 'Opening' >> pdfdoc/contents.txt
  docs/loncapamathequivalency.html   echo 'Configuration' >> pdfdoc/contents.txt
  tar czvf install.lon-capa.org_docs.tar.gz docs   echo 'Installation' >> pdfdoc/contents.txt
  rm -Rf docs   echo 'Upgrading a LON-CAPA Server' >> pdfdoc/contents.txt
    echo 'FAQ' >> pdfdoc/contents.txt
    echo 'Download' >> pdfdoc/contents.txt
    echo 'Contact Information' >> pdfdoc/contents.txt
    echo 'License Information' >> pdfdoc/contents.txt
    echo 'Configuration Examples' >> pdfdoc/contents.txt
    mpage -P- -1 \
    pdfdoc/contents.txt \
    pdfdoc/installindex.ps \
    pdfdoc/reconfig.ps \
    pdfdoc/install.ps \
    pdfdoc/upgrade.ps \
    pdfdoc/faq.ps \
    pdfdoc/download.ps \
    pdfdoc/contact.ps \
    pdfdoc/license.ps \
    pdfdoc/confexamples/*.ps \
    > pdfdoc/installation_manual.ps
    ps2pdf pdfdoc/installation_manual.ps pdfdoc/installation_manual.pdf
    mv -vf pdfdoc/installation_manual.pdf .
   
   TEST_html2ps:
    @if (test -e /usr/local/html2ps/bin/html2ps); then \
    echo "I can find html2ps; assume okay"; \
    else \
    echo "**** ERROR **** cannot find /usr/local/html2ps/bin/html2ps!" && \
           echo "Please visit http://www.tdb.uu.se/~jan/html2ps.html" && \
    exit 1; \
    fi
   
 tardist:  tardist:
  cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \   # ----------- MANIFEST the building, testing and standard loncapa files
    cat $(SOURCE)/doc/loncapafiles/buildfiles.lpml | \
  perl lpml_parse.pl MANIFEST development default \   perl lpml_parse.pl MANIFEST development default \
  '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' > $(SOURCE)/MANIFEST   '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' > $(SOURCE)/MANIFEST
  cat $(SOURCE)/doc/loncapafiles/buildfiles.lpml | \   cat $(SOURCE)/doc/loncapafiles/testfiles.lpml | \
    perl lpml_parse.pl MANIFEST development default \
    '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
    cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
  perl lpml_parse.pl MANIFEST development default \   perl lpml_parse.pl MANIFEST development default \
  '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST   '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
    # ------ CVS/Entries directories to retain 'time-checking' intelligence
    cd $(SOURCE); find . -type f -name 'Entries' | grep 'CVS/Entries' >> \
    MANIFEST
    # ---- Files for top-level (the vanilla layer that the user first sees)
  echo 'README' >> $(SOURCE)/MANIFEST   echo 'README' >> $(SOURCE)/MANIFEST
  echo 'UPDATE' >> $(SOURCE)/MANIFEST   echo 'UPDATE' >> $(SOURCE)/MANIFEST
  echo 'TEST' >> $(SOURCE)/MANIFEST   echo 'TEST' >> $(SOURCE)/MANIFEST
    echo 'CHECKRPMS' >> $(SOURCE)/MANIFEST
    # ---------------------------------- might as well include the MANIFEST
    echo 'MANIFEST' >> $(SOURCE)/MANIFEST
    # ------------------------------------------ hosts.tab are belong to us
    echo 'loncom/rawhide_hosts.tab' >> $(SOURCE)/MANIFEST
    echo 'loncom/production_hosts.tab' >> $(SOURCE)/MANIFEST
    echo 'loncom/development_hosts.tab' >> $(SOURCE)/MANIFEST
    # ------------------ 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
  echo 'doc/lib/perl' >> $(SOURCE)/MANIFEST   echo 'doc/lib/perl' >> $(SOURCE)/MANIFEST
    echo 'doc/lib/perl/Apache' >> $(SOURCE)/MANIFEST
    echo 'doc/scripts' >> $(SOURCE)/MANIFEST
    # --------------------------- Point UPDATE to the internal make process
  echo '#!/bin/sh' > $(SOURCE)/UPDATE   echo '#!/bin/sh' > $(SOURCE)/UPDATE
    echo 'touch loncom/build/WARNINGS' >> $(SOURCE)/UPDATE;
    echo 'ln -s loncom/build/WARNINGS WARNINGS' >> $(SOURCE)/UPDATE;
  echo 'cd loncom/build; make build; make install' >> $(SOURCE)/UPDATE   echo 'cd loncom/build; make build; make install' >> $(SOURCE)/UPDATE
    # ----------------------------- 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
    # ----------------------------- Copy CHECKRPMS to the vanilla top-level
    cp $(SOURCE)/loncom/build/CHECKRPMS $(SOURCE)/CHECKRPMS
    # ----------------------- vanilla executables must indeed be executable
  chmod a+rx $(SOURCE)/UPDATE   chmod a+rx $(SOURCE)/UPDATE
  chmod a+rx $(SOURCE)/TEST   chmod a+rx $(SOURCE)/TEST
    chmod a+rx $(SOURCE)/CHECKRPMS
    # -------------------------------- Copy README to the vanilla top-level
  cp $(SOURCE)/doc/shortest_path_redhat7.2.txt $(SOURCE)/README   cp $(SOURCE)/doc/shortest_path_redhat7.2.txt $(SOURCE)/README
    # --------------------------------------------------- Clean up MANIFEST
  cd $(SOURCE); \   cd $(SOURCE); \
  tar --numeric-owner --files-from MANIFEST -czf loncapa.tar.gz \   sort MANIFEST | perl -nle 'print "$(DIRTARGET)/$$_"' | \
  2>WARNINGS || [ "0" == "0" ]   perl -nle 's/\w+\/\.\.\///g;s/\w+\/\.\.\///g;print' | \
    perl -nle 's/\w+\/\.\.\///g;s/\w+\/\.\.\///g;print' | \
    perl -nle 's/\w+\/\.\.\///g;s/\w+\/\.\.\///g;print' | \
    perl -nle 's/\/\.\//\//g;print' | sort | uniq > \
    MANIFEST_loncapa
    # -------------------------------------------------------- Make tardist
    @cd $(SOURCE); \
    if (test -h $(DIRTARGET)); then \
    echo "$(DIRTARGET) link already defined; assume okay"; \
    else \
    ln -s . $(DIRTARGET); \
    fi
    cd $(SOURCE); \
    tar --no-recursion --numeric-owner --files-from MANIFEST_loncapa \
    -h -czf loncapa.tar.gz 2>WARNINGS || [ "0" == "0" ]
  cat $(SOURCE)/WARNINGS | \   cat $(SOURCE)/WARNINGS | \
  xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS   xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS
  rm -f $(SOURCE)/WARNINGS   rm -f $(SOURCE)/WARNINGS
  make warningnote   make warningnote
   
 cvsreport:  
   
 clean:  clean:
  rm -f $(SOURCE)/README   rm -f $(SOURCE)/README
  rm -f $(SOURCE)/UPDATE   rm -f $(SOURCE)/UPDATE
  rm -f $(SOURCE)/TEST   rm -f $(SOURCE)/TEST
    rm -f $(SOURCE)/MANIFEST
    rm -f $(SOURCE)/loncapa
  rm -f $(SOURCE)/loncapa.tar.gz   rm -f $(SOURCE)/loncapa.tar.gz
  rm -Rf HTML   rm -Rf HTML
    rm -f installation_manual.pdf
  rm -f Makefile.build   rm -f Makefile.build
  rm -f Makefile.install   rm -f Makefile.install
  rm -f Makefile.configinstall   rm -f Makefile.configinstall
Line 400  clean: Line 493  clean:
  rm -f setup_rpm_file_list.txt   rm -f setup_rpm_file_list.txt
  rm -f docs.tar.gz   rm -f docs.tar.gz
  rm -Rf docs   rm -Rf docs
    rm -Rf pdfdoc
  rm -f program.pl*   rm -f program.pl*
  rm -Rf lpmladm.*   rm -Rf lpmladm.*
  make -f Makefile.cvs clean   make -f Makefile.cvs clean

Removed from v.1.83  
changed lines
  Added in v.1.105


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.