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

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

version 1.43, 2006/01/30 16:16:22 version 1.46, 2006/10/13 17:55:20
Line 44 
Line 44 
     include $(ROOT)/mak/config.mak     include $(ROOT)/mak/config.mak
 endif endif
  
 ifndef OPENSSL_BIN  
     OPENSSL_BIN = $(OPENSSL_HOME)/bin  
 endif  
   
     OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl  
   
 ifeq ($(OS),win32) ifeq ($(OS),win32)
     STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)     STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)
     DIFF = mu compare     DIFF = mu compare
Line 283 
Line 277 
     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 = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     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 460 
Line 454 
 ##       cimstart command. ##       cimstart command.
 ## ##
 runTestSuite: CMDSFORCE runTestSuite: CMDSFORCE
           -$(CIMSERVER_STOP_SERVICE)
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(WINDOWS_ONLY_SLEEP)         $(WINDOWS_ONLY_SLEEP)
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))


Legend:
Removed from v.1.43  
changed lines
  Added in v.1.46

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2