--- loncom/build/Makefile	2001/02/27 17:09:17	1.31
+++ loncom/build/Makefile	2001/11/27 23:23:47	1.47
@@ -4,10 +4,24 @@
 # November 2000
 
 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
@@ -38,40 +52,87 @@ HTML:
 status:
 	install -d HTML
 	cp ../../doc/loncapafiles/*.gif HTML
-	perl parse.pl ../../doc/loncapafiles/loncapafiles.html status > HTML/filestatus.html
+	cat ../../doc/loncapafiles/loncapafiles.lpml | \
+	perl lpml_parse.pl html $(CATEGORY) $(DIST) "../.." "" > \
+	HTML/filestatus.html
+#	perl parse.pl ../../doc/loncapafiles/loncapafiles.html status > HTML/filestatus.html
 
 statuspost: status
 	cp ../../doc/loncapafiles/*.gif /home/httpd/html/lon-status
 	cp HTML/filestatus.html /home/httpd/html/lon-status/filestatus.html
 
+rpmstatus:
+	install -d 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
+	perl rpmparse.pl RPMSTATUS/standard.tmp RPMSTATUS/current.tmp RPMSTATUS/expected.tmp > RPMSTATUS/rpmstatus.html
+
+rpmstatuspost: rpmstatus
+	cp RPMSTATUS/rpmstatus.html /home/httpd/html/lon-status/rpmstatus.html
+
 LCMakefile:
 	perl parse.pl ../../doc/loncapafiles/loncapafiles.html LCMakefile > LCMakefile
 
 SPEC:
 	perl parse.pl ../../doc/loncapafiles/loncapafiles.html SPEC
 
-configinstall: 
-	# there is a dependency on having directories in place, but oh well...
-	perl parse.pl ../../doc/loncapafiles/loncapafiles.html configinstall > Makefile.configinstall
+configinstall: Makefile.configinstall
 	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
 
-install: build
-	perl parse.pl ../../doc/loncapafiles/loncapafiles.html install > Makefile.install
+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
+
+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: 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 $(CATEGORY) $(DIST) "../.." "" > \
+	Makefile.install
 
-build:
-	perl parse.pl ../../doc/loncapafiles/loncapafiles.html build > Makefile.build
+build: Makefile.build
+	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
 
 RPM: BinaryRoot
 	cat base_file_list.txt | perl make_rpm.pl base 3.1 '' '' BinaryRoot
 	cat setup_file_list.txt | perl make_rpm.pl setup 3.1 '' '' BinaryRoot
-	cp LON-CAPA-base-3.1-1.i386.rpm /mnt/drive/install.lon-capa.org/3.1/currentcdsource/RedHat/RPMS/.
-	cp LON-CAPA-setup-3.1-1.i386.rpm /mnt/drive/install.lon-capa.org/3.1/currentcdsource/RedHat/RPMS/.
+	cp LON-CAPA-base-3.1-1.i386.rpm $(CDFSLOC)/RedHat/RPMS/.
+	cp LON-CAPA-setup-3.1-1.i386.rpm $(CDFSLOC)/RedHat/RPMS/.
 
 BinaryRoot:
 	perl parse.pl ../../doc/loncapafiles/loncapafiles.html BinaryRoot
@@ -104,8 +165,10 @@ install.lon-capa.org: cvsreport
 	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/install.html docs/upgrade/index.html
+	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