--- loncom/build/Makefile	2002/08/15 15:53:09	1.133
+++ loncom/build/Makefile	2003/01/20 17:39:00	1.142
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 
 # Scott Harrison, your friendly neighborhood volunteer
-# $Id: Makefile,v 1.133 2002/08/15 15:53:09 harris41 Exp $
+# $Id: Makefile,v 1.142 2003/01/20 17:39:00 harris41 Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -23,7 +23,11 @@ SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
-VERSION=0.4
+VERSION=0.6.1
+# The current working definition for "RELEASE" is: changes not in the software,
+# but in the operating system dependent packaging of the software.  Thus, the
+# generic tarball releases do not need to have a release number specified.
+RELEASE=1 # As a general rule for now, this is always being set to "1".
 DIRTARGET=loncapa-$(VERSION)
 
 # =============================================== Help targets for the Makefile
@@ -97,7 +101,7 @@ help_TARGETS:
 	@echo "           'make build' first before running 'make install'"
 	@echo "configinstall: install configuration files and restore with"
 	@echo "               prior information"
-	@echo "install: install from a ***compiled*** source tree
+	@echo "install: install from a ***compiled*** source tree"
 	@echo "         (see make build) to a specified TARGET destination"
 	@echo "         on the filesystem (default setting is TARGET=/)."
 	@echo "rawinstall: just install files, links and directories without"
@@ -145,7 +149,7 @@ help_TARGETS:
 	@echo "              the distributed tarball"
 	@echo "MANIFEST_cvs: essentially a list of all CVS/Entries files used"
 	@echo "              for 'time-checking' intelligence"
-	@echo "MANIFEST_lpml: a list of all LON-CAPA files to be installed,
+	@echo "MANIFEST_lpml: a list of all LON-CAPA files to be installed,"
 	@echo "               compile from, used as building software, and"
 	@echo "               testing"
 	@echo "MANIFEST_vanillatar: 'README'-type top-level files that a user"
@@ -184,6 +188,17 @@ help_TARGETS:
 	@echo "       interfere with rebuilding/recompiling software"
 	@echo "reallyclean: remove all files that were generated during"
 	@echo "             building or compilation of the software"
+	@echo "uninstall: remove all directories that do not contain files"
+	@echo "           from other software packages and that do not contain"
+	@echo "           student and instructor data; NOTE THAT THIS IS"
+	@echo "           INTERACTIVE--you will be given a final chance"
+	@echo "           to look at what will and will not be deleted."
+	@echo "           Still, be careful.  This is a very new target and is"
+	@echo "           an alpha-level software feature for now."
+	@echo "backup: rolls a tarball backup of all important student and "
+	@echo "        instructor data (NOT YET IMPLEMENTED)"
+	@echo "restore: reseeds a LON-CAPA server with tarball backups "
+	@echo "         generated by \"make backup\" (NOT YET IMPLEMENTED)"
 	@echo "*** A HELPFUL DEPENDENCY ***"
 	@echo "alwaysrun: blank target that is a dependency for targets"
 	@echo "           that should \"always run\""
@@ -354,6 +369,11 @@ reseval_fixup:
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+clearoutoldspreadsheetcache:
+	cat $(SOURCE)/doc/loncapafiles/clearoutoldspreadsheetcache.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 sendmail_fix:
 	cat $(SOURCE)/doc/loncapafiles/sendmail_fix.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
@@ -362,6 +382,7 @@ sendmail_fix:
 postinstall:
 	make webserverconf
 	make reseval_fixup
+	make clearoutoldspreadsheetcache
 	make sanitycheck
 	make sendmail_fix
 
@@ -483,6 +504,9 @@ MANIFEST_lpml:
 	cat $(SOURCE)/doc/loncapafiles/testfiles.lpml | \
 	perl lpml_parse.pl MANIFEST development default \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
+	cat $(SOURCE)/doc/loncapafiles/installfiles.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
@@ -551,8 +575,8 @@ RPM: BinaryRoot base_rpm_file_list
 	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 '' '' \
-	BinaryRoot base_customizerpm.xml
+	cat base_rpm_file_list.txt | perl make_rpm.pl base $(VERSION) \
+	$(RELEASE) '' '' BinaryRoot base_customizerpm.xml
 
 DPKG:
 	make TARGET='lon-capa-$(VERSION)' NORESTORECONF='1' install
@@ -747,5 +771,23 @@ reallyclean:
 	make -f Makefile.cvs clean
 	rm -f WARNINGS
 
+uninstall:
+	rm -f UNINSTALL_SHELL_COMMANDS
+	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
+	perl lpml_parse.pl uninstall_shell_commands $(CATEGORY) $(DIST) \
+	"$(SOURCE)" "$(TARGET)" > UNINSTALL_SHELL_COMMANDS
+	@echo -n "**** NOTE **** A file \"UNINSTALL_SHELL_COMMANDS\" has been "
+	@echo "generated."
+	@echo "First, you should view the contents of this file."
+	@echo "If you are happy with the 'rm -Rf'! commands (or at least"
+	@echo "have another job lined up in case of catastrophe), then you "
+	@echo "can execute the following: sh ./UNINSTALL_SHELL_COMMANDS"
+
+backup:
+	@echo "Not yet implemented"
+
+restore:
+	@echo "Not yet implemented"
+
 # ================================================ *** A HELPFUL DEPENDENCY ***
 alwaysrun: