--- loncom/build/Makefile 2001/09/30 21:12:32 1.41 +++ loncom/build/Makefile 2001/11/27 23:06:08 1.46 @@ -11,12 +11,17 @@ CATEGORY="development" all: # nothing yet here -test: TEST_system_dependencies +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 @@ -58,7 +63,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 @@ -83,11 +88,30 @@ Makefile.configinstall: ../../doc/loncap perl lpml_parse.pl configinstall $(CATEGORY) $(DIST) "../.." "" > \ Makefile.configinstall -install: build Makefile.install +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 | \ @@ -95,7 +119,9 @@ Makefile.install: ../../doc/loncapafiles Makefile.install 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 | \