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

Diff for /pegasus/mak/commands.mak between version 1.46 and 1.46.2.1

version 1.46, 2006/10/13 17:55:20 version 1.46.2.1, 2006/10/17 16:20:04
Line 345 
Line 345 
     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
   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 376 
  
 cimstop: CMDSFORCE cimstop: CMDSFORCE
         $(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)
   endif
  
 sleep: CMDSFORCE sleep: CMDSFORCE
         $(SLEEP) $(TIME)         $(SLEEP) $(TIME)
Line 456 
Line 471 
 runTestSuite: CMDSFORCE runTestSuite: CMDSFORCE
         -$(CIMSERVER_STOP_SERVICE)         -$(CIMSERVER_STOP_SERVICE)
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
   ifdef PEGASUS_ENABLE_REMOTE_CMPI
           $(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)
   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.46  
changed lines
  Added in v.1.46.2.1

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2