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

Diff for /pegasus/mak/commands.mak between version 1.17 and 1.24

version 1.17, 2005/03/06 00:25:38 version 1.24, 2005/03/26 09:03:18
Line 11 
Line 11 
     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_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
     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 28 
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_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
Line 50 
Line 60 
     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 59 
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 79 
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_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"}'
     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 103 
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_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
Line 119 
Line 133 
     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      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 = bin
     INSTALL_GRP = root      INSTALL_GRP = bin
     CIMSERVER_USR = root     CIMSERVER_USR = root
     CIMSERVER_GRP = root     CIMSERVER_GRP = root
     CHMOD = chmod     CHMOD = chmod
Line 144 
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 = 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
     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 168 
Line 186 
 ifeq ($(OS),VMS) ifeq ($(OS),VMS)
     STRIPCRS =     STRIPCRS =
     DIFF = mu compare     DIFF = mu compare
       SORT = mu 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
Line 186 
Line 205 
 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
     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 297 
Line 318 
  
 runTestSuite: CMDSFORCE runTestSuite: CMDSFORCE
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))          $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i));)
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)

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