--- loncom/build/Makefile	2001/09/08 22:37:34	1.38
+++ loncom/build/Makefile	2001/11/29 19:00:31	1.48
@@ -1,15 +1,27 @@
-# Makefile
-# For LON-CAPA
+# The LearningOnline Network with CAPA
+
 # Scott Harrison
-# November 2000
+# $Id: Makefile,v 1.48 2001/11/29 19:00:31 harris41 Exp $
 
 CDTARGET="."
 CDFSLOC="/mnt/loncapacd/install.lon-capa.org/3.1/currentcdsource"
 DIST="default"
+CATEGORY="development"
 
 all: 
 	# nothing yet here
 
+test: TEST_lpml_scripts TEST_system_dependencies
+	@echo "ALL SYSTEM DEPENDENCY TESTS SUCCESSFUL"
+
+TEST_system_dependencies:
+	echo "TESTING SYSTEM DEPENDENCIES";
+	cd system_dependencies; make
+
+TEST_lpml_scripts:
+	echo "TESTING LPML INSTALLATION CODE";
+	cd ../test; perl filecomparetest.pl
+
 cd: 
 	# Build temporary script to get cd
 	# make sure there is enough disk space
@@ -40,6 +52,11 @@ HTML:
 status:
 	install -d HTML
 	cp ../../doc/loncapafiles/*.gif HTML
+	cat ../../doc/loncapafiles/loncapafiles.lpml | \
+	perl lpml_parse.pl html $(CATEGORY) $(DIST) "../.." "" > \
+	HTML/filestatus.html
+
+oldstatus:
 	perl parse.pl ../../doc/loncapafiles/loncapafiles.html status > HTML/filestatus.html
 
 statuspost: status
@@ -48,7 +65,7 @@ statuspost: status
 
 rpmstatus:
 	install -d RPMSTATUS
-	rpm -qa --queryformat '%{NAME}\t%{VERSION}\t%{BUILDTIME}\n' | sort > RPMSTATUS/current.tmp
+	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
 	perl rpmparse.pl RPMSTATUS/standard.tmp RPMSTATUS/current.tmp RPMSTATUS/expected.tmp > RPMSTATUS/rpmstatus.html
@@ -63,29 +80,55 @@ SPEC:
 	perl parse.pl ../../doc/loncapafiles/loncapafiles.html SPEC
 
 configinstall: Makefile.configinstall
-	# there is a dependency on having directories in place, but oh well...
 	make -f Makefile.configinstall SOURCE="../.." TARGET="" configfiles
-	perl loncaparestoreconfigurations lasttimestamp
-	make -f Makefile.configinstall TARGET="" configpermissions
+	perl loncaparestoreconfigurations suffix .lpmlnew
+#	make -f Makefile.configinstall TARGET="" configpermissions
+
+Makefile.configinstall: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
+#	perl parse.pl ../../doc/loncapafiles/loncapafiles.html configinstall > Makefile.configinstall
+	cat ../../doc/loncapafiles/loncapafiles.lpml | \
+	perl lpml_parse.pl configinstall $(CATEGORY) $(DIST) "../.." "" > \
+	Makefile.configinstall
 
-Makefile.configinstall: ../../doc/loncapafiles/loncapafiles.html
-	perl parse.pl ../../doc/loncapafiles/loncapafiles.html configinstall > Makefile.configinstall
+warningnote:
+	@if (test -s WARNINGS); then \
+		W=`grep -c '\*\*\*\* WARNING' WARNINGS`; \
+		E=`grep -c '\*\*\*\* ERROR' WARNINGS`; \
+		N=`grep -c '\*\*\*\* NOTE' WARNINGS`; \
+		echo "--->  $$W WARNINGS ENCOUNTERED!       "; \
+		echo "--->  $$E ERRORS ENCOUNTERED!         "; \
+		echo "--->  $$N NOTES ENCOUNTERED!          "; \
+		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; \
+		echo "!!!!  Please read the WARNINGS file !!!!"; \
+		echo "!!!!   to make sure everything is   !!!!"; \
+		echo "!!!!    correct and taken care of   !!!!"; \
+		echo "!!!!    (it is output below here)   !!!!"; \
+		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; \
+		cat WARNINGS; \
+	fi
 
-install: build Makefile.install
+install: Makefile.install
+	echo -n "" > WARNINGS
 	make -f Makefile.install SOURCE="../.." TARGET="" directories
 	make -f Makefile.install SOURCE="../.." TARGET="" files
 	make -f Makefile.install SOURCE="../.." TARGET="" links
+	make configinstall
+	make warningnote
 
 Makefile.install: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
 	cat ../../doc/loncapafiles/loncapafiles.lpml | \
-	perl lpml_parse.pl install development $(DIST) "../.." "" > \
+	perl lpml_parse.pl install $(CATEGORY) $(DIST) "../.." "" > \
 	Makefile.install
 
 build: Makefile.build
+	echo -n "" > WARNINGS
 	make -f Makefile.build all
+	make warningnote
 
-Makefile.build: ../../doc/loncapafiles/loncapafiles.html
-	perl parse.pl ../../doc/loncapafiles/loncapafiles.html build > Makefile.build
+Makefile.build: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
+	cat ../../doc/loncapafiles/loncapafiles.lpml | \
+	perl lpml_parse.pl build $(CATEGORY) $(DIST) "../.." "" > \
+	Makefile.build
 
 RPM: BinaryRoot
 	cat base_file_list.txt | perl make_rpm.pl base 3.1 '' '' BinaryRoot