(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.47

version 1.46.2.3, 2006/10/20 14:40:39 version 1.47, 2006/10/20 18:25:03
Line 275 
Line 275 
     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 345 
Line 346 
     CURRENT_USER=`whoami`     CURRENT_USER=`whoami`
 endif endif
  
 ifdef PEGASUS_ENABLE_REMOTE_CMPI  
     ifeq ($(OS),win32)  
         $(error Error: Remote CMPI is not currently supported on Windows.)  
     else  
         CMPIR_START_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon  
         CMPIR_STOP_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon --stop  
     endif  
 else  
     CMPIR_START_DAEMON =  
     CMPIR_STOP_DAEMON =  
 endif  
   
 ifndef TMP_DIR ifndef TMP_DIR
     ifdef PEGASUS_TMP     ifdef PEGASUS_TMP
         TMP_DIR = $(subst \,/,$(PEGASUS_TMP))         TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
Line 378 
Line 367 
 ## ##
  
 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 468 
Line 455 
 ##       cimstart command. ##       cimstart command.
 ## ##
 runTestSuite: CMDSFORCE runTestSuite: CMDSFORCE
         make -f TestMakefile -i cimstop          -$(CIMSERVER_STOP_SERVICE)
         make -f TestMakefile cimstart          $(CIMSERVER_START_SERVICE)
         $(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)
  
 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.47
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2