--- nsdl/build/Makefile	2002/05/29 00:58:20	1.4
+++ nsdl/build/Makefile	2002/10/12 16:48:37	1.7
@@ -1,7 +1,11 @@
 # The NSDL to LON-CAPA Gateway Server
 
 # Scott Harrison
-# $Id: Makefile,v 1.4 2002/05/29 00:58:20 harris41 Exp $
+# $Id: Makefile,v 1.7 2002/10/12 16:48:37 harris41 Exp $
+
+# Quick usage:
+# Either type "make all" (compiles and installs code onto your system), or
+# type "make tardist" and use the distributable tarball.
 
 DISTPROBE=`perl ./distprobe`
 DIST=$(DISTPROBE)
@@ -20,22 +24,36 @@ VERSION=0.1
 
 help:
 	@echo "*** You need to specify a valid target ***"
-	@echo "NOTE: You can specify options to your Makefile target."
+	@echo "To get a list of valid targets: \"make help_TARGETS\""
+	@echo "To get a list of valid options: \"make help_OPTIONS\""
+	@echo " "
+	@echo "Typically invoked targets are:"
+	@echo "    make build"
+	@echo "    make install"
+	@echo "    make all"
+	@echo "    make tardist"
+	@echo "    make clean"
+
+help_OPTIONS:
+	@echo "You can specify options to your Makefile target."
 	@echo "(option) DIST can be redhat6, redhat7, debian2.2, or default"
 	@echo "(option) CATEGORY can be runtime or development"
 	@echo "(option) SOURCE is an absolute or relative directory path"
 	@echo "(option) TARGET is an absolute or relative directory path"
+
+help_TARGETS:
+	@echo "Valid targets"	
 	@echo "build: compile the CVS source tree"
 	@echo "install: install from a compiled CVS source tree to a "
 	@echo "         specified TARGET destination on the filesystem"
 	@echo "test: test different parts of the LON-CAPA system (TEST_*)"
-	@echo "TEST_lpml_scripts: make sure that the system can process "
+	@echo "TEST_lpml: make sure that the system can process "
 	@echo "                   the Linux Packaging Markup Language"
 	@echo "TEST_system_dependencies: make sure that all needed system "
 	@echo "                          components are active and present "
 	@echo "                          on the server such as perl modules"
 	@echo "                          and the MySQL database"
-	@echo "TEST_web_layer: mimic various web-based interactions with "
+	@echo "TEST_weblayer: mimic various web-based interactions with "
 	@echo "                respect to the login and various system "
 	@echo "                actions on the Gateway server"
 	@echo "HTML: generate an HTML-formatted description of the "
@@ -54,8 +72,15 @@ help:
 	@echo "tardist: build a tarball that will upgrade the software on a "
 	@echo "         system"
 
-build:
-	@echo "Not yet implemented"
+build: Makefile.build
+	echo -n "" > WARNINGS
+	make -f Makefile.build all
+	make warningnote
+
+Makefile.build: Makefile alwaysrun
+	cat gatewayfiles.lpml | \
+	perl lpml_parse.pl build $(CATEGORY) $(DIST) "$(SOURCE)" \
+	"$(TARGET)" > Makefile.build
 
 NET_install:
 	make TIMESTAMP=`date +"%s"` METAMTARGET="TRANSPORT" \
@@ -76,20 +101,25 @@ Makefile.install: Makefile alwaysrun
 
 alwaysrun:
 
-test:
-	@echo "Not yet implemented"
+test: TEST_lpml TEST_system_dependencies TEST_weblayer
+	@echo "ALL TESTS SUCCESSFUL"
 
-TEST_lpml_scripts:
-	@echo "Not yet implemented"
+TEST_lpml:
+	@echo "TESTING LPML INSTALLATION MECHANISM"
+	cd lpml_test; perl filecomparetest.pl
 
 TEST_system_dependencies:
-	@echo "Not yet implemented"
+	@echo "TESTING WEB LAYER"
 
-TEST_web_layer:
-	@echo "Not yet implemented"
+TEST_weblayer:
+	@echo "TESTING SYSTEM DEPENDENCIES"
 
 HTML:
-	@echo "Not yet implemented"
+	install -d HTML
+	cp $(SOURCE)/doc/gatewayfiles/*.gif HTML
+	cat gatewayfiles.lpml | \
+	perl lpml_parse.pl html development default "$(SOURCE)" '$(TARGET)' \
+	> HTML/index.html
 
 doc:
 	@echo "Not yet implemented"
@@ -101,7 +131,23 @@ statuspost:
 	@echo "Not yet implemented"
 
 tardist:
-	@echo "Not yet implemented"
+	@echo "Not yet fully implemented"
+	make MANIFEST_all
+
+MANIFEST_all:
+	rm -f $(SOURCE)/MANIFEST
+	make MANIFEST_lpml
+
+MANIFEST_lpml:
+#	cat $(SOURCE)/buildfiles.lpml | \
+#	perl lpml_parse.pl MANIFEST development default \
+#	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
+#	cat $(SOURCE)/testfiles.lpml | \
+#	perl lpml_parse.pl MANIFEST development default \
+#	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
+	cat $(SOURCE)/build/gatewayfiles.lpml | \
+	perl lpml_parse.pl MANIFEST development default \
+	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 
 warningnote:
 	@if (test -s WARNINGS); then \