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

Diff for /pegasus/mak/commands.mak between version 1.45.18.1 and 1.53.2.3

version 1.45.18.1, 2006/10/16 15:10:55 version 1.53.2.3, 2007/04/10 13:26:36
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 62 
Line 62 
     ECHO = mu echo     ECHO = mu echo
     ECHO-E = mu echo-e     ECHO-E = mu echo-e
     COPY = mu copy     COPY = mu copy
       STARTCMD = start
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
     CHGRP =     CHGRP =
Line 275 
Line 276 
     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 = wait      SLEEP = $(MUEXE) sleep
     TIME_CMD =     TIME_CMD =
     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
     MUEXE = mu     MUEXE = mu
Line 294 
Line 296 
     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 310 
Line 312 
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
     CHGRP =     CHGRP =
       CAT = cat
 endif endif
  
 ifeq ($(OS),darwin) ifeq ($(OS),darwin)
Line 346 
Line 349 
 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
       CMPIR_START_DAEMON = $(ECHO) "(CMPIR_START_DAEMON command ignored)"
       CMPIR_STOP_DAEMON =  $(ECHO) "(CMPIR_STOP_DAEMON command ignored)"
   
 endif endif
  
 ifndef TMP_DIR ifndef TMP_DIR
Line 375 
Line 383 
 ## ##
  
 cimstop: CMDSFORCE cimstop: CMDSFORCE
           -$(CMPIR_STOP_DAEMON)
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
 ifdef PEGASUS_ENABLE_REMOTE_CMPI  
         $(CMPIR_STOP_DAEMON)  
 endif  
  
 cimstart: CMDSFORCE cimstart: CMDSFORCE
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
 ifdef PEGASUS_ENABLE_REMOTE_CMPI  
         $(CMPIR_START_DAEMON)         $(CMPIR_START_DAEMON)
 endif  
  
 sleep: CMDSFORCE sleep: CMDSFORCE
         $(SLEEP) $(TIME)         $(SLEEP) $(TIME)
Line 470 
Line 474 
 ## ##
 runTestSuite: CMDSFORCE runTestSuite: CMDSFORCE
         -$(CIMSERVER_STOP_SERVICE)         -$(CIMSERVER_STOP_SERVICE)
           -$(CMPIR_STOP_DAEMON)
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
 ifdef PEGASUS_ENABLE_REMOTE_CMPI  
         $(CMPIR_START_DAEMON)         $(CMPIR_START_DAEMON)
 endif  
         $(WINDOWS_ONLY_SLEEP)         $(WINDOWS_ONLY_SLEEP)
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
 ifdef PEGASUS_ENABLE_REMOTE_CMPI  
         $(CMPIR_STOP_DAEMON)         $(CMPIR_STOP_DAEMON)
 endif  
  
 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.18.1  
changed lines
  Added in v.1.53.2.3
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2