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

Diff for /pegasus/mak/commands.mak between version 1.12 and 1.18

version 1.12, 2005/02/14 21:19:03 version 1.18, 2005/03/12 01:32:36
Line 1 
Line 1 
 # Ensure that config.mak is included (so that the OS variable is set correctly)  # commands.mak is a helper Makefile that is intended to be included in an upper level Makefile.
   
   # Ensure that config.mak is included (so that the ROOT variable is set correctly)
   
 ifndef ROOT ifndef ROOT
     ifdef PEGASUS_ROOT     ifdef PEGASUS_ROOT
         ROOT =  $(subst \,/,$(PEGASUS_ROOT))         ROOT =  $(subst \,/,$(PEGASUS_ROOT))
Line 12 
Line 15 
     STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)     STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)
     DIFF = mu compare     DIFF = mu compare
     REDIRECTERROR = 2>&1     REDIRECTERROR = 2>&1
     CIMSERVER_START_SERVICE = cimserver -start $(CIMSERVER_CONFIG_OPTIONS)      CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS) -start
     CIMSERVER_STOP_SERVICE = cimserver -stop      CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -stop
     SLEEP = mu sleep     SLEEP = mu sleep
     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
     MUEXE = mu.exe     MUEXE = mu.exe
     MKDIRHIER = $(MUEXE) mkdirhier     MKDIRHIER = $(MUEXE) mkdirhier
     RMDIRHIER = $(MUEXE) rmdirhier     RMDIRHIER = $(MUEXE) rmdirhier
     ECHO = mu echo     ECHO = mu echo
       ECHO-E = mu echo-e
     COPY = mu copy     COPY = mu copy
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
     CHGRP =     CHGRP =
       CURRENT_USER=Administrator
 endif endif
  
 ifeq ($(OS),HPUX) ifeq ($(OS),HPUX)
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
     REDIRECTERROR = 2>&1     REDIRECTERROR = 2>&1
     CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)      CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     CIMSERVER_STOP_SERVICE = cimserver -s      CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
     SLEEP = sleep     SLEEP = sleep
     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
Line 39 
Line 44 
     RMDIRHIER = rm -rf     RMDIRHIER = rm -rf
     CPDIRHIER = cp -R     CPDIRHIER = cp -R
     ECHO = echo     ECHO = echo
       ECHO-E = echo
     COPY = cp     COPY = cp
     TOUCH = touch     TOUCH = touch
     CAT = cat     CAT = cat
Line 74 
Line 80 
     CHGRPDIRHIER = chgrp -R     CHGRPDIRHIER = chgrp -R
  
     SYMBOLIC_LINK_CMD = ln -f -s     SYMBOLIC_LINK_CMD = ln -f -s
   
       CURRENT_USER=`whoami`
 endif endif
  
 ifeq ($(OS),solaris) ifeq ($(OS),solaris)
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
     REDIRECTERROR = 2>&1     REDIRECTERROR = 2>&1
     CIMSERVER_START_SERVICE = 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"}'
     SLEEP = sleep     SLEEP = sleep
     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old     REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
Line 88 
Line 96 
     MKDIRHIER = mkdir -p     MKDIRHIER = mkdir -p
     RMDIRHIER = rm -rf     RMDIRHIER = rm -rf
     ECHO = echo     ECHO = echo
       ECHO-E = mu echo-e
     COPY = cp     COPY = cp
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
Line 98 
Line 107 
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
     REDIRECTERROR = 2>&1     REDIRECTERROR = 2>&1
     CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)      CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     CIMSERVER_STOP_SERVICE = cimserver -s      CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
     SLEEP = sleep     SLEEP = sleep
     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
Line 107 
Line 116 
     RMDIRHIER = rm -rf     RMDIRHIER = rm -rf
     CPDIRHIER = cp -R     CPDIRHIER = cp -R
     ECHO = echo     ECHO = echo
       ECHO-E = echo -e
     COPY = cp     COPY = cp
     TOUCH = touch     TOUCH = touch
     CAT = cat     CAT = cat
Line 143 
Line 153 
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
     REDIRECTERROR =     REDIRECTERROR =
     CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)      CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     CIMSERVER_STOP_SERVICE = cimserver -s      CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
     SLEEP = sleep     SLEEP = sleep
     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
     RMDIRHIER = rm -rf     RMDIRHIER = rm -rf
     ECHO =     ECHO =
       ECHO-E =
     COPY = cp     COPY = cp
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
Line 161 
Line 172 
     STRIPCRS =     STRIPCRS =
     DIFF = mu compare     DIFF = mu compare
     REDIRECTERROR =     REDIRECTERROR =
     CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)      CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     CIMSERVER_STOP_SERVICE = cimserver -s      CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
     SLEEP = wait     SLEEP = wait
     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
     MUEXE = mu     MUEXE = mu
     MKDIRHIER = $(MUEXE) mkdirhier     MKDIRHIER = $(MUEXE) mkdirhier
     RMDIRHIER = $(MUEXE) rmdirhier     RMDIRHIER = $(MUEXE) rmdirhier
     ECHO =     ECHO =
       ECHO-E =
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
     CHGRP =     CHGRP =
Line 178 
Line 190 
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
     REDIRECTERROR =     REDIRECTERROR =
     CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)      CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     CIMSERVER_STOP_SERVICE = cimserver -s      CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
     SLEEP = sleep     SLEEP = sleep
     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
     RMDIRHIER = rm -rf     RMDIRHIER = rm -rf
     ECHO = echo     ECHO = echo
       ECHO-E =
     COPY = cp     COPY = cp
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
Line 205 
Line 218 
 cimstop: CMDSFORCE cimstop: CMDSFORCE
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
  
 cimstop_IgnoreError: CMDSFORCE  
         @make -f $(ROOT)/mak/commands.mak -i cimstop  
   
 cimstart: CMDSFORCE cimstart: CMDSFORCE
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
  
Line 217 
Line 227 
 mkdirhier: CMDSFORCE mkdirhier: CMDSFORCE
         $(MKDIRHIER) $(DIRNAME)         $(MKDIRHIER) $(DIRNAME)
  
 mkdirhier_IgnoreError: CMDSFORCE  
         @make -f $(ROOT)/mak/commands.mak -i mkdirhier  
   
 rmdirhier: CMDSFORCE rmdirhier: CMDSFORCE
         $(RMDIRHIER) $(DIRNAME)         $(RMDIRHIER) $(DIRNAME)
  
 rmdirhier_IgnoreError: CMDSFORCE  
         @make -f $(ROOT)/mak/commands.mak -i rmdirhier  
   
 setpermissions: CMDSFORCE setpermissions: CMDSFORCE
         $(CHMOD) $(PERMISSIONS) $(OBJECT)         $(CHMOD) $(PERMISSIONS) $(OBJECT)
         $(CHOWN) $(OWNER) $(OBJECT)         $(CHOWN) $(OWNER) $(OBJECT)
Line 242 
Line 246 
 createrandomseed: CMDSFORCE createrandomseed: CMDSFORCE
         $(GENERATE_RANDSEED) $(FILENAME)         $(GENERATE_RANDSEED) $(FILENAME)
  
 # The runTestSuite option restarts the CIM Server  # Because commands.mak is intended to be used as
   # helper Makefile, embedded use of calls to "make" are
   # problematic because the name of toplevel is not known.
   # To workaround this problem, the MAKEOPTIONS define
   # has been added to the following commands to
   # allow the name of the toplevel Makefile to be included.
   # E.g.,
   #
   # make MAKEOPTION="-f TestMakefile" cimstop_IgnoreError
   #
   # However, a better alternative would be to call the
   # the command directly from the toplevel makefile.
   # E.g.,
   #
   # make -f TestMakefile -i cimstop
   
   cimstop_IgnoreError: CMDSFORCE
           @$(MAKE) $(MAKEOPTIONS) -i cimstop
   
   rmdirhier_IgnoreError: CMDSFORCE
           @$(MAKE) $(MAKEOPTIONS) -i rmdirhier
   
   mkdirhier_IgnoreError: CMDSFORCE
           @$(MAKE) $(MAKEOPTIONS) -i mkdirhier
   
   
   # The runTestSuite option starts the CIM Server
 # with a designated set of configuration options (i.e., # with a designated set of configuration options (i.e.,
 # CIMSERVER_CONFIG_OPTIONS) and then runs a specified # CIMSERVER_CONFIG_OPTIONS) and then runs a specified
 # set of tests (i.e., TESTSUITE_CMDS). After the tests # set of tests (i.e., TESTSUITE_CMDS). After the tests
Line 266 
Line 296 
 #   $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Pegasus/Client/tests/InvokeMethod2@@poststarttests #   $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Pegasus/Client/tests/InvokeMethod2@@poststarttests
 # #
 #runTestSuiteTest: CMDSFORCE #runTestSuiteTest: CMDSFORCE
 #       $(MAKE) -f $(ROOT)/mak/commands.mak 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)"
  
 runTestSuite: CMDSFORCE runTestSuite: CMDSFORCE
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstop_IgnoreError          $(CIMSERVER_START_SERVICE)
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstart CIMSERVER_CONFIG_OPTIONS=$(CIMSERVER_CONFIG_OPTIONS)  
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i));)         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i));)
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstop          $(CIMSERVER_STOP_SERVICE)
   
 testCommands: CMDSFORCE  
         $(MAKE) -f $(ROOT)/mak/commands.mak sleep TIME=10  
         $(MAKE) -f $(ROOT)/mak/commands.mak rmdirhier_IgnoreError DIRNAME=$(TMP_DIR)/PegasusTestDirA/PegasusTestDirB  
         $(MAKE) -f $(ROOT)/mak/commands.mak mkdirhier DIRNAME=$(TMP_DIR)/PegasusTestDirA/PegasusTestDirB  
         $(MAKE) -f $(ROOT)/mak/commands.mak mkdirhier_IgnoreError DIRNAME=$(TMP_DIR)/PegasusTestDirA/PegasusTestDirB  
         $(MAKE) -f $(ROOT)/mak/commands.mak rmdirhier DIRNAME=$(TMP_DIR)/PegasusTestDirA  
         $(MAKE) -f $(ROOT)/mak/commands.mak rmdirhier_IgnoreError DIRNAME=$(TMP_DIR)/PegasusTestDirA/PegasusTestDirB  
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstop_IgnoreError  
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstart  
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstop  
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstop_IgnoreError  
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstart CIMSERVER_CONFIG_OPTIONS="traceLevel=1 traceComponents=XmlIO"  
         cimconfig -g traceLevel -c  
         cimconfig -g traceComponents -c  
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstop  

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.18
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2