(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.27

version 1.7.2.2, 2005/02/25 02:49:44 version 1.27, 2005/04/14 20:19:45
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 =      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
Line 26 
Line 36 
   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 48 
Line 60 
   DOCXX = doc++   DOCXX = doc++
  
   GENERATE_RANDSEED = randseed   GENERATE_RANDSEED = randseed
   OPENSSL_COMMAND = 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 57 
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      Prwxrwxrwx = 777
   P_r_xr__r__ = 744      Pr_xr__r__ = 744
   P_r__r__r__ = 444      Pr__r__r__ = 444
   P_r________ = 400      Pr________ = 400
   P_r_xr_xr_x = 555      Pr_xr_xr_x = 555
   P_rw_r__r__ = 644      Prw_r__r__ = 644
   CHMODDIRHIER = chmod -R   CHMODDIRHIER = chmod -R
  
   INSTALL_USR = bin   INSTALL_USR = bin
Line 77 
Line 88 
   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
Line 101 
Line 116 
 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 117 
Line 133 
   CAT = cat   CAT = cat
   DOCXX = doc++   DOCXX = doc++
  
   OPENSSL_COMMAND = openssl      GET_HOSTNAME = `host \`hostname\`|cut -d" " -f1`
   GET_HOSTNAME = `hostname`  
  
   LIB_LINK_SUFFIX = .so   LIB_LINK_SUFFIX = .so
  
   Pdr_xr_xr_x = 555      Prwxrwxrwx = 777
   P_rwxr_xr_x = 755      Prwxr_xr_x = 755
   P_r_xr__r__ = 744      Pr_xr__r__ = 744
   P_r__r__r__ = 444      Pr__r__r__ = 444
   P_r________ = 400      Pr________ = 400
   P_r_xr_xr_x = 555      Pr_xr_xr_x = 555
   P_rw_r__r__ = 644      Pr_x______ = 500
       Prw_r__r__ = 644
   CHMODDIRHIER = chmod -R   CHMODDIRHIER = chmod -R
  
   INSTALL_USR = root   INSTALL_USR = root
Line 142 
Line 158 
   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 =
Line 164 
Line 184 
 endif endif
  
 ifeq ($(OS),VMS) ifeq ($(OS),VMS)
   STRIPCRS =      STRIPCRS =$(MUEXE) echo "STRIPCRS not defined in commands.mak"
   DIFF =      DIFF = mu compare
   REDIRECTERROR =      SORT = mu sort
   CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)      REDIRECTERROR = $(MUEXE) echo "REDIRECTERROR not defined in commands.mak"
   CIMSERVER_STOP_SERVICE = cimserver -s      CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
       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 = $(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
       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
Line 213 
Line 236 
 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 245 
 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 264 
 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.,
Line 296 
Line 320 
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i));)         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i));)
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
   
   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.7.2.2  
changed lines
  Added in v.1.27
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2