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

Diff for /pegasus/mak/commands.mak between version 1.19 and 1.38

version 1.19, 2005/03/12 01:45:21 version 1.38, 2005/11/06 18:07:53
Line 1 
Line 1 
   #//%2005////////////////////////////////////////////////////////////////////////
   #//
   #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
   #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
   #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation, The Open Group.
   #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #//
   #// Permission is hereby granted, free of charge, to any person obtaining a copy
   #// of this software and associated documentation files (the "Software"), to
   #// deal in the Software without restriction, including without limitation the
   #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
   #// sell copies of the Software, and to permit persons to whom the Software is
   #// furnished to do so, subject to the following conditions:
   #//
   #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
   #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
   #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
   #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
   #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
   #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   #// 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)
Line 15 
Line 43 
     OPENSSL_BIN = $(OPENSSL_HOME)/bin     OPENSSL_BIN = $(OPENSSL_HOME)/bin
 endif 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_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
     MKDIRHIER = $(MUEXE) mkdirhier     MKDIRHIER = $(MUEXE) mkdirhier
     RMDIRHIER = $(MUEXE) rmdirhier     RMDIRHIER = $(MUEXE) rmdirhier
     ECHO = mu echo     ECHO = mu echo
Line 33 
Line 67 
     CHOWN =     CHOWN =
     CHGRP =     CHGRP =
     CURRENT_USER=Administrator     CURRENT_USER=Administrator
   else
       WINDOWS_ONLY_SLEEP =
 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_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 55 
Line 93 
     DOCXX = doc++     DOCXX = doc++
  
     GENERATE_RANDSEED = randseed     GENERATE_RANDSEED = randseed
     OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl      GET_HOSTNAME = `nslookup \`hostname\` | grep "Name:" | sed 's/Name:[ ]*//'`
     GET_HOSTNAME = `hostname`  
  
     ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)     ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)
         LIB_LINK_SUFFIX = .sl         LIB_LINK_SUFFIX = .sl
Line 65 
Line 102 
     endif     endif
  
     Prwxr_xr_x = 755     Prwxr_xr_x = 755
       Prwxrwxrwx = 777
       Prwxrwxrwt = 1777
     Pr_xr__r__ = 744     Pr_xr__r__ = 744
     Pr__r__r__ = 444     Pr__r__r__ = 444
     Pr________ = 400     Pr________ = 400
Line 90 
Line 129 
 ifeq ($(OS),solaris) ifeq ($(OS),solaris)
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
       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
     MKDIRHIER = mkdir -p     MKDIRHIER = mkdir -p
     RMDIRHIER = rm -rf     RMDIRHIER = rm -rf
     ECHO = echo     ECHO = echo
Line 104 
Line 157 
     CHMOD =     CHMOD =
     CHOWN =     CHOWN =
     CHGRP =     CHGRP =
       CURRENT_USER=`whoami`
 endif endif
  
 ifeq ($(OS),linux) ifeq ($(OS),linux)
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
       SORT = sort
     REDIRECTERROR = 2>&1     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
     MKDIRHIER = mkdir -p     MKDIRHIER = mkdir -p
Line 125 
Line 181 
     CAT = cat     CAT = cat
     DOCXX = doc++     DOCXX = doc++
  
     OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl      GET_HOSTNAME = `host \`hostname\`|cut -d" " -f1`
     GET_HOSTNAME = `hostname`  
  
     LIB_LINK_SUFFIX = .so     LIB_LINK_SUFFIX = .so
  
       Prwxrwxrwx = 777
       Prwxrwxrwt = 1777
     Prwxr_xr_x = 755     Prwxr_xr_x = 755
     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
       Pr_x______ = 500
     Prw_r__r__ = 644     Prw_r__r__ = 644
     CHMODDIRHIER = chmod -R     CHMODDIRHIER = chmod -R
  
     INSTALL_USR = bin      INSTALL_USR = root
     INSTALL_GRP = bin      INSTALL_GRP = root
     CIMSERVER_USR = root     CIMSERVER_USR = root
     CIMSERVER_GRP = root     CIMSERVER_GRP = root
     CHMOD = chmod     CHMOD = chmod
Line 149 
Line 207 
     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 = diff
       SORT = sort
     REDIRECTERROR =     REDIRECTERROR =
     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
     MKDIRHIER = mkdir -p     MKDIRHIER = mkdir -p
     RMDIRHIER = rm -rf     RMDIRHIER = rm -rf
     ECHO =     ECHO =
Line 171 
Line 234 
 endif endif
  
 ifeq ($(OS),VMS) ifeq ($(OS),VMS)
     STRIPCRS =      STRIPCRS =$(MUEXE) echo "STRIPCRS not defined in commands.mak"
     DIFF = mu compare     DIFF = mu compare
     REDIRECTERROR =      SORT = mu sort
       REDIRECTERROR = $(MUEXE) echo "REDIRECTERROR not defined in commands.mak"
     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 = wait     SLEEP = wait
       TIME_CMD =
     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 = $(MUEXE) echo
     ECHO-E =      ECHO-E = $(MUEXE) echo "ECHO-E not defined in commands.mak"
     CHMOD =      CHMOD = $(MUEXE) echo "CHMOD not defined in commands.mak"
     CHOWN =      CHOWN = $(MUEXE) echo "CHOWN not defined in commands.mak"
     CHGRP =      CHGRP = $(MUEXE) echo  "CHGRP not defined in commands.mak"
 endif endif
  
 ifeq ($(OS),aix) ifeq ($(OS),aix)
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
       SORT = sort
     REDIRECTERROR =     REDIRECTERROR =
     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
     MKDIRHIER = mkdir -p     MKDIRHIER = mkdir -p
     RMDIRHIER = rm -rf     RMDIRHIER = rm -rf
     ECHO = echo     ECHO = echo
Line 207 
Line 275 
     CHGRP =     CHGRP =
 endif endif
  
   ifeq ($(OS),darwin)
       STRIPCRS =
       DIFF = diff
       SORT = sort
       REDIRECTERROR = 2>&1
       CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
       CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
       SLEEP = sleep
       TIME_CMD = time
       REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
       MUEXE = mu
       RM = rm -f
       MKDIRHIER = mkdir -p
       RMDIRHIER = rm -rf
       ECHO = echo
       ECHO-E = mu echo-e
       COPY = cp
       TOUCH = touch
       CAT = cat
   
       CHMOD = chmod
       CHOWN = chown
       CHGRP = chgrp
   
       CHMODDIRHIER = chmod -R
       CHOWNDIRHIER = chown -R
       CHGRPDIRHIER = chgrp -R
   
       SYMBOLIC_LINK_CMD = ln -f -s
   
       CURRENT_USER=`whoami`
   endif
   
 ifndef TMP_DIR ifndef TMP_DIR
     ifdef PEGASUS_TMP     ifdef PEGASUS_TMP
         TMP_DIR = $(subst \,/,$(PEGASUS_TMP))         TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
Line 217 
Line 318 
  
 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
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
           $(SLEEP) 30
  
 cimstart: CMDSFORCE cimstart: CMDSFORCE
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
Line 300 
Line 411 
 #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) --directory $(PEGASUS_ROOT) -f TestMakefile cimstart
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i));)          $(WINDOWS_ONLY_SLEEP)
         $(CIMSERVER_STOP_SERVICE)          $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))
           $(MAKE) --directory $(PEGASUS_ROOT) -f TestMakefile cimstop
   
   ifndef PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN
     PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN=$(GET_HOSTNAME)
   endif
   
   createSSLCnfFile: CMDSFORCE
           @$(RM) $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "[ req ]" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "distinguished_name     = req_distinguished_name" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "prompt                 = no"  >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "[ req_distinguished_name ]" >>  $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "C                      = $(PEGASUS_SSLCNF_COUNTRY_CODE)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "ST                     = $(PEGASUS_SSLCNF_STATE)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "L                      = $(PEGASUS_SSLCNF_LOCALITY)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "O                      = $(PEGASUS_SSLCNF_ORGANIZATION)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "OU                     = $(PEGASUS_SSLCNF_ORGANIZATION_UNIT)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "CN                     = $(PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN)" >> $(PEGASUS_SSLCERT_CNFFILE)
   
   createSSLCertificate: CMDSFORCE
   ifdef PEGASUS_SSL_RANDOMFILE
           @$(OPENSSL_COMMAND) req -x509 -days $(PEGASUS_SSLCERT_DAYS) -newkey rsa:2048 -rand $(PEGASUS_SSLCERT_RANDOMFILE) -nodes -config $(PEGASUS_SSLCERT_CNFFILE) -keyout $(PEGASUS_SSLCERT_KEYFILE) -out
   $(PEGASUS_SSLCERT_CERTFILE)
   else
           @$(OPENSSL_COMMAND) req -x509 -days $(PEGASUS_SSLCERT_DAYS) -newkey rsa:2048 -nodes -config $(PEGASUS_SSLCERT_CNFFILE) -keyout $(PEGASUS_SSLCERT_KEYFILE) -out $(PEGASUS_SSLCERT_CERTFILE)
   endif
   
   displayCertificate: CMDSFORCE
           @$(OPENSSL_COMMAND) x509 -in $(PEGASUS_SSLCERT_CERTFILE) -text

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