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

Diff for /pegasus/mak/SDKMakefile between version 1.49 and 1.53

version 1.49, 2008/09/02 14:11:17 version 1.53, 2008/12/02 09:00:00
Line 1 
Line 1 
 #//%2006////////////////////////////////////////////////////////////////////////  #//%LICENSE////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  #// Licensed to The Open Group (TOG) under one or more contributor license
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  #// agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  #// this work for additional information regarding copyright ownership.
 #// IBM Corp.; EMC Corporation, The Open Group.  #// Each contributor licenses this file to you under the OpenPegasus Open
 #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  #// Source License; you may not use this file except in compliance with the
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  #// License.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// 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
 #// of this software and associated documentation files (the "Software"), to  #// copy of this software and associated documentation files (the "Software"),
 #// deal in the Software without restriction, including without limitation the  #// to deal in the Software without restriction, including without limitation
 #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  #// the rights to use, copy, modify, merge, publish, distribute, sublicense,
 #// sell copies of the Software, and to permit persons to whom the Software is  #// and/or sell copies of the Software, and to permit persons to whom the
 #// furnished to do so, subject to the following conditions:  #// Software is furnished to do so, subject to the following conditions:
 #// #//
 #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  #// The above copyright notice and this permission notice shall be included
 #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  #// in all copies or substantial portions of the Software.
 #// "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.  
 #// #//
 #//==============================================================================  #// 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.
   #//
   #//////////////////////////////////////////////////////////////////////////
 include $(PEGASUS_ROOT)/mak/config.mak include $(PEGASUS_ROOT)/mak/config.mak
 include $(PEGASUS_ROOT)/mak/commands.mak include $(PEGASUS_ROOT)/mak/commands.mak
  
Line 51 
Line 49 
    PEGASUS_DOC_DIR = doc    PEGASUS_DOC_DIR = doc
 endif endif
  
   # PACKAGED_PLATFORM_FILES is used to define the set of
   # of platform .mak and .h files to be included in the
   # SDK. By default, this value is set the platform defined
   # by the value of PEGASUS_PLATFORM when the SDK was
   # built.
   #
   # However, PACKAGED_PLATFORM_FILES can be explicitly set to
   # include multiple platforms.  In this case, the SDK will
   # include platform .mak and .h files for each of the listed
   # platforms.
   #
   # Note: If PACKAGED_PLATFORM_FILES is defined, the
   # createConfigFile_setPegasusPlatform option must be updated
   # to include commands for determining the platform type at
   # runtime.
   
   ifeq ($(OS),linux)
      PACKAGED_PLATFORM_FILES = \
         LINUX_IA64_GNU \
         LINUX_IX86_GNU \
         LINUX_PPC64_GNU \
         LINUX_PPC_GNU \
         LINUX_X86_64_GNU \
         LINUX_ZSERIES64_GNU \
         LINUX_ZSERIES_GNU
   endif
   
   ifdef PACKAGED_PLATFORM_FILES
      RUNTIME_PLATFORM_TEST_NEEDED = true
   else
      RUNTIME_PLATFORM_TEST_NEEDED = false
      PACKAGED_PLATFORM_FILES = $(PEGASUS_PLATFORM)
   endif
  
 INCLUDE_SRCPATH = $(PEGASUS_ROOT)/src INCLUDE_SRCPATH = $(PEGASUS_ROOT)/src
  
Line 120 
Line 151 
    Pegasus/Provider/Linkage.h \    Pegasus/Provider/Linkage.h \
    Pegasus/Provider/ProviderException.h    Pegasus/Provider/ProviderException.h
  
 ## Common Platform Include for SOLARIS platform.  
 ## Add Platorm_SOLARIS_CC.h file  
 ifdef PEGASUS_OS_SOLARIS  
    ifeq ($(findstring _CC, $(PEGASUS_PLATFORM)), _CC)  
       INCLUDE_FILES += Pegasus/Common/Platform_SOLARIS_CC.h  
    endif  
 endif  
   
 # CMPI header files # CMPI header files
 INCLUDE_FILES += \ INCLUDE_FILES += \
    Pegasus/Provider/CMPI/cmpift.h \    Pegasus/Provider/CMPI/cmpift.h \
Line 268 
Line 291 
             $(PEGASUS_STAGING_DIR)/$(PEGASUS_INCLUDE_DIR)/$(i)$(NL))             $(PEGASUS_STAGING_DIR)/$(PEGASUS_INCLUDE_DIR)/$(i)$(NL))
         @$(foreach i, $(INCLUDE_FILES), $(COPY) $(INCLUDE_SRCPATH)/$(i) \         @$(foreach i, $(INCLUDE_FILES), $(COPY) $(INCLUDE_SRCPATH)/$(i) \
             $(PEGASUS_STAGING_DIR)/$(PEGASUS_INCLUDE_DIR)/$(i)$(NL))             $(PEGASUS_STAGING_DIR)/$(PEGASUS_INCLUDE_DIR)/$(i)$(NL))
         @$(COPY) $(INCLUDE_SRCPATH)/Pegasus/Common/Platform_$(PEGASUS_PLATFORM).h \          @$(foreach i, $(PACKAGED_PLATFORM_FILES), \
             $(PEGASUS_STAGING_DIR)/$(PEGASUS_INCLUDE_DIR)/Pegasus/Common/Platform_$(PEGASUS_PLATFORM).h              $(COPY) $(INCLUDE_SRCPATH)/Pegasus/Common/Platform_$(i).h \
               $(PEGASUS_STAGING_DIR)/$(PEGASUS_INCLUDE_DIR)/Pegasus/Common/Platform_$(i).h$(NL))
  
 create_ProductInstallationVerificationScript: create_ProductInstallationVerificationScript:
         @$(RM) $(PEGASUS_HOME)/PegasusVerifyDevelInstall         @$(RM) $(PEGASUS_HOME)/PegasusVerifyDevelInstall
Line 306 
Line 330 
              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall$(NL))              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall$(NL))
         @$(ECHO-E) "ls -l $(PEGASUS_SAMPLES_DIR)/mak/config.mak" \         @$(ECHO-E) "ls -l $(PEGASUS_SAMPLES_DIR)/mak/config.mak" \
              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall
         @$(ECHO-E) "ls -l" \          @$(foreach i, $(PACKAGED_PLATFORM_FILES), $(ECHO-E) "ls -ld" \
              "$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak" \               "$(PEGASUS_SAMPLES_DIR)/mak/platform_$(i).mak" \
              >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall               >> $(PEGASUS_HOME)/PegasusVerifyDevelInstall$(NL))
  
 createSDKEnvVarFile: createSDKEnvVarFile:
         @$(ECHO) "ifndef PEGASUS_BIN_DIR" \         @$(ECHO) "ifndef PEGASUS_BIN_DIR" \
Line 319 
Line 343 
             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
         @$(ECHO) "ifndef PEGASUS_DEST_LIB_DIR" \         @$(ECHO) "ifndef PEGASUS_DEST_LIB_DIR" \
             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
         @$(ECHO) "   PEGASUS_DEST_LIB_DIR = $(PEGASUS_DEST_LIB_DIR)" \          @$(ECHO-E) "   PEGASUS_DEST_LIB_DIR = $(PEGASUS_DEST_LIB_DIR_3)" \
             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
         @$(ECHO) "endif" \         @$(ECHO) "endif" \
             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
         @$(ECHO) "ifndef PEGASUS_PROVIDER_LIB_DIR" \         @$(ECHO) "ifndef PEGASUS_PROVIDER_LIB_DIR" \
             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
         @$(ECHO) "   PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_LIB_DIR)" \          @$(ECHO-E) \
               "   PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_LIB_DIR_3)" \
             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
         @$(ECHO) "endif" \         @$(ECHO) "endif" \
             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
Line 378 
Line 403 
         @$(ECHO) "" \         @$(ECHO) "" \
             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
  
   createConfigFile_setPegasusPlatform:
   ifeq ($(RUNTIME_PLATFORM_TEST_NEEDED), true)
     ifeq ($(OS),linux)
           @$(ECHO-E) "   ifeq (\044(shell uname -i),ia64)" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "      PEGASUS_PLATFORM = LINUX_IA64_GNU" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "      PEGASUS_ARCH_LIB = lib" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "   endif" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "   ifeq (\044(shell uname -i),i386)" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "      PEGASUS_PLATFORM = LINUX_IX86_GNU" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "      PEGASUS_ARCH_LIB = lib" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "   endif" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "   ifeq (\044(shell uname -i),ppc)" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "      PEGASUS_PLATFORM = LINUX_PPC_GNU" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "      PEGASUS_ARCH_LIB = lib" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "   endif" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "   ifeq (\044(shell uname -i),ppc64)" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "      PEGASUS_PLATFORM = LINUX_PPC64_GNU" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "      PEGASUS_ARCH_LIB = lib64" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "   endif" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "   ifeq (\044(shell uname -i),s390)" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "      PEGASUS_PLATFORM = LINUX_ZSERIES_GNU" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "      PEGASUS_ARCH_LIB = lib" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "   endif" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "   ifeq (\044(shell uname -i),s390x)" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "      PEGASUS_PLATFORM = LINUX_ZSERIES64_GNU" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "      PEGASUS_ARCH_LIB = lib64" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "   endif" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "   ifeq (\044(shell uname -i),x86_64)" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "      PEGASUS_PLATFORM = LINUX_X86_64_GNU" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "      PEGASUS_ARCH_LIB = lib64" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO-E) "   endif" \
               >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
     endif
   else
           @$(ECHO) "   PEGASUS_PLATFORM = $(PEGASUS_PLATFORM)" \
               >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO) "   PEGASUS_DEST_LIB_DIR = $(PEGASUS_DEST_LIB_DIR)" \
               >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/config.mak
           @$(ECHO) "   PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_LIB_DIR)" \
               >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/config.mak
   endif
   
 createConfigFile: createConfigFile:
         @$(ECHO) "ifndef PEGASUS_PLATFORM" \         @$(ECHO) "ifndef PEGASUS_PLATFORM" \
             > $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/config.mak             > $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/config.mak
         @$(ECHO) "   PEGASUS_PLATFORM = $(PEGASUS_PLATFORM)" \          @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile \
             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/config.mak              createConfigFile_setPegasusPlatform
         @$(ECHO) "endif" \         @$(ECHO) "endif" \
             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/config.mak             >> $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/config.mak
         @$(ECHO) "" \         @$(ECHO) "" \
Line 411 
Line 505 
             $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/Providers/Load/$(PEGASUS_CIM_SCHEMA)/$(i)$(NL))             $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/Providers/Load/$(PEGASUS_CIM_SCHEMA)/$(i)$(NL))
         @$(foreach i, $(PROVIDERSRCPATH1FILES), $(COPY) $(PROVIDER_SRCPATH1)/$(i) \         @$(foreach i, $(PROVIDERSRCPATH1FILES), $(COPY) $(PROVIDER_SRCPATH1)/$(i) \
             $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/Providers/$(i)$(NL))             $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/Providers/$(i)$(NL))
         @$(COPY) $(CLIENT_SRCPATH1)/mak/$(PEGASUS_PLATFORM).mak \          @$(foreach i, $(PACKAGED_PLATFORM_FILES), \
             $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/$(PEGASUS_PLATFORM).mak              $(COPY) $(CLIENT_SRCPATH1)/mak/platform_$(i).mak \
               $(PEGASUS_STAGING_DIR)/$(PEGASUS_SAMPLES_DIR)/mak/platform_$(i).mak$(NL))
         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile createConfigFile         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile createConfigFile
         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile createSDKEnvVarFile         @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile createSDKEnvVarFile
  


Legend:
Removed from v.1.49  
changed lines
  Added in v.1.53

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2