--- loncom/build/Makefile 2002/03/03 04:46:38 1.76 +++ loncom/build/Makefile 2002/05/09 02:14:37 1.104 @@ -1,12 +1,14 @@ # The LearningOnline Network with CAPA # Scott Harrison -# $Id: Makefile,v 1.76 2002/03/03 04:46:38 harris41 Exp $ +# $Id: Makefile,v 1.104 2002/05/09 02:14:37 harris41 Exp $ -DIST="default" +DISTPROBE=`perl ./distprobe` +DIST=$(DISTPROBE) CATEGORY="development" -SOURCE="../.." +SOURCE=../.. TARGET="" +DIRTARGET=loncapa NORESTORECONF="0" HOSTNAME="" LAUNCH=| perl @@ -15,6 +17,7 @@ SAVE=program.pl.$(TIMESTAMP) LAUNCHSAVE=$(OUTSTREAM) $(SAVE) METAMTARGET="" MTARGET="" +VERSION=0.1 help: @echo "*** You need to specify a valid target ***" @@ -51,6 +54,8 @@ help: @echo "RPM: build LON-CAPA-base RPM from CVS repository" @echo "setup_RPM: build LON-CAPA-setup RPM from CVS repository" @echo " handy for CD-ROM generation" + @echo "tardist: build a tarball that will upgrade the software on a " + @echo " system" test: TEST_lpml_scripts TEST_system_dependencies TEST_web_layer @echo "ALL SYSTEM DEPENDENCY TESTS SUCCESSFUL" @@ -64,7 +69,8 @@ TEST_lpml_scripts: cd ../test; perl filecomparetest.pl TEST_web_layer: - @echo "Testing of web layers is not yet implemented." + @echo "TESTING WEB LAYER" + cd weblayer_test; make TEST_hosts_tab: @echo "Testing hosts.tab" @@ -72,10 +78,10 @@ TEST_hosts_tab: echo "there is a defined link; assume okay"; \ else echo "**** ERROR **** hosts.tab not defined!" && \ echo -n "You need to do one of the following within your " && \ - echo "CVS repository" && \ - echo " 1) cd ../; ln -s production_hosts.tab hosts.tab" && \ - echo " 2) cd ../; ln -s development_hosts.tab hosts.tab" && \ - echo "or 3) cd ../; ln -s rawhide_hosts.tab hosts.tab" && \ + echo "CVS repository (cd loncapa/loncom)" && \ + echo " 1) ln -s production_hosts.tab hosts.tab" && \ + echo " 2) ln -s development_hosts.tab hosts.tab" && \ + echo "or 3) ln -s rawhide_hosts.tab hosts.tab" && \ echo "(you most likely want option #1, production_hosts.tab)" && \ exit 1; \ fi @@ -85,8 +91,8 @@ NET_hosts_tab: MTARGET="hosts_tab" HOSTNAME="$(HOSTNAME)" lpmladm hosts_tab: TEST_hosts_tab - cat ../../doc/loncapafiles/loncapafiles.lpml | \ - perl xfml_parse.pl ../../doc/loncapafiles/valid_hosts.xfml | \ + cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \ + perl xfml_parse.pl $(SOURCE)/doc/loncapafiles/valid_hosts.xfml | \ perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" \ "$(TARGET)" > Makefile.install make -f Makefile.install directories @@ -127,20 +133,22 @@ lpmladm: HTML: install -d HTML - cp ../../doc/loncapafiles/*.gif HTML - cat ../../doc/loncapafiles/loncapafiles.lpml | \ - perl lpml_parse.pl html development default ../.. '' > HTML/index.html + cp $(SOURCE)/doc/loncapafiles/*.gif HTML + cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \ + perl lpml_parse.pl html development default "$(SOURCE)" '$(TARGET)' \ + > HTML/index.html status: install -d HTML - cp ../../doc/loncapafiles/*.gif HTML - cat ../../doc/loncapafiles/loncapafiles.lpml | \ - perl lpml_parse.pl html $(CATEGORY) $(DIST) "../.." "" | \ + cp $(SOURCE)/doc/loncapafiles/*.gif HTML + cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \ + perl lpml_parse.pl html $(CATEGORY) $(DIST) "$(SOURCE)" "($TARGET)" | \ perl lpml_html_posteval.pl > \ HTML/filestatus.html 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 \ $(TARGET)/home/httpd/html/lon-status/filestatus.html @@ -149,8 +157,8 @@ rpmstatus: rpm -qa --queryformat \ '%{NAME}\t%{VERSION}\t%{RELEASE}\t%{BUILDTIME}\n' | sort > \ RPMSTATUS/current.tmp - cat ../../doc/otherfiles/cd_rpms.txt > RPMSTATUS/standard.tmp - cat ../../doc/otherfiles/rpm_list.txt > RPMSTATUS/expected.tmp + cat $(SOURCE)/doc/otherfiles/cd_rpms.txt > RPMSTATUS/standard.tmp + cat $(SOURCE)/doc/otherfiles/rpm_list.txt > RPMSTATUS/expected.tmp perl rpmparse.pl RPMSTATUS/standard.tmp RPMSTATUS/current.tmp \ RPMSTATUS/expected.tmp > RPMSTATUS/rpmstatus.html @@ -163,8 +171,8 @@ configinstall: Makefile.configinstall if (test "0" = $(NORESTORECONF)); then \ perl loncaparestoreconfigurations suffix .lpmlnew; fi -Makefile.configinstall: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl - cat ../../doc/loncapafiles/loncapafiles.lpml | \ +Makefile.configinstall: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl + cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \ perl lpml_parse.pl configinstall $(CATEGORY) $(DIST) "$(SOURCE)" \ "$(TARGET)" > Makefile.configinstall @@ -188,11 +196,16 @@ NET_webserverconf: MTARGET="webserverconf" HOSTNAME="$(HOSTNAME)" lpmladm webserverconf: - cat ../../doc/loncapafiles/webserver.piml | \ + cat $(SOURCE)/doc/loncapafiles/webserver.piml | \ perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) sanitycheck: - cat ../../doc/loncapafiles/sanitycheck.piml | \ + cat $(SOURCE)/doc/loncapafiles/sanitycheck.piml | \ + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ + tee -a WARNINGS + +updatequery: + cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \ perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ tee -a WARNINGS @@ -212,23 +225,26 @@ install: TEST_hosts_tab Makefile.install make warningnote echo "You can run 'make test' to see if your system is ready to go!" -Makefile.install: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl - cat ../../doc/loncapafiles/loncapafiles.lpml | \ +Makefile.install: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl + cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \ perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" \ "$(TARGET)" > Makefile.install 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 make -f Makefile.build all make warningnote -Makefile.build: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl - cat ../../doc/loncapafiles/loncapafiles.lpml | \ - perl lpml_parse.pl build $(CATEGORY) $(DIST) "../.." "" > \ - Makefile.build +Makefile.build: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl + cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \ + perl lpml_parse.pl build $(CATEGORY) $(DIST) "$(SOURCE)" "$(TARGET)" \ + > Makefile.build 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) \ > base_customizerpm.xml cat base_rpm_file_list.txt | perl make_rpm.pl base 3.2 '' '' \ @@ -246,14 +262,25 @@ setup_RPM: SetupBinaryRoot customizerpm.xml DPKG: - make TARGET='LON-CAPA-base' NORESTORECONF='1' install + make TARGET='lon-capa-$(VERSION)' NORESTORECONF='1' install @echo "You will next need to follow instructions at:" @echo "http://people.debian.org/~jaldhar/make_package1.html" @echo "A directory with a snapshot of the debian package files" @echo "is LON-CAPA-base." +# What DPKG steps need to happen (for future implementation): +# export EMAIL="" ... probably sharrison@mail.lon-capa.org +# deb-make +# edit debian/control +# make debian/dirs file +# make debian/copyright file +# debian/README.debian... point them to LON-CAPA URLS +# debian/changelog +# debian/conffiles +# debuild +# and maybe do some GPG-related steps around here 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) \ 'BinaryRoot' | sort > base_rpm_file_list.txt @@ -263,79 +290,192 @@ BinaryRoot: base_rpm_file_list # Generates CVS:loncom/build/docs; root location of install.lon-capa.org doc: 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 0644 ../../doc/icons/[^C][^V]* docs/icons + install -m 0644 $(SOURCE)/doc/icons/[^C][^V]* docs/icons install -m 0755 -d docs/reconfig - perl doc_template.pl ../../doc/templates/template.html \ - ../../doc/build/reconfig.html > docs/reconfig/index.html + 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 \ + $(SOURCE)/doc/build/reconfig.html > docs/reconfig/index.html 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 - perl doc_template.pl ../../doc/templates/template.html \ - ../../doc/build/installindex.html > docs/index.html + perl doc_template.pl $(SOURCE)/doc/templates/template.html \ + $(SOURCE)/doc/build/installindex.html > docs/index.html install -m 0755 -d docs/license - perl doc_template.pl ../../doc/templates/template.html \ - ../../doc/build/license.html > docs/license/index.html + cd docs/license; ln -fs ../installation_manual.pdf index.pdf + perl doc_template.pl $(SOURCE)/doc/templates/template.html \ + $(SOURCE)/doc/build/license.html > docs/license/index.html install -m 0755 -d docs/contact - perl doc_template.pl ../../doc/templates/template.html \ - ../../doc/build/contact.html > docs/contact/index.html + cd docs/contact; ln -fs ../installation_manual.pdf index.pdf + perl doc_template.pl $(SOURCE)/doc/templates/template.html \ + $(SOURCE)/doc/build/contact.html > docs/contact/index.html install -m 0755 -d docs/faq - perl doc_template.pl ../../doc/templates/template.html \ - ../../doc/build/faq.html > docs/faq/index.html + cd docs/faq; ln -fs ../installation_manual.pdf index.pdf + perl doc_template.pl $(SOURCE)/doc/templates/template.html \ + $(SOURCE)/doc/build/faq.html > docs/faq/index.html install -m 0755 -d docs/downloads - perl doc_template.pl ../../doc/templates/template.html \ - ../../doc/build/download.html > docs/downloads/index.html + cd docs/downloads; ln -fs ../installation_manual.pdf download.pdf + perl doc_template.pl $(SOURCE)/doc/templates/template.html \ + $(SOURCE)/doc/build/download.html > docs/downloads/index.html install -m 0755 -d docs/install - perl doc_template.pl ../../doc/templates/template.html \ - ../../doc/build/install.html > docs/install/index.html + cd docs/install; ln -fs ../installation_manual.pdf install.pdf + perl doc_template.pl $(SOURCE)/doc/templates/template.html \ + $(SOURCE)/doc/build/install.html > docs/install/index.html install -m 0755 -d docs/upgrade - perl doc_template.pl ../../doc/templates/template.html \ - ../../doc/build/upgrade.html > docs/upgrade/index.html + cd docs/upgrade; ln -fs ../installation_manual.pdf upgrade.pdf + perl doc_template.pl $(SOURCE)/doc/templates/template.html \ + $(SOURCE)/doc/build/upgrade.html > docs/upgrade/index.html cd docs; tar czvpf ../docs.tar.gz . -documentation_tree: cvsreport - install -d docs - install ../../doc/build/cvsreport.html docs/cvsreport.html - install ../../doc/build/doc.html docs/index.html - install -d docs/hardware - install ../../doc/hardware/hardware.html docs/hardware/hardware.html - install -d docs/3.1 - install ../../doc/build/install.html docs/3.1/index.html - install ../../doc/build/instructions_with_cd.html \ - docs/3.1/instructions_with_cd.html - install ../../doc/build/libraryserverconfiguration.gif \ - docs/3.1/libraryserverconfiguration.gif - install ../../doc/build/librarysystemsettings.gif \ - docs/3.1/librarysystemsettings.gif - install -d docs/cvsupgrade - install ../../doc/build/cvsupgrade.html docs/cvsupgrade/index.html - install -d docs/upgrade - install ../../doc/build/upgrade.html docs/upgrade/index.html - install -d docs/reconfig - install ../../doc/build/reconfig.html docs/reconfig/index.html - install -d docs/3.1/otherfiles - install ../../doc/otherfiles/rpm_list.txt \ - docs/3.1/otherfiles/rpm_list.txt - install ../../doc/build/loncapanetwork.html docs/loncapanetwork.html - install ../../doc/build/loncapanfs.html docs/loncapanfs.html - install ../../doc/build/loncapaappleshares.html \ - docs/loncapaappleshares.html - install ../../doc/build/loncapasqldatabase.html \ - docs/loncapasqldatabase.html - install ../../doc/build/loncapapasswords.html \ - docs/loncapapasswords.html - install ../../doc/build/loncapapasswordauthentication.html \ - docs/loncapapasswordauthentication.html - install ../../doc/build/loncapatimesync.html docs/loncapatimesync.html - install ../../doc/build/loncapamathequivalency.html \ - docs/loncapamathequivalency.html - tar czvf install.lon-capa.org_docs.tar.gz docs - rm -Rf docs +pdfdoc: TEST_html2ps + install -d pdfdoc + /usr/local/html2ps/bin/html2ps -D \ + $(SOURCE)/doc/build/installindex_noform.html > pdfdoc/installindex.ps + /usr/local/html2ps/bin/html2ps -D \ + $(SOURCE)/doc/build/reconfig.html | \ + perl -nle 's/\[EXAMPLE\]/\[EXAMPLE \(at end of document\)\]/g;print' \ + > pdfdoc/reconfig.ps + /usr/local/html2ps/bin/html2ps -D \ + $(SOURCE)/doc/build/install.html > pdfdoc/install.ps + /usr/local/html2ps/bin/html2ps -D \ + $(SOURCE)/doc/build/upgrade.html > pdfdoc/upgrade.ps + /usr/local/html2ps/bin/html2ps -D \ + $(SOURCE)/doc/build/faq.html > pdfdoc/faq.ps + /usr/local/html2ps/bin/html2ps -D \ + $(SOURCE)/doc/build/download.html > pdfdoc/download.ps + /usr/local/html2ps/bin/html2ps -D \ + $(SOURCE)/doc/build/contact.html > pdfdoc/contact.ps + /usr/local/html2ps/bin/html2ps -D \ + $(SOURCE)/doc/build/license.html > pdfdoc/license.ps +# This creates a bad confexamples.ps... so take the long way around +# cd $(SOURCE)/doc/build/confexamples; \ +# mpage -P- -1 -H [^C]* > ../../../loncom/build/pdfdoc/confexamples.ps + install -d pdfdoc/confexamples + cd $(SOURCE)/doc/build/confexamples; \ + find . -type f | cut -b3- | grep -v '^C' | perl -nle \ + '`mpage -P- -1 -H $$_ > ../../../loncom/build/pdfdoc/confexamples/$$_.ps`;' + echo '' > pdfdoc/contents.txt + echo '' >> pdfdoc/contents.txt + echo ' The Learning Online Network' >> pdfdoc/contents.txt + echo ' with the' >> pdfdoc/contents.txt + echo ' Computer-Assisted Personalized Approach' >> \ + pdfdoc/contents.txt + echo '' >> pdfdoc/contents.txt + echo '' >> pdfdoc/contents.txt + echo 'CONTENTS' >> pdfdoc/contents.txt + echo '--------' >> pdfdoc/contents.txt + echo 'Opening' >> pdfdoc/contents.txt + echo 'Configuration' >> pdfdoc/contents.txt + echo 'Installation' >> pdfdoc/contents.txt + 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 -cvsreport: +tardist: + # ----------- MANIFEST the building, testing and standard loncapa files + cat $(SOURCE)/doc/loncapafiles/buildfiles.lpml | \ + perl lpml_parse.pl MANIFEST development default \ + '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' > $(SOURCE)/MANIFEST + 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 \ + '$(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 'UPDATE' >> $(SOURCE)/MANIFEST + echo 'TEST' >> $(SOURCE)/MANIFEST + echo 'CHECKRPMS' >> $(SOURCE)/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/lib' >> $(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 'cd loncom/build; make build; make install' >> $(SOURCE)/UPDATE + # ----------------------------- Point TEST to the internal make process + echo '#!/bin/sh' > $(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)/TEST + chmod a+rx $(SOURCE)/CHECKRPMS + # -------------------------------- Copy README to the vanilla top-level + cp $(SOURCE)/doc/shortest_path_redhat7.2.txt $(SOURCE)/README + # --------------------------------------------------- Clean up MANIFEST + cd $(SOURCE); \ + sort MANIFEST | perl -nle 'print "$(DIRTARGET)/$$_"' | \ + 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 + tar --no-recursion --numeric-owner --files-from MANIFEST_loncapa \ + -h -czf loncapa.tar.gz 2>WARNINGS || [ "0" == "0" ] + cat $(SOURCE)/WARNINGS | \ + xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS + rm -f $(SOURCE)/WARNINGS + make warningnote clean: + rm -f $(SOURCE)/README + rm -f $(SOURCE)/UPDATE + rm -f $(SOURCE)/TEST + rm -f $(SOURCE)/loncapa.tar.gz rm -Rf HTML + rm -f installation_manual.pdf rm -f Makefile.build rm -f Makefile.install rm -f Makefile.configinstall @@ -347,6 +487,8 @@ clean: 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.* make -f Makefile.cvs clean + rm -f WARNINGS