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

Diff for /pegasus/mak/commands.mak between version 1.37 and 1.53.2.2

version 1.37, 2005/10/26 22:52:31 version 1.53.2.2, 2007/03/29 13:21:34
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  ifeq ($(OS_TYPE),windows)
     OPENSSL_BIN = $(OPENSSL_HOME)/bin  
 endif  
   
     OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl  
   
 ifeq ($(OS),win32)  
     STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)     STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)
     DIFF = mu compare     DIFF = mu compare
     SORT = mu sort     SORT = mu sort
     REDIRECTERROR = 2>&1     REDIRECTERROR = 2>&1
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS) -start      CIMSERVER_START_SERVICE = start "/K $(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     WINDOWS_ONLY_SLEEP = mu sleep 10
     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
     MUEXE = mu.exe     MUEXE = mu.exe
Line 62 
Line 62 
     ECHO = mu echo     ECHO = mu echo
     ECHO-E = mu echo-e     ECHO-E = mu echo-e
     COPY = mu copy     COPY = mu copy
       STARTCMD = start
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
     CHGRP =     CHGRP =
Line 78 
Line 79 
     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 100 
Line 102 
     endif     endif
  
     Prwxr_xr_x = 755     Prwxr_xr_x = 755
       Prwx______ = 700
     Prwxrwxrwx = 777     Prwxrwxrwx = 777
     Prwxrwxrwt = 1777     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 143 
Line 148 
     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 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 165 
Line 171 
     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 184 
Line 191 
     Prwxrwxrwx = 777     Prwxrwxrwx = 777
     Prwxrwxrwt = 1777     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 211 
Line 222 
     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 233 
Line 276 
     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 251 
Line 296 
     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
Line 266 
Line 312 
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
     CHGRP =     CHGRP =
       CAT = cat
 endif endif
  
 ifeq ($(OS),darwin) ifeq ($(OS),darwin)
Line 276 
Line 323 
     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 300 
Line 348 
     CURRENT_USER=`whoami`     CURRENT_USER=`whoami`
 endif endif
  
   ifdef PEGASUS_ENABLE_REMOTE_CMPI
       ifeq ($(OS_TYPE),windows)
           CMPIR_START_DAEMON = start "/K $(CIMSERVER_PATH)" CMPIRDaemon
           CMPIR_STOP_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon --stop
       else
           CMPIR_START_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon
           CMPIR_STOP_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon --stop
       endif
   else
       CMPIR_START_DAEMON = $(ECHO) "(CMPIR_START_DAEMON command ignored)"
       CMPIR_STOP_DAEMON =  $(ECHO) "(CMPIR_STOP_DAEMON command ignored)"
   
   endif
   
 ifndef TMP_DIR ifndef TMP_DIR
     ifdef PEGASUS_TMP     ifdef PEGASUS_TMP
         TMP_DIR = $(subst \,/,$(PEGASUS_TMP))         TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
Line 308 
Line 370 
     endif     endif
 endif endif
  
   
 CMDSFORCE: CMDSFORCE:
  
 ## ##
Line 320 
Line 383 
 ## ##
  
 cimstop: CMDSFORCE cimstop: CMDSFORCE
           -$(CMPIR_STOP_DAEMON)
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
         $(SLEEP) 30  
  
 cimstart: CMDSFORCE cimstart: CMDSFORCE
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
           $(CMPIR_START_DAEMON)
  
 sleep: CMDSFORCE sleep: CMDSFORCE
         $(SLEEP) $(TIME)         $(SLEEP) $(TIME)
Line 376 
Line 440 
 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 410 
Line 473 
 ##       cimstart command. ##       cimstart command.
 ## ##
 runTestSuite: CMDSFORCE runTestSuite: CMDSFORCE
         $(MAKE) --directory $(PEGASUS_ROOT) -f TestMakefile cimstart          -$(CIMSERVER_STOP_SERVICE)
           $(CIMSERVER_START_SERVICE)
         $(WINDOWS_ONLY_SLEEP)         $(WINDOWS_ONLY_SLEEP)
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))
         $(MAKE) --directory $(PEGASUS_ROOT) -f TestMakefile cimstop          $(CIMSERVER_STOP_SERVICE)
  
 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.37  
changed lines
  Added in v.1.53.2.2
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2