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

Diff for /pegasus/mak/commands.mak between version 1.26 and 1.30

version 1.26, 2005/04/08 19:12:53 version 1.30, 2005/05/17 15:20:44
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 147 
Line 175 
     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 223 
Line 251 
     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
       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 318 
Line 378 
  
 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)
  
 ifndef PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN ifndef PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN


Legend:
Removed from v.1.26  
changed lines
  Added in v.1.30

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2