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

Diff for /pegasus/mak/commands.mak between version 1.46.2.3 and 1.58

version 1.46.2.3, 2006/10/20 14:40:39 version 1.58, 2007/08/01 02:13:40
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 104 
Line 104 
     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 156 
     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 191 
Line 191 
     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 240 
Line 240 
     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 271 
 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 295 
     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 308 
     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
 endif endif
  
 ifeq ($(OS),darwin) ifeq ($(OS),darwin)
Line 346 
Line 370 
 endif endif
  
 ifdef PEGASUS_ENABLE_REMOTE_CMPI ifdef PEGASUS_ENABLE_REMOTE_CMPI
     ifeq ($(OS),win32)      ifeq ($(OS_TYPE),windows)
         $(error Error: Remote CMPI is not currently supported on Windows.)          CMPIR_START_DAEMON = start "/K $(CIMSERVER_PATH)" CMPIRDaemon
           CMPIR_STOP_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon --stop
     else     else
         CMPIR_START_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon         CMPIR_START_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon
         CMPIR_STOP_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon --stop         CMPIR_STOP_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon --stop
     endif     endif
 else else
     CMPIR_START_DAEMON =      CMPIR_START_DAEMON = $(ECHO) "(CMPIR_START_DAEMON command ignored)"
     CMPIR_STOP_DAEMON =      CMPIR_STOP_DAEMON =  $(ECHO) "(CMPIR_STOP_DAEMON command ignored)"
   
 endif endif
  
 ifndef TMP_DIR ifndef TMP_DIR
Line 468 
Line 494 
 ##       cimstart command. ##       cimstart command.
 ## ##
 runTestSuite: CMDSFORCE runTestSuite: CMDSFORCE
         make -f TestMakefile -i cimstop          -$(CIMSERVER_STOP_SERVICE)
         make -f TestMakefile cimstart          -$(CMPIR_STOP_DAEMON)
           $(CIMSERVER_START_SERVICE)
           $(CMPIR_START_DAEMON)
         $(WINDOWS_ONLY_SLEEP)         $(WINDOWS_ONLY_SLEEP)
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))
         make -f TestMakefile cimstop          $(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.46.2.3  
changed lines
  Added in v.1.58
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2