--- loncom/build/Makefile 2002/01/06 04:32:39 1.53
+++ loncom/build/Makefile 2002/01/09 22:19:40 1.55
@@ -1,12 +1,13 @@
# The LearningOnline Network with CAPA
# Scott Harrison
-# $Id: Makefile,v 1.53 2002/01/06 04:32:39 harris41 Exp $
+# $Id: Makefile,v 1.55 2002/01/09 22:19:40 harris41 Exp $
DIST="default"
CATEGORY="development"
SOURCE="../.."
TARGET=""
+NORESTORECONF="0"
help:
@echo "*** You need to specify a valid target ***"
@@ -29,6 +30,8 @@ help:
@echo " a LON-CAPA system"
@echo "HTML: generate an HTML-formatted description of the LON-CAPA"
@echo " CVS files"
+ @echo "documentation_tree: compiles a documentation tree from the "
+ @echo " CVS:doc directory"
@echo "status: compare the TARGET filesystem with a compiled CVS "
@echo " source directory"
@echo "statuspost: post the results of "make status" to "
@@ -38,7 +41,9 @@ help:
@echo " CVS:doc/otherfiles/rpm_list.txt"
@echo "rpmstatuspost: post the results of "make rpmstatus" to "
@echo " TARGET/home/httpd/html/lon-status/rpmstatus.html"
- @echo "cvsreport: look at the latest changes over the last week"
+ @echo "RPM: build LON-CAPA-base RPM from CVS repository"
+ @echo "setup_RPM: build LON-CAPA-setup RPM from CVS repository"
+ @echo " handy for CD-ROM generation"
test: TEST_lpml_scripts TEST_system_dependencies TEST_web_layer
@echo "ALL SYSTEM DEPENDENCY TESTS SUCCESSFUL"
@@ -57,8 +62,8 @@ TEST_web_layer:
HTML:
install -d HTML
cp ../../doc/loncapafiles/*.gif HTML
- perl parse.pl ../../doc/loncapafiles/loncapafiles.html HTML > \
- HTML/index.html
+ cat ../../doc/loncapafiles/loncapafiles.lpml | \
+ perl lpml_parse.pl html development default ../.. '' > HTML/index.html
status:
install -d HTML
@@ -87,13 +92,15 @@ rpmstatuspost: rpmstatus
cp RPMSTATUS/rpmstatus.html /home/httpd/html/lon-status/rpmstatus.html
configinstall: Makefile.configinstall
- make -f Makefile.configinstall SOURCE="../.." TARGET="" configfiles
- perl loncaparestoreconfigurations suffix .lpmlnew
+ make -f Makefile.configinstall SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
+ configfiles
+ if (test "0" = $(NORESTORECONF)); then \
+ perl loncaparestoreconfigurations suffix .lpmlnew; fi
Makefile.configinstall: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
cat ../../doc/loncapafiles/loncapafiles.lpml | \
- perl lpml_parse.pl configinstall $(CATEGORY) $(DIST) "../.." "" > \
- Makefile.configinstall
+ perl lpml_parse.pl configinstall $(CATEGORY) $(DIST) "$(SOURCE)" \
+ "$(TARGET)" > Makefile.configinstall
warningnote:
@if (test -s WARNINGS); then \
@@ -118,7 +125,8 @@ install: Makefile.install Makefile
directories
make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" files
make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" links
- make configinstall
+ make SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
+ NORESTORECONF="$(NORESTORECONF)" configinstall
make warningnote
Makefile.install: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
@@ -136,12 +144,30 @@ Makefile.build: ../../doc/loncapafiles/l
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
+RPM: BinaryRoot base_rpm_file_list
+ cat ../../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
+
+setup_RPM: SetupBinaryRoot
+ echo "SetupBinaryRoot/etc/passwd" > setup_rpm_file_list.txt
+ echo "SetupBinaryRoot/etc/group" >> setup_rpm_file_list.txt
+ echo "SetupBinaryRoot/etc/hosts.deny" >> setup_rpm_file_list.txt
+ echo "SetupBinaryRoot/home/www" >> setup_rpm_file_list.txt
+ echo "SetupBinaryRoot/etc/pam.d/passwd" >> setup_rpm_file_list.txt
+ echo "SetupBinaryRoot/etc/pam.d/login" >> setup_rpm_file_list.txt
+ perl setup_rpm_binaryroot.pl
+ cat setup_rpm_file_list.txt | perl make_rpm.pl setup 3.2 '' '' \
+ SetupBinaryRoot customizerpm.xml
+
+
+base_rpm_file_list:
+ cat ../../doc/loncapafiles/loncapafiles.lpml | \
+ perl lpml_parse.pl rpm_file_list $(CATEGORY) $(DIST) $(SOURCE) \
+ 'BinaryRoot' | sort > base_rpm_file_list.txt
-BinaryRoot:
- perl parse.pl ../../doc/loncapafiles/loncapafiles.html BinaryRoot
+BinaryRoot: base_rpm_file_list
+ make TARGET='BinaryRoot' NORESTORECONF='1' install
loncapaconfig:
rm -Rf LoncapaconfigRoot
@@ -167,7 +193,7 @@ loncapaconfig:
cp LON-CAPA-loncapaconfig-3.1-1.i386.rpm \
/mnt/drive/install.lon-capa.org/3.1/currentcdsource/RedHat/RPMS/.
-install.lon-capa.org: cvsreport
+documentation_tree: cvsreport
install -d docs
install ../../doc/build/cvsreport.html docs/cvsreport.html
install ../../doc/build/doc.html docs/index.html
@@ -207,53 +233,10 @@ install.lon-capa.org: cvsreport
rm -Rf docs
cvsreport:
- # Header
- echo "Automatically generated CVS report
" > \
- ../../doc/build/cvsreport.html
- # General Date Info
- echo "LON-CAPA Software Changes from `date --date='7 days ago' \
- +\"%Y-%m-%d\"` to `date +\"%Y-%m-%d\"`
" >> \
- ../../doc/build/cvsreport.html
- # General Alteration Info
- echo "Number of altered files:" >> ../../doc/build/cvsreport.html
- cd ../..; cvs log -d ">`date --date='8 days ago' +\"%Y-%m-%d\"`" \
- loncom CAPA doc packaging 2>/dev/null | perl \
- loncom/build/cvsfilter.pl | grep '^Working file:' | cut -b15- | \
- wc -l >> doc/build/cvsreport.html
- # Listing of Altered Files
- echo "
Altered files:
" >> \
- ../../doc/build/cvsreport.html
- cd ../..; cvs log -d ">`date --date='8 days ago' +\"%Y-%m-%d\"`" \
- loncom CAPA doc packaging 2>/dev/null | \
- perl loncom/build/cvsfilter.pl | grep '^Working file:' | cut -b15- \
- >> doc/build/cvsreport.html
- # Log entries for loncom
- echo "
Log entries for loncom:
" >> \
- ../../doc/build/cvsreport.html
- cd ../../loncom; cvs log -d ">`date --date='8 days ago' \
- +\"%Y-%m-%d\"`" . 2>/dev/null | perl ../loncom/build/cvsfilter.pl >> \
- ../doc/build/cvsreport.html
- # Log entries for CAPA
- echo "
Log entries for CAPA:
" >> \
- ../../doc/build/cvsreport.html
- cd ../../CAPA; cvs log -d ">`date --date='8 days ago' \
- +\"%Y-%m-%d\"`" . 2>/dev/null | perl ../loncom/build/cvsfilter.pl >> \
- ../doc/build/cvsreport.html
- # Log entries for doc
- echo "
Log entries for doc:
" >> \
- ../../doc/build/cvsreport.html
- cd ../../doc; cvs log -d ">`date --date='8 days ago' \
- +\"%Y-%m-%d\"`" . 2>/dev/null | perl ../loncom/build/cvsfilter.pl >> \
- ../doc/build/cvsreport.html
- # Log entries for packaging
- echo "
Log entries for packaging:
" >> \
- ../../doc/build/cvsreport.html
- cd ../../packaging; cvs log -d ">`date --date='8 days ago' \
- +\"%Y-%m-%d\"`" . 2>/dev/null | perl ../loncom/build/cvsfilter.pl >> \
- ../doc/build/cvsreport.html
- echo "
" >> ../../doc/build/cvsreport.html
clean:
rm -Rf HTML
rm -f Makefile.build
rm -f Makefile.install
+ rm -Rf BinaryRoot
+ rm -Rf SetupBinaryRoot