--- loncom/build/Makefile	2002/03/22 01:34:24	1.78
+++ loncom/build/Makefile	2002/04/25 22:43:07	1.84
@@ -1,11 +1,12 @@
 # The LearningOnline Network with CAPA
 
 # Scott Harrison
-# $Id: Makefile,v 1.78 2002/03/22 01:34:24 harris41 Exp $
+# $Id: Makefile,v 1.84 2002/04/25 22:43:07 harris41 Exp $
 
-DIST="default"
+DISTPROBE=`perl ./distprobe`
+DIST=$(DISTPROBE)
 CATEGORY="development"
-SOURCE="../.."
+SOURCE=../..
 TARGET=""
 NORESTORECONF="0"
 HOSTNAME=""
@@ -15,6 +16,7 @@ SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
+VERSION=0.1
 
 help: 
 	@echo "*** You need to specify a valid target ***"
@@ -51,6 +53,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"
@@ -86,8 +90,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
@@ -128,20 +132,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
 
@@ -150,8 +156,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
 
@@ -164,8 +170,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
 
@@ -189,11 +195,11 @@ 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
 
@@ -213,8 +219,8 @@ 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
 
@@ -223,13 +229,13 @@ build: Makefile.build pod2html.sh pod2ma
 	make -f Makefile.build all
 	make warningnote
 
-Makefile.build: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
-	cat ../../doc/loncapafiles/loncapafiles.lpml | \
+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 '' '' \
@@ -247,14 +253,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
 
@@ -265,77 +282,113 @@ BinaryRoot: base_rpm_file_list
 doc:
 	install -d docs
 	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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 $(SOURCE)/doc/build/cvsreport.html docs/cvsreport.html
+	install $(SOURCE)/doc/build/doc.html docs/index.html
 	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 ../../doc/build/install.html docs/3.1/index.html
-	install ../../doc/build/instructions_with_cd.html \
+	install $(SOURCE)/doc/build/install.html docs/3.1/index.html
+	install $(SOURCE)/doc/build/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
-	install ../../doc/build/librarysystemsettings.gif \
+	install $(SOURCE)/doc/build/librarysystemsettings.gif \
 	docs/3.1/librarysystemsettings.gif
 	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 ../../doc/build/upgrade.html docs/upgrade/index.html
+	install $(SOURCE)/doc/build/upgrade.html docs/upgrade/index.html
 	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 ../../doc/otherfiles/rpm_list.txt \
+	install $(SOURCE)/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 \
+	install $(SOURCE)/doc/build/loncapanetwork.html \
+	docs/loncapanetwork.html
+	install $(SOURCE)/doc/build/loncapanfs.html docs/loncapanfs.html
+	install $(SOURCE)/doc/build/loncapaappleshares.html \
 	docs/loncapaappleshares.html
-	install ../../doc/build/loncapasqldatabase.html \
+	install $(SOURCE)/doc/build/loncapasqldatabase.html \
 	docs/loncapasqldatabase.html
-	install ../../doc/build/loncapapasswords.html \
+	install $(SOURCE)/doc/build/loncapapasswords.html \
 	docs/loncapapasswords.html
-	install ../../doc/build/loncapapasswordauthentication.html \
+	install $(SOURCE)/doc/build/loncapapasswordauthentication.html \
 	docs/loncapapasswordauthentication.html
-	install ../../doc/build/loncapatimesync.html docs/loncapatimesync.html
-	install ../../doc/build/loncapamathequivalency.html \
+	install $(SOURCE)/doc/build/loncapatimesync.html \
+	docs/loncapatimesync.html
+	install $(SOURCE)/doc/build/loncapamathequivalency.html \
 	docs/loncapamathequivalency.html
 	tar czvf install.lon-capa.org_docs.tar.gz 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 'doc/man' >> $(SOURCE)/MANIFEST
+	echo 'doc/lib' >> $(SOURCE)/MANIFEST
+	echo 'doc/lib/perl' >> $(SOURCE)/MANIFEST
+	echo 'doc/scripts' >> $(SOURCE)/MANIFEST
+	echo '#!/bin/sh' > $(SOURCE)/UPDATE
+	echo 'cd loncom/build; make build; make install' >> $(SOURCE)/UPDATE
+	echo '#!/bin/sh' > $(SOURCE)/TEST
+	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:
 
 clean:
+	rm -f $(SOURCE)/README
+	rm -f $(SOURCE)/UPDATE
+	rm -f $(SOURCE)/TEST
+	rm -f $(SOURCE)/loncapa.tar.gz
 	rm -Rf HTML
 	rm -f Makefile.build
 	rm -f Makefile.install
@@ -351,3 +404,4 @@ clean:
 	rm -f program.pl*
 	rm -Rf lpmladm.*
 	make -f Makefile.cvs clean
+	rm -f WARNINGS