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

Diff for /pegasus/mak/commands.mak between version 1.7.2.2 and 1.16

version 1.7.2.2, 2005/02/25 02:49:44 version 1.16, 2005/02/22 22:50:15
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 13 
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 =      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
Line 32 
Line 34 
   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 83 
Line 85 
   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 102 
Line 104 
   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 146 
Line 148 
  
 ifeq ($(OS),zos) ifeq ($(OS),zos)
   STRIPCRS =   STRIPCRS =
   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
Line 165 
Line 167 
  
 ifeq ($(OS),VMS) ifeq ($(OS),VMS)
   STRIPCRS =   STRIPCRS =
   DIFF =      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
Line 183 
Line 185 
  
 ifeq ($(OS),aix) ifeq ($(OS),aix)
   STRIPCRS =   STRIPCRS =
   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
Line 213 
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 225 
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 250 
Line 243 
 createrandomseed: CMDSFORCE createrandomseed: CMDSFORCE
         $(GENERATE_RANDSEED) $(FILENAME)         $(GENERATE_RANDSEED) $(FILENAME)
  
 testCommands: CMDSFORCE  # Because commands.mak is intended to be used as
         $(MAKE) -f $(ROOT)/mak/commands.mak sleep TIME=10  # helper Makefile, embedded use of calls to "make" are
         $(MAKE) -f $(ROOT)/mak/commands.mak rmdirhier_IgnoreError DIRNAME=$(TMP_DIR)/PegasusTestDirA/PegasusTestDirB  # problematic because the name of toplevel is not known.
         $(MAKE) -f $(ROOT)/mak/commands.mak mkdirhier DIRNAME=$(TMP_DIR)/PegasusTestDirA/PegasusTestDirB  # To workaround this problem, the MAKEOPTIONS define
         $(MAKE) -f $(ROOT)/mak/commands.mak mkdirhier_IgnoreError DIRNAME=$(TMP_DIR)/PegasusTestDirA/PegasusTestDirB  # has been added to the following commands to
         $(MAKE) -f $(ROOT)/mak/commands.mak rmdirhier DIRNAME=$(TMP_DIR)/PegasusTestDirA  # allow the name of the toplevel Makefile to be included.
         $(MAKE) -f $(ROOT)/mak/commands.mak rmdirhier_IgnoreError DIRNAME=$(TMP_DIR)/PegasusTestDirA/PegasusTestDirB  # E.g.,
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstop_IgnoreError  #
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstart  # make MAKEOPTION="-f TestMakefile" cimstop_IgnoreError
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstop  #
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstop_IgnoreError  # However, a better alternative would be to call the
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstart CIMSERVER_CONFIG_OPTIONS="traceLevel=1 traceComponents=XmlIO"  # the command directly from the toplevel makefile.
         cimconfig -g traceLevel -c  # E.g.,
         cimconfig -g traceComponents -c  #
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstop  # 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 # 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.,

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