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

Diff for /pegasus/mak/commands.mak between version 1.32 and 1.38

version 1.32, 2005/07/15 23:02:19 version 1.38, 2005/11/06 18:07:53
Line 53 
Line 53 
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS) -start     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS) -start
     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -stop     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -stop
     SLEEP = mu sleep     SLEEP = mu sleep
       TIME_CMD =
       WINDOWS_ONLY_SLEEP = mu sleep 10
     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
     MUEXE = mu.exe     MUEXE = mu.exe
     RM = mu rm     RM = mu rm
Line 65 
Line 67 
     CHOWN =     CHOWN =
     CHGRP =     CHGRP =
     CURRENT_USER=Administrator     CURRENT_USER=Administrator
   else
       WINDOWS_ONLY_SLEEP =
 endif endif
  
 ifeq ($(OS),HPUX) ifeq ($(OS),HPUX)
Line 75 
Line 79 
     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
       TIME_CMD = time
     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
     MUEXE = mu     MUEXE = mu
     MKDIRHIER = mkdir -p     MKDIRHIER = mkdir -p
Line 126 
Line 131 
     DIFF = diff     DIFF = diff
     SORT = sort     SORT = sort
     REDIRECTERROR = 2>&1     REDIRECTERROR = 2>&1
   #
   #   Refer to bug 4205 for the description of the problem with the SIGUSR1
   #   signal.  That problem required changing the server to be started in the
   #   background with a sleep 30 to prevent the makefile from receiving the
   #   SIGUSR1 signal and exiting
   #
   ifeq ($(PEGASUS_PLATFORM), SOLARIS_SPARC_GNU)
       CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS) & $(SLEEP) 30
       CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
   else
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     CIMSERVER_STOP_SERVICE = /usr/bin/ps -ef | /usr/bin/grep cimserver | /usr/bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/usr/bin/ksh"}'     CIMSERVER_STOP_SERVICE = /usr/bin/ps -ef | /usr/bin/grep cimserver | /usr/bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/usr/bin/ksh"}'
   endif
     SLEEP = sleep     SLEEP = sleep
       TIME_CMD = time
     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
     MUEXE = mu     MUEXE = mu
     RM = rm -f     RM = rm -f
Line 140 
Line 157 
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
     CHGRP =     CHGRP =
       CURRENT_USER=`whoami`
 endif endif
  
 ifeq ($(OS),linux) ifeq ($(OS),linux)
Line 150 
Line 168 
     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
       TIME_CMD = time
     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
     MUEXE = mu     MUEXE = mu
     MKDIRHIER = mkdir -p     MKDIRHIER = mkdir -p
Line 200 
Line 219 
     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
       TIME_CMD = time
     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
     MUEXE = mu     MUEXE = mu
     RM = rm -f     RM = rm -f
Line 221 
Line 241 
     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 = wait
       TIME_CMD =
     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
     MUEXE = mu     MUEXE = mu
     MKDIRHIER = $(MUEXE) mkdirhier     MKDIRHIER = $(MUEXE) mkdirhier
Line 240 
Line 261 
     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
       TIME_CMD = time
     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
     MUEXE = mu     MUEXE = mu
     RM = rm -f     RM = rm -f
Line 261 
Line 283 
     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
       TIME_CMD = time
     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
     MUEXE = mu     MUEXE = mu
     RM = rm -f     RM = rm -f
Line 295 
Line 318 
  
 CMDSFORCE: CMDSFORCE:
  
   ##
   ## Although the macros CIMSERVER_STOP_SERVICE and CIMSERVER_START_SERVICE
   ## are available and could be invoked directly, their direct usage is
   ## discouraged in favor of invoking the cimstop and the cimstart rules
   ## as this allows one place where additional checks, delays etc may be
   ## added in the future to control or further test the servers performance
   ## in executing these commands.
   ##
   
 cimstop: CMDSFORCE cimstop: CMDSFORCE
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
           $(SLEEP) 30
  
 cimstart: CMDSFORCE cimstart: CMDSFORCE
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
Line 378 
Line 411 
 #runTestSuiteTest: CMDSFORCE #runTestSuiteTest: CMDSFORCE
 #       $(MAKE) $(MAKEOPTIONS) runTestSuite CIMSERVER_CONFIG_OPTIONS="$(runTestSuiteTest_CONFIG_OPTIONS)" TESTSUITE_CMDS="$(runTestSuiteTest_TEST_CMDS)" #       $(MAKE) $(MAKEOPTIONS) runTestSuite CIMSERVER_CONFIG_OPTIONS="$(runTestSuiteTest_CONFIG_OPTIONS)" TESTSUITE_CMDS="$(runTestSuiteTest_TEST_CMDS)"
  
   ##
   ## NOTE: The CIMSERVER_CONFIG_OPTIONS are set in the environment on the
   ##       makefile rule command line invoking the runTestSuite command.
   ##       They are inherted by the next shell which will run the
   ##       cimstart command.
   ##
 runTestSuite: CMDSFORCE runTestSuite: CMDSFORCE
         $(CIMSERVER_START_SERVICE)          $(MAKE) --directory $(PEGASUS_ROOT) -f TestMakefile cimstart
           $(WINDOWS_ONLY_SLEEP)
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))
         $(CIMSERVER_STOP_SERVICE)          $(MAKE) --directory $(PEGASUS_ROOT) -f TestMakefile cimstop
  
 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.32  
changed lines
  Added in v.1.38
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2