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

Diff for /pegasus/mak/config.mak between version 1.8 and 1.91

version 1.8, 2001/04/13 21:45:00 version 1.91, 2005/04/29 23:06:05
Line 5 
Line 5 
 ## ##
 ################################################################################ ################################################################################
  
   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:  endif
         @ echo PEGASUS_HOME environment variable undefined  
         @ exit 1  ifdef PEGASUS_ROOT
       ROOT =  $(subst \,/,$(PEGASUS_ROOT))
   else
       $(error PEGASUS_ROOT environment variable undefined)
 endif endif
  
 VALID_PLATFORMS = win32_iX86_msvc linux_iX86_gnu  # l10n
   ifdef ICU_ROOT
       ICUROOT =  $(subst \,/,$(ICU_ROOT))
   endif
   
   ifdef PEGASUS_TMP
       TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
   else
       TMP_DIR = .
   endif
   
   ifdef PEGASUS_DISPLAYCONSUMER_DIR
       DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_DISPLAYCONSUMER_DIR))
   else
       DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_HOME))
   endif
   
   PLATFORM_FILES=$(wildcard $(ROOT)/mak/platform*.mak)
   PLATFORM_TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES))
   VALID_PLATFORMS=$(subst .mak,, $(PLATFORM_TEMP))
  
 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 29 
Line 58 
 OBJ_DIR = $(HOME_DIR)/obj/$(DIR) OBJ_DIR = $(HOME_DIR)/obj/$(DIR)
 BIN_DIR = $(HOME_DIR)/bin BIN_DIR = $(HOME_DIR)/bin
 LIB_DIR = $(HOME_DIR)/lib LIB_DIR = $(HOME_DIR)/lib
 REPOSITORY_ROOT = $(HOME_DIR)  
   # l10n
   # define the location for the compiled messages
   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
   #
   # 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)
   
   #
   # 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,
   # are used to control the version of the CIM Schema
   # loaded into the Pegasus Internal, InterOp,
   # root/cimv2 and various test namespaces.
   #
   # Update the following two environment variables to
   # change the version.
   
   # The environment variable PEGASUS_CIM_SCHEMA can be used
   # to change the values of CIM_SCHEMA_DIR, CIM_SCHEMA_VER
   # and ALLOW_EXPERIMENTAL.
   #
   # To use the PEGASUS_CIM_SCHEMA variable the Schema mof
   # files must be placed in the directory
   # $(PEGAUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
   #
   # The value of PEGASUS_CIM_SCHEMA must conform to the
   # following syntax:
   #
   #        CIM[Prelim]<CIM_SCHEMA_VER>
   #
   # The string "Prelim" should be included if the
   # Schema contains "Experimental" class definitions.
   #
   # The value of <CIM_SCHEMA_VER> must be the value
   # of the version string included by the DMTF as
   # part of the mof file names (e.g, CIM_Core27.mof).
   # Therefore, for example, the value of <CIM_SCHEMA_VER>
   # for CIM27 Schema directories MUST be 27.
   #
   # Examples of valid values of PEGASUS_CIM_SCHEMA
   # include CIMPrelim27, CIM27, CIMPrelim28, and CIM28.
   #
   # Note the CIMPrelim271 would NOT be a valid value
   # for PEGASUS_CIM_SCHEMA because the version string
   # portion of the mof files (e.g., CIM_Core27.mof) in
   # the CIMPrelimin271 directory is 27 not 271.
   
   # ***** CIM_SCHEMA_DIR INFO ****
   # If CIM_SCHEMA_DIR changes to use a preliminary schema which
   # has experimentals make sure and change the path below to appopriate
   # directory path.  Example:  CIMPrelim271 is preliminary and has
   # experimental classes.  Since experimental classes exist the -aE
   # option of the mof compiler needs to be set.
   # *****
   
   ifdef 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)))
       endif
   else
       CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM29
       CIM_SCHEMA_VER=
   endif
   
   ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))
       ALLOW_EXPERIMENTAL = -aE
   else
       ALLOW_EXPERIMENTAL =
   endif
  
 LEX = flex LEX = flex
  
 YACC = bison  ## ========================================================================
   ## 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)
   
  
 ################################################################################ ################################################################################
 ## ##
Line 41 
Line 209 
 ## ##
 ################################################################################ ################################################################################
  
 ifeq ($(PEGASUS_PLATFORM),win32_iX86_msvc)  PLATFORM_FILE = $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
   include $(ROOT)/mak/config-$(PEGASUS_PLATFORM).mak  ifneq ($(wildcard $(PLATFORM_FILE)), )
   FOUND = true      include $(PLATFORM_FILE)
 endif  else
     $(error  PEGASUS_PLATFORM environment variable must be set to one of\
 ifeq ($(PEGASUS_PLATFORM),linux_iX86_gnu)          the following:$(VALID_PLATFORMS))
   include $(ROOT)/mak/config-$(PEGASUS_PLATFORM).mak  endif
   FOUND = true  
 endif  ################################################################################
   ##
 ifneq ($(FOUND),true)  ##  Set up any platform independent compile conditionals by adding them to
   ERROR = pegasus_unknown_platform  ##  precreated FLAGS parameter.
 pegasus_unknown_platform:  ##  Assumes that the basic flags have been setup in FLAGS.
         @ echo PEGASUS_PLATFORM environment variable must be set to one of\  ##  Assumes that compile time flags are controlled with -D CLI option.
             the following: $(VALID_PLATFORMS)  ##
         @ exit 1  ################################################################################
   
   # 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
   
   # do not compile trace code. sometimes it causes problems debugging
   ifdef PEGASUS_REMOVE_TRACE
       DEFINES += -DPEGASUS_REMOVE_TRACE
   endif
   
   # PEP 161
   # Control whether utf-8 filenames are supported by the repository
   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
   
   #
   # PEP 142
   # The following flag need to be set to enable
   # user group authorization functionality.
   #
   ifdef PEGASUS_ENABLE_USERGROUP_AUTHORIZATION
       DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION
   endif
   
   #
   # PEP 193
   # The following flag need to be set to disable
   # CQL in indication subscriptions
   #
   ifdef PEGASUS_DISABLE_CQL
       DEFINES += -DPEGASUS_DISABLE_CQL
   endif
   
   #
   # PEP 186
   # 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
   
   #
   # PEP 197
   # 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
   
   # Bug 2147
   # Allow local domain socket usage to be disabled.
   ifdef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
       DEFINES += -DPEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
   endif
   
   # PEP 211
   # Controls object normalization support.
   ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION
       DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION
   endif
   
   # Allow ExecQuery functionality to be enabled
   ifndef PEGASUS_ENABLE_EXECQUERY
       DEFINES += -DPEGASUS_DISABLE_EXECQUERY
   endif
   
   # Allow System Log Handler to be enabled
   ifdef PEGASUS_ENABLE_SYSTEM_LOG_HANDLER
     DEFINES += -DPEGASUS_ENABLE_SYSTEM_LOG_HANDLER
   endif
   
   # Allow Email Handler to be enabled
   ifdef PEGASUS_ENABLE_EMAIL_HANDLER
     DEFINES += -DPEGASUS_ENABLE_EMAIL_HANDLER
   endif
   
   # setup function to enable SLP functions in the Pegasus standard compile
   # Set the environment varaible PEGASUS_ENABLE_SLP to enable SLP code.
   # 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
   
   # set PEGASUS_DEBUG into the DEFINES if it exists.
   # Note that this flag is the general separator between
   # debug compiles and non-debug compiles and controls both
   # the use of any debug options on compilers and linkers
   # and general debug support that we want to be turned on in
   # debug mode.
   ifdef PEGASUS_DEBUG
       DEFINES += -DPEGASUS_DEBUG
   
       # Indications debugging options
       ifdef PEGASUS_INDICATION_PERFINST
           DEFINES += -DPEGASUS_INDICATION_PERFINST
       endif
   
       ifdef PEGASUS_INDICATION_HASHTRACE
           DEFINES += -DPEGASUS_INDICATION_HASHTRACE
       endif
   endif
   
   # compile in the experimental APIs
   DEFINES += -DPEGASUS_USE_EXPERIMENTAL_INTERFACES
   
   # 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
   
   
   ############################################################
   #
   # Set up other Make Variables that depend on platform config files
   #
   ############################################################
   
   # This is temporary until we end up with a better place to
   # put this variable
   # Makefiles can do directory remove with
   # $(RMREPOSITORY) repositoryname
   #
   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 endif
   
   ifdef PEGASUS_EXTRA_LINK_FLAGS
       EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LINK_FLAGS)
   endif
   


Legend:
Removed from v.1.8  
changed lines
  Added in v.1.91

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2