(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.3 and 1.46.2.2

version 1.45.2.3, 2007/02/13 18:32:20 version 1.46.2.2, 2006/10/19 14:35:57
Line 294 
Line 294 
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
     SORT = sort     SORT = sort
     REDIRECTERROR = 2>&1      REDIRECTERROR =
     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 310 
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
     CHGRP =     CHGRP =
     CAT = cat  
 endif endif
  
 ifeq ($(OS),darwin) ifeq ($(OS),darwin)
Line 346 
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
   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 368 
Line 379 
  
 cimstop: CMDSFORCE cimstop: CMDSFORCE
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
           $(CMPIR_STOP_DAEMON)
  
 cimstart: CMDSFORCE cimstart: CMDSFORCE
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
           $(CMPIR_START_DAEMON)
  
 sleep: CMDSFORCE sleep: CMDSFORCE
         $(SLEEP) $(TIME)         $(SLEEP) $(TIME)
Line 457 
Line 470 
 runTestSuite: CMDSFORCE runTestSuite: CMDSFORCE
         -$(CIMSERVER_STOP_SERVICE)         -$(CIMSERVER_STOP_SERVICE)
         $(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.3  
changed lines
  Added in v.1.46.2.2
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2