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

Diff for /pegasus/mak/commands.mak between version 1.11 and 1.14

version 1.11, 2005/02/14 10:36:42 version 1.14, 2005/02/21 20:25:51
Line 1 
Line 1 
 ifndef OS  # 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))
         else         else
             ROOT = .             ROOT = .
         endif         endif
     endif  
     include $(ROOT)/mak/config.mak     include $(ROOT)/mak/config.mak
 endif endif
  
Line 21 
Line 23 
     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 =
Line 40 
Line 43 
     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 89 
Line 93 
     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 108 
Line 113 
     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 152 
Line 158 
     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 170 
Line 177 
     MKDIRHIER = $(MUEXE) mkdirhier     MKDIRHIER = $(MUEXE) mkdirhier
     RMDIRHIER = $(MUEXE) rmdirhier     RMDIRHIER = $(MUEXE) rmdirhier
     ECHO =     ECHO =
       ECHO-E =
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
     CHGRP =     CHGRP =
Line 187 
Line 195 
     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 206 
Line 215 
 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 218 
Line 224 
 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 243 
Line 243 
 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 267 
Line 293 
 #   $(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.11  
changed lines
  Added in v.1.14
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2