Changeset 18560

Timestamp:

2009-02-20T13:32:31+13:00 (15 years ago)

Author:

davidb

Message:

Additinal targets to support Server2.java

File:

• gsdl/trunk/Makefile.in (modified) (1 diff)

gsdl/trunk/Makefile.in

@@ -68 +68 @@
     done
 
-configure-cgi:
-    @if test ! -z "$(GSDLHOME)" ; then \
-      echo "Configuring cgi-bin/gsdlsite.cfg" ; \
-      sed "s@\*\*GSDLHOME\*\*@$(GSDLHOME)@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg ; \
+
+
+test-gsdlhome:
+    @ if test -z "$(GSDLHOME)" ; then \
+      echo "" ; \
+      echo "Environment variable GSDLHOME not set." ; \
+      echo "  This needs to be set to run this Makefile target." ; \
+          echo "  Have you run 'source setup.bash'?" ; \
+      echo "" ; \
+      exit 1; \
     else \
-      echo "Environment variable GSDLHOME not set.  Have you run 'source setup.bash'?" ; \
+      echo "Using: " ; \
+      echo "  GSDLHOME = ${GSDLHOME}" ; \
+      echo "  GSDLOS   = ${GSDLOS}" ; \
     fi
 
+configure-cgi: test-gsdlhome
+    @ echo "Configuring cgi-bin/gsdlsite.cfg" ;
+    sed "s@\*\*GSDLHOME\*\*@$(GSDLHOME)@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg ;
 
-configure-admin:
-    @ if test ! -z "$(GSDLHOME)" ; then \
-      echo "" ; \
-      echo "Configuring admin user password:" ; \
-      encrypted_password=`getpw` ; \
-      if [ $$? = "0" ] ; then \
-        echo -e "[admin]\n<enabled>true\n<groups>administrator,colbuilder,all-collections-editor\n<password>$$encrypted_password\n<username>admin" \
-               | txt2db -append "${GSDLHOME}/etc/users.db" ; \
-      fi \
-    else \
-      echo "Environment variable GSDLHOME not set.  Have you run 'source setup.bash'?" ; \
+
+
+configure-admin: test-gsdlhome
+    @echo "" ;
+    @echo "Configuring admin user password:" ; 
+    encrypted_password=`getpw` ; 
+    if [ $$? = "0" ] ; then \
+      echo -e "[admin]\n<enabled>true\n<groups>administrator,colbuilder,all-collections-editor\n<password>$$encrypted_password\n<username>admin" \
+             | txt2db -append "${GSDLHOME}/etc/users.db" ; \
     fi
     @echo ""
 
+configure-port: test-gsdlhome
+    @ echo "Enter port number to use:"
+    @ ( read port ; \
+        if test ! -z $$port ; then \
+          echo "Stopping web server (if running)" ; \
+          make web-stop-tested ; \
+          echo "Setting config file to use port $$port"; \
+          cat "${GSDLHOME}/apache-httpd/conf/httpd.conf" \
+        | sed "s/^Listen [0-9]\+/Listen $$port/" \
+        > "${GSDLHOME}/apache-httpd/conf/httpd.conf.new" ; \
+          echo "Type 'make web-start' to start the web server running on port $$port" ; \
+        fi ; \
+        echo "Done" ; )
+      
+MONITOR_SUCCESS="MAKE SUCCESSFUL"
+MONITOR_FAILED="MAKE FAILED"
+MONITOR_FINISHED="MAKE DONE"
 
+web-status: test-gsdlhome
+    ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl status
+
+web-start: test-gsdlhome
+    ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl start
+    @ echo $(MONITOR_SUCCESS)
+    @ echo $(MONITOR_FINISHED)
+
+web-restart: test-gsdlhome
+    ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl restart
+    @ echo $(MONITOR_SUCCESS)
+    @ echo $(MONITOR_FINISHED)
+
+web-graceful: test-gsdlhome
+    ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl graceful
+    @ echo $(MONITOR_SUCCESS)
+    @ echo $(MONITOR_FINISHED)
+
+web-stop-tested: 
+    @# This version runs without testing for GSDLHOME
+    @# Useful to be run as a target when we know test-gsdlhome has already
+    @# been done.  This avoids a unnecessary repetition of printing
+    @# out the values of GSDLHOME and GSDLOS
+    ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop
+    @ echo $(MONITOR_SUCCESS)
+    @ echo $(MONITOR_FINISHED)
+
+web-stop: test-gsdlhome web-stop-tested