Changeset 18698

Show
Ignore:
Timestamp:
16.03.2009 19:57:41 (10 years ago)
Author:
ak19
Message:

Moved the make targets relating to the Apache webserver to new makefile GSI-Makefile

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/Makefile.in

    r18677 r18698  
    6868    done 
    6969 
    70  
    71  
    72 test-gsdlhome: 
    73     @ if test -z "${GSDLHOME}" ; then \ 
    74       echo "" ; \ 
    75       echo "Environment variable GSDLHOME not set." ; \ 
    76       echo "  This needs to be set to run this Makefile target." ; \ 
    77           echo "  Have you run 'source setup.bash'?" ; \ 
    78       echo "" ; \ 
    79       exit 1; \ 
    80     else \ 
    81       echo "Using: " ; \ 
    82       echo "  GSDLHOME = ${GSDLHOME}" ; \ 
    83       echo "  GSDLOS   = ${GSDLOS}" ; \ 
    84     fi 
    85  
    86 configure-cgi: test-gsdlhome 
    87     @ echo "Configuring cgi-bin/gsdlsite.cfg" ; 
    88     @ sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg ; 
    89  
    90  
    91  
    92 configure-admin: test-gsdlhome 
    93     @echo "" ; 
    94     @echo "Configuring admin user password:" ;  
    95     encrypted_password=`getpw` ;  
    96     if [ $$? = "0" ] ; then \ 
    97       echo -e "[admin]\n<enabled>true\n<groups>administrator,colbuilder,all-collections-editor\n<password>$$encrypted_password\n<username>admin" \ 
    98              | txt2db -append "${GSDLHOME}/etc/users.db" ; \ 
    99     fi 
    100     @echo "" 
    101  
    102 configure-port: test-gsdlhome 
    103     @ echo "Enter port number to use:" 
    104     @ ( read port ; \ 
    105         if test ! -z $$port ; then \ 
    106           echo "Stopping web server (if running)" ; \ 
    107           make web-stop-tested ; \ 
    108           echo "Setting config file to use port $$port"; \ 
    109           cat "${GSDLHOME}/apache-httpd/conf/httpd.conf.in" \ 
    110         | sed "s@\*\*PORT\*\*@$$port@g" \ 
    111         | sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" \ 
    112         > "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; \ 
    113           echo "Type 'make web-start' to start the web server running on port $$port" ; \ 
    114         fi ; \ 
    115         echo "Done" ; ) 
    116        
    117 MONITOR_SUCCESS="MAKE SUCCESSFUL" 
    118 MONITOR_FAILED="MAKE FAILED" 
    119 MONITOR_FINISHED="MAKE DONE" 
    120  
    121 configure-apache: test-gsdlhome 
    122     @ echo "Configuring the apache webserver..." ; 
    123     @ ( port=`egrep "^apache.port" lib/java/build.properties | awk -F= '{print $$2}'` ; \ 
    124         echo $$port | make configure-port ; ) 
    125     @ echo $(MONITOR_SUCCESS) 
    126     @ echo $(MONITOR_FINISHED) 
    127  
    128  
    129 configure-web: configure-cgi configure-apache 
    130  
    131 web-status: test-gsdlhome 
    132     ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl status 
    133  
    134 web-start: test-gsdlhome 
    135     ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl start 
    136     @ echo $(MONITOR_SUCCESS) 
    137     @ echo $(MONITOR_FINISHED) 
    138  
    139 web-restart: test-gsdlhome 
    140     ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl restart 
    141     @ echo $(MONITOR_SUCCESS) 
    142     @ echo $(MONITOR_FINISHED) 
    143  
    144 web-graceful: test-gsdlhome 
    145     ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl graceful 
    146     @ echo $(MONITOR_SUCCESS) 
    147     @ echo $(MONITOR_FINISHED) 
    148  
    149 web-stop-tested:  
    150     @# This version runs without testing for GSDLHOME 
    151     @# Useful to be run as a target when we know test-gsdlhome has already 
    152     @# been done.  This avoids a unnecessary repetition of printing 
    153     @# out the values of GSDLHOME and GSDLOS 
    154     @ if test -e "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; then \ 
    155         ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop ; \ 
    156     fi 
    157     @ echo $(MONITOR_SUCCESS) 
    158     @ echo $(MONITOR_FINISHED) 
    159  
    160 web-stop: test-gsdlhome web-stop-tested 
    161  
     70# include the Greenstone Server Interface Makefile here 
     71include GSI-Makefile 
    16272 
    16373distclean: clean