--- loncom/build/Makefile 2003/03/21 19:02:41 1.141.2.1
+++ loncom/build/Makefile 2003/09/01 03:10:47 1.155.4.2
@@ -1,7 +1,6 @@
# The LearningOnline Network with CAPA
-# Scott Harrison, your friendly neighborhood volunteer
-# $Id: Makefile,v 1.141.2.1 2003/03/21 19:02:41 albertel Exp $
+# $Id: Makefile,v 1.155.4.2 2003/09/01 03:10:47 albertel Exp $
# TYPICAL USAGE of this Makefile is primarily for two targets:
# "make build" and "make install".
@@ -23,8 +22,13 @@ SAVE=program.pl.$(TIMESTAMP)
LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
METAMTARGET=""
MTARGET=""
-VERSION=0.6.2
+VERSION=1.0.1
+# The current working definition for "RELEASE" is: changes not in the software,
+# but in the operating system dependent packaging of the software. Thus, the
+# generic tarball releases do not need to have a release number specified.
+RELEASE=1 # As a general rule for now, this is always being set to "1".
DIRTARGET=loncapa-$(VERSION)
+LOCALAUTHPATH=/home/httpd/lib/perl
# =============================================== Help targets for the Makefile
# If 'make' is run without any arguments, the 'help' target is called since
@@ -87,8 +91,9 @@ help_TARGETS:
@echo " (horizontal testing)"
@echo "TEST_web_layer: mimic a login and various vertical actions on "
@echo " a LON-CAPA system"
- @echo "TEST_hosts_tab: make sure that a loncapa/loncom/hosts.tab"
- @echo " file is specified for installation"
+ @echo "TEST_hosts_and_domain_tab: make sure that a "
+ @echo " loncapa/loncom/hosts.tab and loncapa/loncom/domain.tab"
+ @echo " file is specified for installation"
@echo "TEST_html2ps: test for the presence of html2ps which is needed"
@echo " for making a PDF compilation for pdfdoc"
@echo "*** GENERAL TARGETS SUCH AS 'build' AND 'install' ***"
@@ -103,7 +108,8 @@ help_TARGETS:
@echo "rawinstall: just install files, links and directories without"
@echo " any bells or whistles (e.g. double-checking"
@echo " configurations, fine-tuning webserver, etc.)"
- @echo "hosts_tab: install the hosts.tab to the filesystem"
+ @echo "hosts_and_domain_tab: install the hosts.tab and domain.tab"
+ @echo " to the filesystem"
@echo "webserverconf: fine-tune the web server configuration;"
@echo " make sure the proper 'Include' statements"
@echo " are appended to httpd.conf"
@@ -118,8 +124,10 @@ help_TARGETS:
@echo " procedure (via the UPDATE command)"
@echo "postinstall: double-check things after installation"
@echo "VERSION: tag the filesystem with version information inside"
- @echo " /etc/loncapa-release"
+ @echo " /etc/loncapa-release and"
+ @echo " /home/httpd/html/lon-status/version.txt"
@echo "aboutVERSION: place version information inside about.html"
+ @echo " and loncapa_apache.conf"
@echo "*** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***"
@echo "Makefile.configinstall: generate a Makefile for configuration"
@echo " files; built dynamically from"
@@ -134,8 +142,9 @@ help_TARGETS:
@echo "*** TARGETS FOR OPERATING ON FILESYSTEMS ACROSS THE NETWORK ***"
@echo "lpmladm: coordinates username=lpmladm mediated secure shell"
@echo " processes; needed for the NET_* targets"
- @echo "NET_hosts_tab: install the hosts.tab to a filesystem elsewhere"
- @echo " on the network"
+ @echo "NET_hosts_and_domain_tab: install the hosts.tab and domain.tab"
+ @echo " to a filesystem elsewhere"
+ @echo " on the network"
@echo "NET_webserverconf: fine-tune the web server configuration on a"
@echo " filesystem elsewhere on the network"
@echo "NET_rawinstall: launch the rawinstall target on a filesystem"
@@ -195,6 +204,9 @@ help_TARGETS:
@echo " instructor data (NOT YET IMPLEMENTED)"
@echo "restore: reseeds a LON-CAPA server with tarball backups "
@echo " generated by \"make backup\" (NOT YET IMPLEMENTED)"
+ @echo "*** AUXILIARY TESTS ***"
+ @echo "localauth: tests to see if localauth exists or not and run"
+ @echo " appropriate tests"
@echo "*** A HELPFUL DEPENDENCY ***"
@echo "alwaysrun: blank target that is a dependency for targets"
@echo " that should \"always run\""
@@ -230,6 +242,20 @@ TEST_hosts_tab:
exit 1; \
fi
+TEST_domain_tab:
+ @echo "Testing domain.tab"
+ @if (test -e ../domain.tab); then \
+ echo "there is a defined link or file; assume okay"; \
+ else echo "**** ERROR **** domain.tab not defined!" && \
+ echo -n "You need to do one of the following within your " && \
+ echo "CVS repository (cd loncapa/loncom)" && \
+ echo " 1) ln -s production_domain.tab domain.tab" && \
+ echo " 2) ln -s development_domain.tab domain.tab" && \
+ echo "or 3) ln -s rawhide_domain.tab domain.tab" && \
+ echo "(you most likely want option #1, production_domain.tab)" && \
+ exit 1; \
+ fi
+
TEST_html2ps:
@if (test -e /usr/local/html2ps/bin/html2ps); then \
echo "I can find html2ps; assume okay"; \
@@ -261,7 +287,7 @@ configinstall: Makefile.configinstall
if (test "0" = $(NORESTORECONF)); then \
perl loncaparestoreconfigurations suffix .lpmlnew; fi
-install: buildflag VERSION TEST_hosts_tab Makefile.install Makefile
+install: buildflag VERSION TEST_hosts_tab TEST_domain_tab Makefile.install Makefile
echo -n "" > WARNINGS
make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
directories
@@ -271,11 +297,11 @@ install: buildflag VERSION TEST_hosts_ta
NORESTORECONF="$(NORESTORECONF)" configinstall
make postinstall
make warningnote
- echo "You can run 'make test' to see if your system is ready to go!"
- echo "NOTE THAT YOUR SYSTEM MUST HAVE MYSQL WITH A USER=\"www\" AND"
- echo -n "PASSWORD=\"localhostkey\" FOR www\@localhost"
- echo -n "(YOU MAY NEED TO REINITIALIZE YOUR MYSQL www\@localhost USER)"
- echo -n "Please see http://install.lon-capa.org/ for more information"
+ @echo "You can now run 'make test' to see if your system is ready to go!"
+# @echo "NOTE THAT YOUR SYSTEM MUST HAVE MYSQL WITH A USER=\"www\" AND"
+# @echo -n "PASSWORD=\"localhostkey\" FOR www\@localhost"
+# @echo -n "(YOU MAY NEED TO REINITIALIZE YOUR MYSQL www\@localhost USER)"
+# @echo -n "Please see http://install.lon-capa.org/ for more information"
rawinstall: VERSION Makefile.install Makefile
echo -n "" > WARNINGS
@@ -286,14 +312,14 @@ rawinstall: VERSION Makefile.install Mak
make SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
NORESTORECONF="$(NORESTORECONF)" configinstall
-hosts_tab: TEST_hosts_tab
+hosts_and_domain_tab: TEST_hosts_tab TEST_domain_tab
cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
perl xfml_parse.pl $(SOURCE)/doc/loncapafiles/valid_hosts.xfml | \
perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" \
"$(TARGET)" > Makefile.install
make -f Makefile.install directories
make -f Makefile.install files
- @echo "If hosts.tab has changed, restart httpd and loncontrol:"
+ @echo "If hosts.tab or domain.tab has changed, restart httpd and loncontrol:"
@echo " /etc/rc.d/init.d/httpd restart"
@echo " /etc/rc.d/init.d/loncontrol restart"
@@ -311,7 +337,7 @@ vanillatar:
echo 'make rawinstall' >> $(SOURCE)/UPDATE
echo 'make configinstall' >> $(SOURCE)/UPDATE
echo 'make updatequery' >> $(SOURCE)/UPDATE
- echo 'make hosts_tab' >> $(SOURCE)/UPDATE
+ echo 'make hosts_and_domain_tab' >> $(SOURCE)/UPDATE
echo 'make postinstall' >> $(SOURCE)/UPDATE
echo 'make aboutVERSION' >> $(SOURCE)/UPDATE
echo 'make warningnote' >> $(SOURCE)/UPDATE
@@ -326,7 +352,7 @@ vanillatar:
chmod a+rx $(SOURCE)/TEST
chmod a+rx $(SOURCE)/CHECKRPMS
# -------------------------------- Copy README to the vanilla top-level
- cp -v $(SOURCE)/doc/shortest_path_redhat7.2.txt $(SOURCE)/README
+ #cp -v $(SOURCE)/doc/shortest_path_redhat7.2.txt $(SOURCE)/README
tardist:
make MANIFEST_all
@@ -340,12 +366,16 @@ tardist:
fi
cp -v $(SOURCE)/loncom/license/about.html \
$(SOURCE)/loncom/license/about.html.orig
+ cp -v $(SOURCE)/loncom/loncapa_apache.conf \
+ $(SOURCE)/loncom/loncapa_apache.conf.orig
make aboutVERSION
cd $(SOURCE); \
tar --no-recursion --numeric-owner --files-from MANIFEST \
-h -czf $(DIRTARGET).tar.gz 2>tar_WARNINGS || [ "0" == "0" ]
mv -v $(SOURCE)/loncom/license/about.html.orig \
$(SOURCE)/loncom/license/about.html
+ mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \
+ $(SOURCE)/loncom/loncapa_apache.conf
cat $(SOURCE)/tar_WARNINGS | \
xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS
rm -f $(SOURCE)/tar_WARNINGS
@@ -386,6 +416,9 @@ VERSION:
install -d $(TARGET)/etc
echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release
date +"%Y%m%d" >> $(TARGET)/etc/loncapa-release
+ install -d $(TARGET)/home/httpd/html/lon-status
+ echo -n "$(VERSION)-" > $(TARGET)/home/httpd/html/lon-status/version.txt
+ date +"%Y%m%d" >> $(TARGET)/home/httpd/html/lon-status/version.txt
aboutVERSION:
cat $(SOURCE)/loncom/license/about.html | \
@@ -393,6 +426,11 @@ aboutVERSION:
$(SOURCE)/loncom/license/about.html.new
mv -v $(SOURCE)/loncom/license/about.html.new \
$(SOURCE)/loncom/license/about.html
+ cat $(SOURCE)/loncom/loncapa_apache.conf | \
+ perl -e '$$d=`date +"%Y%m%d"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \
+ $(SOURCE)/loncom/loncapa_apache.conf.new
+ mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \
+ $(SOURCE)/loncom/loncapa_apache.conf
# ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***
@@ -444,9 +482,9 @@ lpmladm:
echo "**** ERROR **** Incorrect METAMTARGET"; \
fi
-NET_hosts_tab:
+NET_hosts_and_domain_tab:
make TIMESTAMP=`date +"%s"` METAMTARGET="TRANSPORT" \
- MTARGET="hosts_tab" HOSTNAME="$(HOSTNAME)" lpmladm
+ MTARGET="hosts_and_domain_tab" HOSTNAME="$(HOSTNAME)" lpmladm
NET_webserverconf:
make TIMESTAMP=`date +"%s"` METAMTARGET="LAUNCH" \
@@ -470,6 +508,8 @@ MANIFEST_all:
echo 'loncom/rawhide_hosts.tab' >> $(SOURCE)/MANIFEST
echo 'loncom/production_hosts.tab' >> $(SOURCE)/MANIFEST
echo 'loncom/development_hosts.tab' >> $(SOURCE)/MANIFEST
+ echo 'loncom/production_domain.tab' >> $(SOURCE)/MANIFEST
+ echo 'loncom/development_domain.tab' >> $(SOURCE)/MANIFEST
# ------------------ Files needed for dynamically generated directories
echo 'doc/man' >> $(SOURCE)/MANIFEST
echo 'doc/lib' >> $(SOURCE)/MANIFEST
@@ -571,8 +611,8 @@ RPM: BinaryRoot base_rpm_file_list
cat $(SOURCE)/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 $(VERSION) 1 '' '' \
- BinaryRoot base_customizerpm.xml
+ cat base_rpm_file_list.txt | perl make_rpm.pl base $(VERSION) \
+ $(RELEASE) '' '' BinaryRoot base_customizerpm.xml
DPKG:
make TARGET='lon-capa-$(VERSION)' NORESTORECONF='1' install
@@ -785,5 +825,20 @@ backup:
restore:
@echo "Not yet implemented"
+# ===================================================== *** AUXILIARY TESTS ***
+localauth:
+ @if (test -e $(LOCALAUTHPATH)/localauth.pm) && \
+ !(diff $(LOCALAUTHPATH)/localauth-std.pm \
+ $(LOCALAUTHPATH)/localauth.pm > /dev/null); then \
+ echo "**** WARNING **** $(LOCALAUTHPATH)/localauth.pm is different than the $(LOCALAUTHPATH)/localauth-std.pm; if you have not customized localauth.pm, then please manually overwrite localauth.pm (rm $(LOCALAUTHPATH)/localauth.pm; ln -s $(LOCALAUTHPATH)/localauth-std.pm $(LOCALAUTHPATH)/localauth.pm); if you have customized localauth.pm, then please double-check to see that your customized localauth.pm is compatible with any localauth-std.pm changes for this version of LON-CAPA"| tee -a WARNINGS; \
+ elif (test -e $(LOCALAUTHPATH)/localauth.pm) && \
+ (diff $(LOCALAUTHPATH)/localauth-std.pm \
+ $(LOCALAUTHPATH)/localauth.pm > /dev/null); then \
+ echo "**** NOTE **** LOCAL AUTH IS IDENTICAL WITH STANDARD TEMPLATE"| tee -a WARNINGS; \
+ elif !(test -e $(LOCALAUTHPATH)/localauth.pm) && \
+ (test -e $(LOCALAUTHPATH)/localauth-std.pm); then \
+ ln -s $(LOCALAUTHPATH)/localauth-std.pm $(LOCALAUTHPATH)/localauth.pm; \
+ fi
+
# ================================================ *** A HELPFUL DEPENDENCY ***
alwaysrun:
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.