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

Diff for /pegasus/mak/commands.mak between version 1.41 and 1.45.18.1

version 1.41, 2005/11/18 21:17:40 version 1.45.18.1, 2006/10/16 15:10:55
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 42 
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 112 
Line 108 
     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_______ = 640      Prw_r_____ = 640
     CHMODDIRHIER = chmod -R     CHMODDIRHIER = chmod -R
  
     INSTALL_USR = bin     INSTALL_USR = bin
Line 200 
Line 197 
     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_______ = 640      Prw_r_____ = 640
     CHMODDIRHIER = chmod -R     CHMODDIRHIER = chmod -R
  
     INSTALL_USR = root     INSTALL_USR = root
Line 347 
Line 345 
     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
   endif
   
 ifndef TMP_DIR ifndef TMP_DIR
     ifdef PEGASUS_TMP     ifdef PEGASUS_TMP
         TMP_DIR = $(subst \,/,$(PEGASUS_TMP))         TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
Line 369 
Line 376 
  
 cimstop: CMDSFORCE cimstop: CMDSFORCE
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
   ifdef PEGASUS_ENABLE_REMOTE_CMPI
           $(CMPIR_STOP_DAEMON)
   endif
  
 cimstart: CMDSFORCE cimstart: CMDSFORCE
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
   ifdef PEGASUS_ENABLE_REMOTE_CMPI
           $(CMPIR_START_DAEMON)
   endif
  
 sleep: CMDSFORCE sleep: CMDSFORCE
         $(SLEEP) $(TIME)         $(SLEEP) $(TIME)
Line 456 
Line 469 
 ##       cimstart command. ##       cimstart command.
 ## ##
 runTestSuite: CMDSFORCE runTestSuite: CMDSFORCE
           -$(CIMSERVER_STOP_SERVICE)
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
   ifdef PEGASUS_ENABLE_REMOTE_CMPI
           $(CMPIR_START_DAEMON)
   endif
         $(WINDOWS_ONLY_SLEEP)         $(WINDOWS_ONLY_SLEEP)
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
   ifdef PEGASUS_ENABLE_REMOTE_CMPI
           $(CMPIR_STOP_DAEMON)
   endif
  
 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.41  
changed lines
  Added in v.1.45.18.1
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2