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

Diff for /pegasus/mak/commands.mak between version 1.31 and 1.48

version 1.31, 2005/07/14 00:36:11 version 1.48, 2006/10/23 23:47:43
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; Symantec Corporation; The Open Group.
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy #// Permission is hereby granted, free of charge, to any person obtaining a copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 26 
Line 28 
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #// #//
 #//============================================================================== #//==============================================================================
 # commands.mak is a helper Makefile that is intended to be included in an upper level Makefile.  # 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)
  
 # Ensure that config.mak is included (so that the ROOT variable is set correctly)  
  
 ifndef ROOT ifndef ROOT
     ifdef PEGASUS_ROOT     ifdef PEGASUS_ROOT
Line 39 
Line 44 
     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
Line 53 
Line 52 
     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 66 
     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 78 
     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 97 
Line 101 
     endif     endif
  
     Prwxr_xr_x = 755     Prwxr_xr_x = 755
       Prwx______ = 700
     Prwxrwxrwx = 777     Prwxrwxrwx = 777
       Prwxrwxrwt = 1777
     Pr_xr__r__ = 744     Pr_xr__r__ = 744
     Pr__r__r__ = 444     Pr__r__r__ = 444
     Pr________ = 400     Pr________ = 400
     Pr_xr_xr_x = 555     Pr_xr_xr_x = 555
       Prw_______ = 600
     Prw_r__r__ = 644     Prw_r__r__ = 644
       Prw_r_____ = 640
     CHMODDIRHIER = chmod -R     CHMODDIRHIER = chmod -R
  
     INSTALL_USR = bin     INSTALL_USR = bin
Line 125 
Line 133 
     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 139 
Line 159 
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
     CHGRP =     CHGRP =
       CURRENT_USER=`whoami`
 endif endif
  
 ifeq ($(OS),linux) ifeq ($(OS),linux)
Line 149 
Line 170 
     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 166 
Line 188 
     LIB_LINK_SUFFIX = .so     LIB_LINK_SUFFIX = .so
  
     Prwxrwxrwx = 777     Prwxrwxrwx = 777
       Prwxrwxrwt = 1777
     Prwxr_xr_x = 755     Prwxr_xr_x = 755
       Prwxr_x___ = 750
     Pr_xr__r__ = 744     Pr_xr__r__ = 744
       Prwx______ = 700
     Pr__r__r__ = 444     Pr__r__r__ = 444
     Pr________ = 400     Pr________ = 400
     Pr_xr_xr_x = 555     Pr_xr_xr_x = 555
     Pr_x______ = 500     Pr_x______ = 500
       Prw_______ = 600
     Prw_r__r__ = 644     Prw_r__r__ = 644
       Prw_r_____ = 640
     CHMODDIRHIER = chmod -R     CHMODDIRHIER = chmod -R
  
     INSTALL_USR = root     INSTALL_USR = root
     INSTALL_GRP = root      INSTALL_GRP = pegasus
     CIMSERVER_USR = root     CIMSERVER_USR = root
     CIMSERVER_GRP = root      CIMSERVER_GRP = pegasus
     CHMOD = chmod     CHMOD = chmod
     CHOWN = chown     CHOWN = chown
     CHGRP = chgrp     CHGRP = chgrp
Line 194 
Line 221 
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
     SORT = sort     SORT = sort
     REDIRECTERROR =      REDIRECTERROR = 2>&1
     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
     MKDIRHIER = mkdir -p     MKDIRHIER = mkdir -p
     RMDIRHIER = rm -rf     RMDIRHIER = rm -rf
     ECHO =      CPDIRHIER = cp -R
     ECHO-E =      ECHO = echo
       ECHO-E = echo
     COPY = cp     COPY = cp
     CHMOD =      TOUCH = touch
     CHOWN =  
     CHGRP =      Prwxrwxrwx = 777
       Prwxrwxrwt = 1777
       Prwxr_xr_x = 755
       Pr_xr__r__ = 744
       Pr__r__r__ = 444
       Pr________ = 400
       Pr_xr_xr_x = 555
       Pr_x______ = 500
       Prw_r__r__ = 644
       CHMODDIRHIER = chmod -R
   
       INSTALL_USR = root
       INSTALL_GRP = root
       CIMSERVER_USR = root
       CIMSERVER_GRP = root
       CHMOD = chmod
       CHOWN = chown
       CHGRP = chgrp
       CHOWNDIRHIER = chown -R
       CHGRPDIRHIER = chgrp -R
   
       GET_HOSTNAME = `host \`hostname\`|cut -d" " -f1`
   
       LIB_LINK_SUFFIX = .so
   
       CURRENT_USER=`whoami`
   
   
       SYMBOLIC_LINK_CMD = ln -f -s
       CAT = cat
   
 endif endif
  
 ifeq ($(OS),VMS) ifeq ($(OS),VMS)
Line 216 
Line 275 
     DIFF = mu compare     DIFF = mu compare
     SORT = mu sort     SORT = mu sort
     REDIRECTERROR = $(MUEXE) echo "REDIRECTERROR not defined in commands.mak"     REDIRECTERROR = $(MUEXE) echo "REDIRECTERROR not defined in commands.mak"
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)      CIMSERVER_START_SERVICE_DELAY = 20
       CIMSERVER_START_SERVICE = pipe ($(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS) &) && mu sleep $(CIMSERVER_START_SERVICE_DELAY)
     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
     SLEEP = wait      SLEEP = $(MUEXE) sleep
       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 238 
Line 299 
     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 259 
Line 321 
     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 283 
Line 346 
     CURRENT_USER=`whoami`     CURRENT_USER=`whoami`
 endif endif
  
   ifdef PEGASUS_ENABLE_REMOTE_CMPI
       ifeq ($(OS),win32)
           $(error Error: Remote CMPI is not currently supported on Windows.)
       else
           CMPIR_START_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon
           CMPIR_STOP_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon --stop
       endif
   else
       CMPIR_START_DAEMON =
       CMPIR_STOP_DAEMON =
   endif
   
 ifndef TMP_DIR ifndef TMP_DIR
     ifdef PEGASUS_TMP     ifdef PEGASUS_TMP
         TMP_DIR = $(subst \,/,$(PEGASUS_TMP))         TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
Line 291 
Line 366 
     endif     endif
 endif endif
  
   
 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
           -$(CMPIR_STOP_DAEMON)
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
  
 cimstart: CMDSFORCE cimstart: CMDSFORCE
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
           $(CMPIR_START_DAEMON)
  
 sleep: CMDSFORCE sleep: CMDSFORCE
         $(SLEEP) $(TIME)         $(SLEEP) $(TIME)
Line 349 
Line 436 
 mkdirhier_IgnoreError: CMDSFORCE mkdirhier_IgnoreError: CMDSFORCE
         @$(MAKE) $(MAKEOPTIONS) -i mkdirhier         @$(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.,
 # CIMSERVER_CONFIG_OPTIONS) and then runs a specified # CIMSERVER_CONFIG_OPTIONS) and then runs a specified
Line 376 
Line 462 
 #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 -f TestMakefile -i cimstop
           make -f TestMakefile cimstart
           $(WINDOWS_ONLY_SLEEP)
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))
         $(CIMSERVER_STOP_SERVICE)          make -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.31  
changed lines
  Added in v.1.48
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2