Diff for /loncom/build/Makefile between versions 1.104 and 1.126

version 1.104, 2002/05/09 02:14:37 version 1.126, 2002/07/11 05:28:06
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
   QUERYLAUNCH=> /tmp/loncapa_query.pl; perl /tmp/loncapa_query.pl
 OUTSTREAM=>  OUTSTREAM=>
 SAVE=program.pl.$(TIMESTAMP)  SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)  LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""  METAMTARGET=""
 MTARGET=""  MTARGET=""
 VERSION=0.1  VERSION=0.4
   DIRTARGET=loncapa-$(VERSION)
   
 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 41  help: Line 42  help:
  @echo "HTML: generate an HTML-formatted description of the LON-CAPA"   @echo "HTML: generate an HTML-formatted description of the LON-CAPA"
  @echo "      CVS files"   @echo "      CVS files"
  @echo "documentation_tree: compiles a documentation tree from the "   @echo "documentation_tree: compiles a documentation tree from the "
         @echo "                    CVS:doc directory"   @echo "                    CVS:doc directory"
  @echo "status: compare the TARGET filesystem with a compiled CVS "   @echo "status: compare the TARGET filesystem with a compiled CVS "
  @echo "        source directory"   @echo "        source directory"
  @echo "statuspost: post the results of "make status" to "   @echo "statuspost: post the results of "make status" to "
Line 74  TEST_web_layer: Line 75  TEST_web_layer:
   
 TEST_hosts_tab:  TEST_hosts_tab:
  @echo "Testing hosts.tab"   @echo "Testing hosts.tab"
  @if (test -h ../hosts.tab); then \   @if (test -e ../hosts.tab); then \
  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 " && \
Line 206  sanitycheck: Line 207  sanitycheck:
   
 updatequery:  updatequery:
  cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \   cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \
  perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \   perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH)
  tee -a WARNINGS  
   
 postinstall:  postinstall:
  make webserverconf   make webserverconf
  make sanitycheck   make sanitycheck
   
 install: TEST_hosts_tab Makefile.install Makefile  NET_rawinstall:
    make TIMESTAMP=`date +"%s"` METAMTARGET="TRANSPORT" \
    MTARGET="rawinstall" HOSTNAME="$(HOSTNAME)" lpmladm
   
   VERSION:
    install -d $(TARGET)/etc
    echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release
    date +"%Y%m%d" >> $(TARGET)/etc/loncapa-release
   
   aboutVERSION:
    cat $(SOURCE)/loncom/license/about.html | \
    perl -e '$$d=`date +"%Y%m%d"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \
    $(SOURCE)/loncom/license/about.html.new
    mv -v $(SOURCE)/loncom/license/about.html.new \
    $(SOURCE)/loncom/license/about.html
   
   install: VERSION TEST_hosts_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 224  install: TEST_hosts_tab Makefile.install Line 240  install: TEST_hosts_tab Makefile.install
  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 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 -n "PASSWORD=\"localhostkey\" FOR www\@localhost"
    echo -n "(YOU MAY NEED TO REINITIALIZE YOUR MYSQL www\@localhost USER)"
    echo -n "Please see http://install.lon-capa.org/ for more information"
   
 Makefile.install: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl  rawinstall: VERSION Makefile.install Makefile
    echo -n "" > WARNINGS
    make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
    directories
    make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" files
    make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" links
    make SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
    NORESTORECONF="$(NORESTORECONF)" configinstall
   
   Makefile.install: alwaysrun
  cat $(SOURCE)/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 327  doc: Line 356  doc:
  cd docs/install; ln -fs ../installation_manual.pdf install.pdf   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
    cp -v $(SOURCE)/doc/install/redhat7.3/new_install_rh73.html \
    docs/install/rh73.html
  install -m 0755 -d docs/upgrade   install -m 0755 -d docs/upgrade
  cd docs/upgrade; ln -fs ../installation_manual.pdf upgrade.pdf   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 \
Line 358  pdfdoc: TEST_html2ps Line 389  pdfdoc: TEST_html2ps
 # mpage -P- -1 -H [^C]* > ../../../loncom/build/pdfdoc/confexamples.ps  # mpage -P- -1 -H [^C]* > ../../../loncom/build/pdfdoc/confexamples.ps
  install -d pdfdoc/confexamples   install -d pdfdoc/confexamples
  cd $(SOURCE)/doc/build/confexamples; \   cd $(SOURCE)/doc/build/confexamples; \
  find . -type f | cut -b3- | grep -v '^C' | perl -nle \   find . -type f | cut -b3- | grep -v '^C' | grep -v 'keyword' | perl -nle \
  '`mpage -P- -1 -H $$_ > ../../../loncom/build/pdfdoc/confexamples/$$_.ps`;'   '`mpage -P- -1 -H $$_ > ../../../loncom/build/pdfdoc/confexamples/$$_.ps`;'
  echo '' > pdfdoc/contents.txt   echo '' > pdfdoc/contents.txt
  echo '' >> pdfdoc/contents.txt   echo '' >> pdfdoc/contents.txt
Line 422  tardist: Line 453  tardist:
  echo 'UPDATE' >> $(SOURCE)/MANIFEST   echo 'UPDATE' >> $(SOURCE)/MANIFEST
  echo 'TEST' >> $(SOURCE)/MANIFEST   echo 'TEST' >> $(SOURCE)/MANIFEST
  echo 'CHECKRPMS' >> $(SOURCE)/MANIFEST   echo 'CHECKRPMS' >> $(SOURCE)/MANIFEST
    # ---------------------------------- might as well include the MANIFEST
  echo 'MANIFEST' >> $(SOURCE)/MANIFEST   echo 'MANIFEST' >> $(SOURCE)/MANIFEST
  # ------------------------------------------ hosts.tab are belong to us   # ------------------------------------------ hosts.tab are belong to us
  echo 'loncom/rawhide_hosts.tab' >> $(SOURCE)/MANIFEST   echo 'loncom/rawhide_hosts.tab' >> $(SOURCE)/MANIFEST
Line 435  tardist: Line 467  tardist:
  echo 'doc/scripts' >> $(SOURCE)/MANIFEST   echo 'doc/scripts' >> $(SOURCE)/MANIFEST
  # --------------------------- Point UPDATE to the internal make process   # --------------------------- Point UPDATE to the internal make process
  echo '#!/bin/sh' > $(SOURCE)/UPDATE   echo '#!/bin/sh' > $(SOURCE)/UPDATE
  echo 'cd loncom/build; make build; make install' >> $(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_tab' >> $(SOURCE)/UPDATE
    echo 'make postinstall' >> $(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 462  tardist: Line 503  tardist:
  else \   else \
  ln -s . $(DIRTARGET); \   ln -s . $(DIRTARGET); \
  fi   fi
    cp -v $(SOURCE)/loncom/license/about.html \
    $(SOURCE)/loncom/license/about.html.orig
    make aboutVERSION
    cd $(SOURCE); \
  tar --no-recursion --numeric-owner --files-from MANIFEST_loncapa \   tar --no-recursion --numeric-owner --files-from MANIFEST_loncapa \
  -h -czf loncapa.tar.gz 2>WARNINGS || [ "0" == "0" ]   -h -czf $(DIRTARGET).tar.gz 2>WARNINGS || [ "0" == "0" ]
    mv -v $(SOURCE)/loncom/license/about.html.orig \
    $(SOURCE)/loncom/license/about.html
  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
   
 clean:  clean:
    rm -Rf HTML
    rm -f installation_manual.pdf
    rm -f Makefile.build
    rm -f Makefile.install
    rm -f Makefile.configinstall
    rm -Rf BinaryRoot
    rm -Rf SetupBinaryRoot
    rm -Rf LON-CAPA-base
    rm -f base_rpm_file_list.txt
    rm -f base_customizerpm.xml
    rm -f setup_rpm_file_list.txt
    rm -f docs.tar.gz
    rm -Rf docs
    rm -Rf pdfdoc
    rm -f program.pl*
    rm -Rf lpmladm.*
    rm -f WARNINGS
    rm -f $(SOURCE)/loncom/build/hosts.tab
   
   reallyclean:
  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)/loncom/build/hosts.tab
  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 installation_manual.pdf
Line 492  clean: Line 562  clean:
  rm -Rf lpmladm.*   rm -Rf lpmladm.*
  make -f Makefile.cvs clean   make -f Makefile.cvs clean
  rm -f WARNINGS   rm -f WARNINGS
   
   alwaysrun:

Removed from v.1.104  
changed lines
  Added in v.1.126


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