(file) Return to commands.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/commands.mak between version 1.17 and 1.28

version 1.17, 2005/03/06 00:25:38 version 1.28, 2005/05/11 10:41:40
Line 11 
Line 11 
     include $(ROOT)/mak/config.mak     include $(ROOT)/mak/config.mak
 endif endif
  
   ifndef OPENSSL_BIN
       OPENSSL_BIN = $(OPENSSL_HOME)/bin
   endif
   
       OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl
   
 ifeq ($(OS),win32) ifeq ($(OS),win32)
     STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)     STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)
     DIFF = mu compare     DIFF = mu compare
       SORT = mu sort
     REDIRECTERROR = 2>&1     REDIRECTERROR = 2>&1
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS) -start     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS) -start
     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -stop     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -stop
     SLEEP = mu sleep     SLEEP = mu sleep
     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
     MUEXE = mu.exe     MUEXE = mu.exe
       RM = mu rm
     MKDIRHIER = $(MUEXE) mkdirhier     MKDIRHIER = $(MUEXE) mkdirhier
     RMDIRHIER = $(MUEXE) rmdirhier     RMDIRHIER = $(MUEXE) rmdirhier
     ECHO = mu echo     ECHO = mu echo
Line 28 
Line 36 
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
     CHGRP =     CHGRP =
       CURRENT_USER=Administrator
 endif endif
  
 ifeq ($(OS),HPUX) ifeq ($(OS),HPUX)
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
       SORT = sort
     REDIRECTERROR = 2>&1     REDIRECTERROR = 2>&1
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
Line 50 
Line 60 
     DOCXX = doc++     DOCXX = doc++
  
     GENERATE_RANDSEED = randseed     GENERATE_RANDSEED = randseed
     OPENSSL_COMMAND = openssl      GET_HOSTNAME = `nslookup \`hostname\` | grep "Name:" | sed 's/Name:[ ]*//'`
     GET_HOSTNAME = `hostname`  
  
     ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)     ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)
         LIB_LINK_SUFFIX = .sl         LIB_LINK_SUFFIX = .sl
Line 59 
Line 68 
         LIB_LINK_SUFFIX = .so         LIB_LINK_SUFFIX = .so
     endif     endif
  
     Pdr_xr_xr_x = 555      Prwxr_xr_x = 755
     P_rwxr_xr_x = 755      Prwxrwxrwx = 777
     P_r_xr__r__ = 744      Pr_xr__r__ = 744
     P_r__r__r__ = 444      Pr__r__r__ = 444
     P_r________ = 400      Pr________ = 400
     P_r_xr_xr_x = 555      Pr_xr_xr_x = 555
     P_rw_r__r__ = 644      Prw_r__r__ = 644
     CHMODDIRHIER = chmod -R     CHMODDIRHIER = chmod -R
  
     INSTALL_USR = bin     INSTALL_USR = bin
Line 79 
Line 88 
     CHGRPDIRHIER = chgrp -R     CHGRPDIRHIER = chgrp -R
  
     SYMBOLIC_LINK_CMD = ln -f -s     SYMBOLIC_LINK_CMD = ln -f -s
   
       CURRENT_USER=`whoami`
 endif endif
  
 ifeq ($(OS),solaris) ifeq ($(OS),solaris)
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
       SORT = sort
     REDIRECTERROR = 2>&1     REDIRECTERROR = 2>&1
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     CIMSERVER_STOP_SERVICE = /usr/bin/ps -ef | /usr/bin/grep cimserver | /usr/bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/usr/bin/ksh"}'     CIMSERVER_STOP_SERVICE = /usr/bin/ps -ef | /usr/bin/grep cimserver | /usr/bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/usr/bin/ksh"}'
     SLEEP = sleep     SLEEP = sleep
     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
     MUEXE = mu     MUEXE = mu
       RM = rm -f
     MKDIRHIER = mkdir -p     MKDIRHIER = mkdir -p
     RMDIRHIER = rm -rf     RMDIRHIER = rm -rf
     ECHO = echo     ECHO = echo
Line 103 
Line 116 
 ifeq ($(OS),linux) ifeq ($(OS),linux)
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
       SORT = sort
     REDIRECTERROR = 2>&1     REDIRECTERROR = 2>&1
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
Line 119 
Line 133 
     CAT = cat     CAT = cat
     DOCXX = doc++     DOCXX = doc++
  
     OPENSSL_COMMAND = openssl      GET_HOSTNAME = `host \`hostname\`|cut -d" " -f1`
     GET_HOSTNAME = `hostname`  
  
     LIB_LINK_SUFFIX = .so     LIB_LINK_SUFFIX = .so
  
     Pdr_xr_xr_x = 555      Prwxrwxrwx = 777
     P_rwxr_xr_x = 755      Prwxr_xr_x = 755
     P_r_xr__r__ = 744      Pr_xr__r__ = 744
     P_r__r__r__ = 444      Pr__r__r__ = 444
     P_r________ = 400      Pr________ = 400
     P_r_xr_xr_x = 555      Pr_xr_xr_x = 555
     P_rw_r__r__ = 644      Pr_x______ = 500
       Prw_r__r__ = 644
     CHMODDIRHIER = chmod -R     CHMODDIRHIER = chmod -R
  
     INSTALL_USR = root     INSTALL_USR = root
Line 144 
Line 158 
     CHGRPDIRHIER = chgrp -R     CHGRPDIRHIER = chgrp -R
  
     SYMBOLIC_LINK_CMD = ln -f -s     SYMBOLIC_LINK_CMD = ln -f -s
   
       CURRENT_USER=`whoami`
 endif endif
  
 ifeq ($(OS),zos) ifeq ($(OS),zos)
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
       SORT = sort
     REDIRECTERROR =     REDIRECTERROR =
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
     SLEEP = sleep     SLEEP = sleep
     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
     MUEXE = mu     MUEXE = mu
       RM = rm -f
     MKDIRHIER = mkdir -p     MKDIRHIER = mkdir -p
     RMDIRHIER = rm -rf     RMDIRHIER = rm -rf
     ECHO =     ECHO =
Line 166 
Line 184 
 endif endif
  
 ifeq ($(OS),VMS) ifeq ($(OS),VMS)
     STRIPCRS =      STRIPCRS =$(MUEXE) echo "STRIPCRS not defined in commands.mak"
     DIFF = mu compare     DIFF = mu compare
     REDIRECTERROR =      SORT = mu sort
       REDIRECTERROR = $(MUEXE) echo "REDIRECTERROR not defined in commands.mak"
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
     SLEEP = wait     SLEEP = wait
Line 176 
Line 195 
     MUEXE = mu     MUEXE = mu
     MKDIRHIER = $(MUEXE) mkdirhier     MKDIRHIER = $(MUEXE) mkdirhier
     RMDIRHIER = $(MUEXE) rmdirhier     RMDIRHIER = $(MUEXE) rmdirhier
     ECHO =      ECHO = $(MUEXE) echo
     ECHO-E =      ECHO-E = $(MUEXE) echo "ECHO-E not defined in commands.mak"
     CHMOD =      CHMOD = $(MUEXE) echo "CHMOD not defined in commands.mak"
     CHOWN =      CHOWN = $(MUEXE) echo "CHOWN not defined in commands.mak"
     CHGRP =      CHGRP = $(MUEXE) echo  "CHGRP not defined in commands.mak"
 endif endif
  
 ifeq ($(OS),aix) ifeq ($(OS),aix)
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
       SORT = sort
     REDIRECTERROR =     REDIRECTERROR =
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
     SLEEP = sleep     SLEEP = sleep
     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
     MUEXE = mu     MUEXE = mu
       RM = rm -f
     MKDIRHIER = mkdir -p     MKDIRHIER = mkdir -p
     RMDIRHIER = rm -rf     RMDIRHIER = rm -rf
     ECHO = echo     ECHO = echo
Line 202 
Line 223 
     CHGRP =     CHGRP =
 endif endif
  
   ifeq ($(OS),darwin)
       STRIPCRS =
       DIFF = diff
       SORT = sort
       REDIRECTERROR = 2>&1
       CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
       CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
       SLEEP = sleep
       REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
       MUEXE = mu
       RM = rm -f
       MKDIRHIER = mkdir -p
       RMDIRHIER = rm -rf
       ECHO = echo
       ECHO-E = mu echo-e
       COPY = cp
       TOUCH = touch
       CAT = cat
   
       CHMOD = chmod
       CHOWN = chown
       CHGRP = chgrp
   
       CHMODDIRHIER = chmod -R
       CHOWNDIRHIER = chown -R
       CHGRPDIRHIER = chgrp -R
   
       SYMBOLIC_LINK_CMD = ln -f -s
   
       CURRENT_USER=`whoami`
   endif
   
 ifndef TMP_DIR ifndef TMP_DIR
     ifdef PEGASUS_TMP     ifdef PEGASUS_TMP
         TMP_DIR = $(subst \,/,$(PEGASUS_TMP))         TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
Line 297 
Line 350 
  
 runTestSuite: CMDSFORCE runTestSuite: CMDSFORCE
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))          $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i));)
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
   
   ifndef PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN
     PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN=$(GET_HOSTNAME)
   endif
   
   createSSLCnfFile: CMDSFORCE
           @$(RM) $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "[ req ]" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "distinguished_name     = req_distinguished_name" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "prompt                 = no"  >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "[ req_distinguished_name ]" >>  $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "C                      = $(PEGASUS_SSLCNF_COUNTRY_CODE)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "ST                     = $(PEGASUS_SSLCNF_STATE)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "L                      = $(PEGASUS_SSLCNF_LOCALITY)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "O                      = $(PEGASUS_SSLCNF_ORGANIZATION)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "OU                     = $(PEGASUS_SSLCNF_ORGANIZATION_UNIT)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "CN                     = $(PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN)" >> $(PEGASUS_SSLCERT_CNFFILE)
   
   createSSLCertificate: CMDSFORCE
   ifdef PEGASUS_SSL_RANDOMFILE
           @$(OPENSSL_COMMAND) req -x509 -days $(PEGASUS_SSLCERT_DAYS) -newkey rsa:2048 -rand $(PEGASUS_SSLCERT_RANDOMFILE) -nodes -config $(PEGASUS_SSLCERT_CNFFILE) -keyout $(PEGASUS_SSLCERT_KEYFILE) -out
   $(PEGASUS_SSLCERT_CERTFILE)
   else
           @$(OPENSSL_COMMAND) req -x509 -days $(PEGASUS_SSLCERT_DAYS) -newkey rsa:2048 -nodes -config $(PEGASUS_SSLCERT_CNFFILE) -keyout $(PEGASUS_SSLCERT_KEYFILE) -out $(PEGASUS_SSLCERT_CERTFILE)
   endif
   
   displayCertificate: CMDSFORCE
           @$(OPENSSL_COMMAND) x509 -in $(PEGASUS_SSLCERT_CERTFILE) -text

Legend:
Removed from v.1.17  
changed lines
  Added in v.1.28
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2