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

Diff for /pegasus/mak/commands.mak between version 1.8 and 1.22

version 1.8, 2004/11/29 15:42:06 version 1.22, 2005/03/19 04:01:37
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
  
   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
       SORT = mu sort
     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 5      SLEEP = mu sleep
     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
     MUEXE = mu.exe     MUEXE = mu.exe
       RM = mu rm
     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
       SORT = sort
     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 40 
Line 53 
     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
     DOCXX = doc++     DOCXX = doc++
  
     GENERATE_RANDSEED = randseed     GENERATE_RANDSEED = randseed
     OPENSSL_COMMAND = openssl  
     GET_HOSTNAME = `hostname`     GET_HOSTNAME = `hostname`
  
     ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)     ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)
Line 55 
Line 68 
         LIB_LINK_SUFFIX = .so         LIB_LINK_SUFFIX = .so
     endif     endif
  
     Pdr_xr_xr_x = 555      Prwxr_xr_x = 755
     P_rwxr_xr_x = 755      Pr_xr__r__ = 744
     P_r_xr__r__ = 744      Pr__r__r__ = 444
     P_r__r__r__ = 444      Pr________ = 400
     P_r________ = 400      Pr_xr_xr_x = 555
     P_r_xr_xr_x = 555      Prw_r__r__ = 644
     P_rw_r__r__ = 644  
     CHMODDIRHIER = chmod -R     CHMODDIRHIER = chmod -R
  
     INSTALL_USR = bin     INSTALL_USR = bin
Line 75 
Line 87 
     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
       SORT = sort
     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
     MUEXE = mu     MUEXE = mu
       RM = rm -f
     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 115 
 ifeq ($(OS),linux) ifeq ($(OS),linux)
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
       SORT = sort
     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 108 
Line 126 
     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
     DOCXX = doc++     DOCXX = doc++
  
     OPENSSL_COMMAND = openssl  
     GET_HOSTNAME = `hostname`     GET_HOSTNAME = `hostname`
  
     LIB_LINK_SUFFIX = .so     LIB_LINK_SUFFIX = .so
  
     Pdr_xr_xr_x = 555      Prwxr_xr_x = 755
     P_rwxr_xr_x = 755      Pr_xr__r__ = 744
     P_r_xr__r__ = 744      Pr__r__r__ = 444
     P_r__r__r__ = 444      Pr________ = 400
     P_r________ = 400      Pr_xr_xr_x = 555
     P_r_xr_xr_x = 555      Prw_r__r__ = 644
     P_rw_r__r__ = 644  
     CHMODDIRHIER = chmod -R     CHMODDIRHIER = chmod -R
  
     INSTALL_USR = root      INSTALL_USR = bin
     INSTALL_GRP = root      INSTALL_GRP = bin
     CIMSERVER_USR = root     CIMSERVER_USR = root
     CIMSERVER_GRP = root     CIMSERVER_GRP = root
     CHMOD = chmod     CHMOD = chmod
Line 138 
Line 155 
     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),zos) ifeq ($(OS),zos)
     STRIPCRS =     STRIPCRS =
     DIFF =      DIFF = diff
       SORT = sort
     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
       RM = rm -f
     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 160 
Line 182 
  
 ifeq ($(OS),VMS) ifeq ($(OS),VMS)
     STRIPCRS =     STRIPCRS =
     DIFF =      DIFF = mu compare
       SORT = mu sort
     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 177 
Line 201 
  
 ifeq ($(OS),aix) ifeq ($(OS),aix)
     STRIPCRS =     STRIPCRS =
     DIFF =      DIFF = diff
       SORT = sort
     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
       RM = rm -f
     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 233 
 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 242 
 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 261 
 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
   # with a designated set of configuration options (i.e.,
   # CIMSERVER_CONFIG_OPTIONS) and then runs a specified
   # set of tests (i.e., TESTSUITE_CMDS). After the tests
   # have been executed, the CIM Server is stopped.
   #
   # To call runTestSuite, you simply (1) define the
   # configuration options, (2) define the set of
   # tests and (3) call commands.mak with the appropriate
   # parameters.  Note: when specifying the set of tests
   # @@ is used as a replacement for blank. E.g., the
   # following sequence can be used to enable the
   # HTTP connection, disable the HTTPS connection and
   # run an osinfo, TestClient, OSTestClient,
   # and InvokeMethod2 test.
   #
   #runTestSuiteTest_CONFIG_OPTIONS = enableHttpConnection=true enableHttpsConnection=false
   #runTestSuiteTest_TEST_CMDS = \
   #   osinfo@@-hlocalhost@@-p5988@@-uguest@@-wguest\
   #   TestClient@@-local \
   #   OSTestClient \
   #   $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Pegasus/Client/tests/InvokeMethod2@@poststarttests
   #
   #runTestSuiteTest: CMDSFORCE
   #       $(MAKE) $(MAKEOPTIONS) runTestSuite CIMSERVER_CONFIG_OPTIONS="$(runTestSuiteTest_CONFIG_OPTIONS)" TESTSUITE_CMDS="$(runTestSuiteTest_TEST_CMDS)"
   
   runTestSuite: CMDSFORCE
           $(CIMSERVER_START_SERVICE)
           $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i));)
           $(CIMSERVER_STOP_SERVICE)

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