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

Diff for /pegasus/mak/config.mak between version 1.38 and 1.94

version 1.38, 2003/08/20 17:30:19 version 1.94, 2005/05/19 01:58:50
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.
   #//
   #//==============================================================================
 ################################################################################ ################################################################################
 ## ##
 ## Get external environment variables. Note that all external environment ## Get external environment variables. Note that all external environment
Line 5 
Line 33 
 ## ##
 ################################################################################ ################################################################################
  
   ifndef ROOT
       ROOT =  $(subst \,/,$(PEGASUS_ROOT))
   endif
   
   ifdef PEGASUS_ENVVAR_FILE
       include $(PEGASUS_ENVVAR_FILE)
   else
       include $(ROOT)/env_var.status
   endif
   
 ifdef PEGASUS_HOME ifdef PEGASUS_HOME
   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))
 else else
   ERROR = pegasus_home_undefined      $(error PEGASUS_HOME environment variable undefined)
 pegasus_home_undefined:  
         @ echo PEGASUS_HOME environment variable undefined  
         @ exit 1  
 endif endif
  
 ifdef PEGASUS_ROOT ifdef PEGASUS_ROOT
     ROOT =  $(subst \,/,$(PEGASUS_ROOT))     ROOT =  $(subst \,/,$(PEGASUS_ROOT))
 else else
     ERROR = pegasus_root_undefined      $(error PEGASUS_ROOT environment variable undefined)
 pegasus_root_undefined:  
         @ echo PEGASUS_ROOT environment variable undefined  
         @ exit 1  
 endif endif
  
 # l10n # l10n
Line 40 
Line 72 
   DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_HOME))   DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_HOME))
 endif endif
  
 VALID_PLATFORMS = \  PLATFORM_FILES=$(wildcard $(ROOT)/mak/platform*.mak)
     WIN32_IX86_MSVC \  PLATFORM_TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES))
     LINUX_IX86_GNU \  VALID_PLATFORMS=$(subst .mak,, $(PLATFORM_TEMP))
     LINUX_PPC_GNU \  
     LINUX_IA64_GNU \  
     LINUX_ZSERIES_GNU \  
     AIX_RS_IBMCXX \  
     HPUX_PARISC_ACC \  
     HPUX_IA64_ACC \  
     TRU64_ALPHA_DECCXX \  
     SOLARIS_SPARC_GNU \  
     SOLARIS_SPARC_CC \  
     ZOS_ZSERIES_IBM \  
     NSK_NONSTOP_NMCPLUS  
  
 ifndef PEGASUS_PLATFORM ifndef PEGASUS_PLATFORM
   ERROR = pegasus_platform_undefined      $(error PEGASUS_PLATFORM environment variable undefined. Please set to\
 pegasus_platform_undefined:          one of the following:$(VALID_PLATFORMS))
         @ echo PEGASUS_PLATFORM environment variable undefined. Please set to\  
             one of the following: $(VALID_PLATFORMS)  
         @ exit 1  
 endif endif
  
 ################################################################################ ################################################################################
Line 73 
Line 91 
 # define the location for the compiled messages # define the location for the compiled messages
 MSG_ROOT = $(HOME_DIR)/msg MSG_ROOT = $(HOME_DIR)/msg
  
   #############################################################################
   ##  The following REPOSITORY_XXX variables are only used within the
   ## makefiles for building the repository (cimmofl) and running the tests.
   ## They have no effect on CIMconfig initial startup configuration.
   
   #
 # define the location for the repository # define the location for the repository
   #
   # NOTE: There is another variable efined in many of the test makefiles
   # called REPOSITORYDIR. It is a local variable in each of those Makefiles
   # to localally control where the temporay small repository they
   # build, use and then delete is located. Most of the time it is set to TMP_DIR.
   #
   
 REPOSITORY_DIR = $(HOME_DIR) REPOSITORY_DIR = $(HOME_DIR)
 REPOSITORY_ROOT = $(REPOSITORY_DIR)/repository  
   #
   # WARNING: The REPOSITORY_NAME varible is not used by all the test,
   # many of them are still hardcoded to "repository".  What this means
   # is that you can change the repository name and build it. But you
   # cannot run the test without many of them failing
   #
   
   REPOSITORY_NAME = repository
   
   
   REPOSITORY_ROOT = $(REPOSITORY_DIR)/$(REPOSITORY_NAME)
   
   # define the repository mode
   #       XML = XML format
   #       BIN = Binary format
   #
   ifndef PEGASUS_REPOSITORY_MODE
      ## set to default value
      REPOSITORY_MODE = XML
   else
      ## validate assigned value
      ifeq ($(PEGASUS_REPOSITORY_MODE),XML)
          REPOSITORY_MODE = XML
      else
        ifeq ($(PEGASUS_REPOSITORY_MODE),BIN)
         REPOSITORY_MODE = BIN
        else
         $(error PEGASUS_REPOSITORY_MODE ($(PEGASUS_REPOSITORY_MODE)) \
                    is invalid. It must be set to either XML or BIN)
        endif
      endif
   endif
   
   
   ###########################################################################
  
 # The two variables, CIM_SCHEMA_DIR and CIM_SCHEMA_VER, # The two variables, CIM_SCHEMA_DIR and CIM_SCHEMA_VER,
 # are used to control the version of the CIM Schema # are used to control the version of the CIM Schema
Line 125 
Line 191 
  
 ifdef PEGASUS_CIM_SCHEMA ifdef PEGASUS_CIM_SCHEMA
   CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)   CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
       ifeq ($(findstring $(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA))),1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 271 28),)
          CIM_SCHEMA_VER=
       else
   CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))   CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))
       endif
 else else
   CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM27      CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM29
   CIM_SCHEMA_VER=27      CIM_SCHEMA_VER=
 endif endif
  
 ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR))) ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))
Line 139 
Line 209 
  
 LEX = flex LEX = flex
  
   ## ======================================================================
   ##
   ## PEGASUS_ENABLE_SORTED_DIFF
   ## This controls if the DIFFSORT function is used rather than a simple DIFF of
   ##  of the test results files to the static results file.
   ##
   ##   Set to "true" enables the sorted diffs of results to static results files.
   ##   otherwise results in regular diffs of results to static results files.
   ##   see bug 2283 for background information concerning this config variable.
   ##
   ##  Defaults to true.
   ##
   ##
   ifndef PEGASUS_ENABLE_SORTED_DIFF
   PEGASUS_ENABLE_SORTED_DIFF=true
   endif
   
   ## ========================================================================
   ## DIFFSORT function definition
   ## Here is an example using the DIFFSORT function:
   ##
   ## difftest: FORCE
   ##      @ test > result
   ##      @ $(call DIFFSORT,result,standard_result)
   ##      @ $(ECHO) +++++ all test passed
   ##
   
   define NL
   
   
   endef
   
   DIFFSORT = $(SORT) $(1) > $(1).tmp $(NL) \
   $(SORT) $(2) > $(2).tmp $(NL) \
   $(DIFF) $(1).tmp $(2).tmp $(NL) \
   $(RM) -f $(1).tmp $(NL) \
   $(RM) -f $(2).tmp $(NL)
   
   
 ################################################################################ ################################################################################
 ## ##
 ## Attempt to include a platform configuration file: ## Attempt to include a platform configuration file:
 ## ##
 ################################################################################ ################################################################################
  
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)  PLATFORM_FILE = $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  ifneq ($(wildcard $(PLATFORM_FILE)), )
   FOUND = true      include $(PLATFORM_FILE)
   else
     $(error  PEGASUS_PLATFORM environment variable must be set to one of\
           the following:$(VALID_PLATFORMS))
   endif
   
   ################################################################################
   ##
   ##  Set up any platform independent compile conditionals by adding them to
   ##  precreated FLAGS parameter.
   ##  Assumes that the basic flags have been setup in FLAGS.
   ##  Assumes that compile time flags are controlled with -D CLI option.
   ##
   ################################################################################
   
   # Setup the conditional compile for client displays.
   #
   ifdef PEGASUS_CLIENT_TRACE_ENABLE
       DEFINES += -DPEGASUS_CLIENT_TRACE_ENABLE
   endif
   
   # Allow PEGASUS_ASSERT statements to be disabled.
   ifdef PEGASUS_NOASSERTS
       DEFINES += -DNDEBUG
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)  # do not compile trace code. sometimes it causes problems debugging
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  ifdef PEGASUS_REMOVE_TRACE
   FOUND = true      DEFINES += -DPEGASUS_REMOVE_TRACE
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_PPC_GNU)  # PEP 161
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  # Control whether utf-8 filenames are supported by the repository
   FOUND = true  ifdef PEGASUS_SUPPORT_UTF8_FILENAME
       DEFINES += -DPEGASUS_SUPPORT_UTF8_FILENAME
   
       # Control whether utf-8 filenames in the repository are escaped
       ifdef PEGASUS_REPOSITORY_ESCAPE_UTF8
           DEFINES += -DPEGASUS_REPOSITORY_ESCAPE_UTF8
       endif
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)  #
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  # PEP 142
   FOUND = true  # The following flag need to be set to enable
   # user group authorization functionality.
   #
   ifdef PEGASUS_ENABLE_USERGROUP_AUTHORIZATION
       DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_ZSERIES_GNU)  #
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  # PEP 193
   FOUND = true  # The following flag need to be set to disable
   # CQL in indication subscriptions
   #
   ifdef PEGASUS_DISABLE_CQL
       DEFINES += -DPEGASUS_DISABLE_CQL
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)  #
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  # PEP 186
   FOUND = true  # Allow override of product name/version/status.  A file
   # pegasus/src/Pegasus/Common/ProductVersion.h must exist when this
   # flag is defined.
   #
   ifdef PEGASUS_OVERRIDE_PRODUCT_ID
       DEFINES += -DPEGASUS_OVERRIDE_PRODUCT_ID
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)  #
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  # PEP 197
   FOUND = true  # Allow the Provider User Context feature to be disabled.
   #
   ifdef PEGASUS_DISABLE_PROV_USERCTXT
       DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT
   else
       ifdef PEGASUS_DISABLE_PROV_USERCTXT_REQUESTOR
           DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_REQUESTOR
       endif
       ifdef PEGASUS_DISABLE_PROV_USERCTXT_DESIGNATED
           DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_DESIGNATED
       endif
       ifdef PEGASUS_DISABLE_PROV_USERCTXT_PRIVILEGED
           DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_PRIVILEGED
       endif
       ifdef PEGASUS_DISABLE_PROV_USERCTXT_CIMSERVER
           DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_CIMSERVER
       endif
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_ACC)  # Bug 2147
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  # Allow local domain socket usage to be disabled.
   FOUND = true  ifdef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
       DEFINES += -DPEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),TRU64_ALPHA_DECCXX)  # PEP 211
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  # Controls object normalization support.
   FOUND = true  ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION
       DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_GNU)  # Allow ExecQuery functionality to be enabled
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  ifndef PEGASUS_ENABLE_EXECQUERY
   FOUND = true      DEFINES += -DPEGASUS_DISABLE_EXECQUERY
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_CC)  # Allow System Log Handler to be enabled
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  ifdef PEGASUS_ENABLE_SYSTEM_LOG_HANDLER
   FOUND = true    DEFINES += -DPEGASUS_ENABLE_SYSTEM_LOG_HANDLER
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)  # Allow Email Handler to be enabled
    include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  ifdef PEGASUS_ENABLE_EMAIL_HANDLER
    FOUND = true    DEFINES += -DPEGASUS_ENABLE_EMAIL_HANDLER
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),NSK_NONSTOP_NMCPLUS)  # setup function to enable SLP functions in the Pegasus standard compile
    include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  # Set the environment varaible PEGASUS_ENABLE_SLP to enable SLP code.
    FOUND = true  # NOTE. Effective with Bug # 2633 some platforms now enable SLP.
   # To see which platforms look for platform make files that set
   # the variable PEGASUS_ENABLE_SLP
   ifdef PEGASUS_ENABLE_SLP
       DEFINES += -DPEGASUS_ENABLE_SLP
 endif endif
  
 ifneq ($(FOUND),true)  # set PEGASUS_DEBUG into the DEFINES if it exists.
   ERROR = pegasus_unknown_platform  # Note that this flag is the general separator between
 pegasus_unknown_platform:  # debug compiles and non-debug compiles and controls both
         @ echo PEGASUS_PLATFORM environment variable must be set to one of\  # the use of any debug options on compilers and linkers
             the following: $(VALID_PLATFORMS)  # and general debug support that we want to be turned on in
         @ exit 1  # debug mode.
   ifdef PEGASUS_DEBUG
       DEFINES += -DPEGASUS_DEBUG
   
       # Indications debugging options
       ifdef PEGASUS_INDICATION_PERFINST
           DEFINES += -DPEGASUS_INDICATION_PERFINST
 endif endif
  
 ################################################################################      ifdef PEGASUS_INDICATION_HASHTRACE
 ##          DEFINES += -DPEGASUS_INDICATION_HASHTRACE
 ##  Set up any platform independent compile conditionals by adding them to      endif
 ##  precreated FLAGS parameter.  endif
 ##  Assumes that the basic flags have been setup in FLAGS.  
 ##  Assumes that compile time flags are controlled with -D CLI option.  
 ##  
 ################################################################################  
  
 # Setup the conditional compile for client displays.  # compile in the experimental APIs
 #  DEFINES += -DPEGASUS_USE_EXPERIMENTAL_INTERFACES
 ifdef PEGASUS_CLIENT_TRACE_ENABLE  
   DEFINES+= -DPEGASUS_CLIENT_TRACE_ENABLE  # Ensure that the deprecated interfaces are defined in the Pegasus libraries.
   # One may wish to disable these interfaces if binary compatibility with
   # previous Pegasus releases is not required.
   ifndef PEGASUS_DISABLE_DEPRECATED_INTERFACES
       DEFINES += -DPEGASUS_USE_DEPRECATED_INTERFACES
 endif endif
  
   # Set compile flag to control compilation of CIMOM statistics
   ifdef PEGASUS_DISABLE_PERFINST
       FLAGS += -DPEGASUS_DISABLE_PERFINST
   endif
   
   ############################################################
   #
   # Set any vendor-specific compile flags
   #
   ############################################################
   
   ifdef PEGASUS_VENDOR_HP
       DEFINES+= -DPEGASUS_VENDOR_HP
   endif
  
  
 ############################################################ ############################################################
Line 248 
Line 441 
 # #
 RMREPOSITORY = $(RMDIRHIER) RMREPOSITORY = $(RMDIRHIER)
  
   ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS
       FLAGS += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS
   endif
  
   ifdef PEGASUS_USE_RELEASE_DIRS
       FLAGS += -DPEGASUS_USE_RELEASE_DIRS
   endif
  
   # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib
   ifndef PEGASUS_DEST_LIB_DIR
       PEGASUS_DEST_LIB_DIR = lib
   endif
   
   ifeq ($(OS),VMS)
    DEFINES += -DPEGASUS_DEST_LIB_DIR="""$(PEGASUS_DEST_LIB_DIR)"""
   else
    DEFINES += -DPEGASUS_DEST_LIB_DIR=\"$(PEGASUS_DEST_LIB_DIR)\"
   endif
   
   ################################################################################
   ##
   ## Additional build flags passed in through environment variables.
   ## These flags are added to the compile/link commands.
   ##
   ################################################################################
   
   ifdef PEGASUS_EXTRA_CXX_FLAGS
       EXTRA_CXX_FLAGS = $(PEGASUS_EXTRA_CXX_FLAGS)
   endif
   
   ifdef PEGASUS_EXTRA_C_FLAGS
       EXTRA_C_FLAGS = $(PEGASUS_EXTRA_C_FLAGS)
   endif
   
   ifdef PEGASUS_EXTRA_LINK_FLAGS
       EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LINK_FLAGS)
   endif
  


Legend:
Removed from v.1.38  
changed lines
  Added in v.1.94

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2