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

Diff for /pegasus/mak/commands.mak between version 1.45.2.2 and 1.61.4.1

version 1.45.2.2, 2007/02/08 02:45:07 version 1.61.4.1, 2008/07/01 15:17:27
Line 44 
Line 44 
     include $(ROOT)/mak/config.mak     include $(ROOT)/mak/config.mak
 endif endif
  
 ifeq ($(OS),win32)  ifeq ($(OS_TYPE),windows)
     STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)     STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)
     DIFF = mu compare     DIFF = mu compare
     SORT = mu sort     SORT = mu sort
Line 90 
Line 90 
     TOUCH = touch     TOUCH = touch
     CAT = cat     CAT = cat
     DOCXX = doc++     DOCXX = doc++
       DOXYGEN = doxygen
  
     GENERATE_RANDSEED = randseed     GENERATE_RANDSEED = randseed
     GET_HOSTNAME = `nslookup \`hostname\` | grep "Name:" | sed 's/Name:[ ]*//'`     GET_HOSTNAME = `nslookup \`hostname\` | grep "Name:" | sed 's/Name:[ ]*//'`
Line 104 
Line 105 
     Prwx______ = 700     Prwx______ = 700
     Prwxrwxrwx = 777     Prwxrwxrwx = 777
     Prwxrwxrwt = 1777     Prwxrwxrwt = 1777
     Pr_xr__r__ = 744      Prwxr__r__ = 744
     Pr__r__r__ = 444     Pr__r__r__ = 444
     Pr________ = 400     Pr________ = 400
     Pr_xr_xr_x = 555     Pr_xr_xr_x = 555
Line 156 
Line 157 
     ECHO = echo     ECHO = echo
     ECHO-E = mu echo-e     ECHO-E = mu echo-e
     COPY = cp     COPY = cp
     CHMOD =      CHMOD = chmod
     CHOWN =      CHOWN = chown
     CHGRP =      CHGRP = chgrp
     CURRENT_USER=`whoami`     CURRENT_USER=`whoami`
 endif endif
  
Line 182 
Line 183 
     TOUCH = touch     TOUCH = touch
     CAT = cat     CAT = cat
     DOCXX = doc++     DOCXX = doc++
       DOXYGEN = doxygen
  
     GET_HOSTNAME = `host \`hostname\`|cut -d" " -f1`     GET_HOSTNAME = `host \`hostname\`|cut -d" " -f1`
  
Line 191 
Line 193 
     Prwxrwxrwt = 1777     Prwxrwxrwt = 1777
     Prwxr_xr_x = 755     Prwxr_xr_x = 755
     Prwxr_x___ = 750     Prwxr_x___ = 750
     Pr_xr__r__ = 744      Prwxr__r__ = 744
     Prwx______ = 700     Prwx______ = 700
     Pr__r__r__ = 444     Pr__r__r__ = 444
     Pr________ = 400     Pr________ = 400
Line 205 
Line 207 
     INSTALL_USR = root     INSTALL_USR = root
     INSTALL_GRP = pegasus     INSTALL_GRP = pegasus
     CIMSERVER_USR = root     CIMSERVER_USR = root
     CIMSERVER_GRP = pegasus      CIMSERVER_GRP = root
     CHMOD = chmod     CHMOD = chmod
     CHOWN = chown     CHOWN = chown
     CHGRP = chgrp     CHGRP = chgrp
Line 215 
Line 217 
     SYMBOLIC_LINK_CMD = ln -f -s     SYMBOLIC_LINK_CMD = ln -f -s
  
     CURRENT_USER=`whoami`     CURRENT_USER=`whoami`
   
   #
   # Since the Privilege Separation splits the cimserver process into two
   # processes (cimservermain process - a non privileged process; cimserver
   # process - a privileged process), the pegasus files need to be split into
   # two sets. The files which can be updated by cimservermain process are owned
   # by user "CIMSERVERMAIN_USR" and group "CIMSERVERMAIN_GRP". Other files
   # owned by user "CIMSERVER_USR" and group "CIMSERVER_GRP" can be updated
   # by cimserver process.
   # If the Privilege Separation is not enabled, a single privileged process
   # (cimserver process) is created. All the pegasus files can be updated by
   # the cimserver process. The CIMSERVERMAIN_USR variable will be set
   # equal to CIMSERVER_USR, and the CIMSERVERMAIN_GRP variable will be set
   # equal to CIMSERVER_GRP.
   #
   # To further restrict the privileges assigned to the cimservermain
   # process, we recommend creating a new group for the cimservermain
   # process.  By default, the name of this group will be the same as
   # the cimservermain user.  Note: the CIMSERVERMAIN_GRP should be
   # the primary group for the CIMSERVERMAIN_USER.
   
   ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
       CIMSERVERMAIN_USR = $(PEGASUS_CIMSERVERMAIN_USER)
       CIMSERVERMAIN_GRP = $(PEGASUS_CIMSERVERMAIN_USER)
   else
       CIMSERVERMAIN_USR = $(CIMSERVER_USR)
       CIMSERVERMAIN_GRP = $(CIMSERVER_GRP)
   endif
   
 endif endif
  
 ifeq ($(OS),zos) ifeq ($(OS),zos)
Line 240 
Line 271 
     Prwxrwxrwx = 777     Prwxrwxrwx = 777
     Prwxrwxrwt = 1777     Prwxrwxrwt = 1777
     Prwxr_xr_x = 755     Prwxr_xr_x = 755
     Pr_xr__r__ = 744      Prwxr__r__ = 744
     Pr__r__r__ = 444     Pr__r__r__ = 444
     Pr________ = 400     Pr________ = 400
     Pr_xr_xr_x = 555     Pr_xr_xr_x = 555
Line 271 
Line 302 
 endif endif
  
 ifeq ($(OS),VMS) ifeq ($(OS),VMS)
     STRIPCRS =$(MUEXE) echo "STRIPCRS not defined in commands.mak"      STRIPCRS =
     DIFF = mu compare     DIFF = mu compare
     SORT = mu sort     SORT = mu sort
     REDIRECTERROR = $(MUEXE) echo "REDIRECTERROR not defined in commands.mak"     REDIRECTERROR = $(MUEXE) echo "REDIRECTERROR not defined in commands.mak"
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)      CIMSERVER_START_SERVICE_DELAY = 20
       CIMSERVER_START_SERVICE = pipe ($(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS) &) && mu sleep $(CIMSERVER_START_SERVICE_DELAY)
     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
     SLEEP = $(MUEXE) sleep     SLEEP = $(MUEXE) sleep
     TIME_CMD =     TIME_CMD =
Line 294 
Line 326 
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
     SORT = sort     SORT = sort
     REDIRECTERROR =      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
     SLEEP = sleep     SLEEP = sleep
Line 307 
Line 339 
     ECHO = echo     ECHO = echo
     ECHO-E =     ECHO-E =
     COPY = cp     COPY = cp
     CHMOD =      CHMOD = chmod
     CHOWN =      CHOWN = chown
     CHGRP =      CHGRP = chgrp
       CAT = cat
   endif
   
   ifeq ($(OS),PASE)
       STRIPCRS =
       DIFF = diff
       SORT = sort
       REDIRECTERROR = 2>&1
       CIMSERVER_START_SERVICE = system STRTCPSVR *CIMOM
       CIMSERVER_STOP_SERVICE = system ENDTCPSVR *CIMOM
       SLEEP = sleep
       TIME_CMD = time
       MUEXE = mu
       RM = rm -f
       MKDIRHIER = mkdir -p
       RMDIRHIER = rm -rf
       ECHO = echo
       ECHO-E =
       COPY = cp
       CHMOD = chmod
       CHOWN = chown
       CHGRP = chgrp
     CAT = cat     CAT = cat
 endif endif
  
Line 346 
Line 400 
     CURRENT_USER=`whoami`     CURRENT_USER=`whoami`
 endif endif
  
   ifdef PEGASUS_ENABLE_REMOTE_CMPI
       ifeq ($(OS_TYPE),windows)
           CMPIR_START_DAEMON = start "/K $(CIMSERVER_PATH)" CMPIRDaemon
           CMPIR_STOP_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon --stop
       else
           CMPIR_START_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon
           CMPIR_STOP_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon --stop
       endif
   else
       CMPIR_START_DAEMON = $(ECHO) "(CMPIR_START_DAEMON command ignored)"
       CMPIR_STOP_DAEMON =  $(ECHO) "(CMPIR_STOP_DAEMON command ignored)"
   
   endif
   
 ifndef TMP_DIR ifndef TMP_DIR
     ifdef PEGASUS_TMP     ifdef PEGASUS_TMP
         TMP_DIR = $(subst \,/,$(PEGASUS_TMP))         TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
Line 367 
Line 435 
 ## ##
  
 cimstop: CMDSFORCE cimstop: CMDSFORCE
           -$(CMPIR_STOP_DAEMON)
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
  
 cimstart: CMDSFORCE cimstart: CMDSFORCE
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
           $(CMPIR_START_DAEMON)
  
 sleep: CMDSFORCE sleep: CMDSFORCE
         $(SLEEP) $(TIME)         $(SLEEP) $(TIME)
Line 456 
Line 526 
 ## ##
 runTestSuite: CMDSFORCE runTestSuite: CMDSFORCE
         -$(CIMSERVER_STOP_SERVICE)         -$(CIMSERVER_STOP_SERVICE)
           -$(CMPIR_STOP_DAEMON)
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
           $(CMPIR_START_DAEMON)
         $(WINDOWS_ONLY_SLEEP)         $(WINDOWS_ONLY_SLEEP)
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
           $(CMPIR_STOP_DAEMON)
  
 ifndef PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN ifndef PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN
   PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN=$(GET_HOSTNAME)   PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN=$(GET_HOSTNAME)

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