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

Diff for /pegasus/mak/config.mak between version 1.92 and 1.112

version 1.92, 2005/05/12 15:27:28 version 1.112, 2005/12/16 19:44:35
Line 72 
Line 72 
     DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_HOME))     DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_HOME))
 endif endif
  
   ifdef PEGASUS_DEBUG
        PEGASUS_USE_DEBUG_BUILD_OPTIONS = 1
   endif
   
 PLATFORM_FILES=$(wildcard $(ROOT)/mak/platform*.mak) PLATFORM_FILES=$(wildcard $(ROOT)/mak/platform*.mak)
 PLATFORM_TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES)) PLATFORM_TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES))
 VALID_PLATFORMS=$(subst .mak,, $(PLATFORM_TEMP)) VALID_PLATFORMS=$(subst .mak,, $(PLATFORM_TEMP))
Line 209 
Line 213 
  
 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 ## DIFFSORT function definition
 ## Here is an example using the DIFFSORT function: ## Here is an example using the DIFFSORT function:
Line 224 
Line 245 
  
 endef endef
  
   ifndef FORCE_NOCASE
   
 DIFFSORT = $(SORT) $(1) > $(1).tmp $(NL) \ DIFFSORT = $(SORT) $(1) > $(1).tmp $(NL) \
 $(SORT) $(2) > $(2).tmp $(NL) \ $(SORT) $(2) > $(2).tmp $(NL) \
 $(DIFF) $(1).tmp $(2).tmp $(NL) \ $(DIFF) $(1).tmp $(2).tmp $(NL) \
 $(RM) -f $(1).tmp $(NL) \ $(RM) -f $(1).tmp $(NL) \
 $(RM) -f $(2).tmp $(NL) $(RM) -f $(2).tmp $(NL)
  
   else
   
   DIFFSORT = $(SORT) -f $(1) > $(1).tmp $(NL) \
   $(SORT) -f $(2) > $(2).tmp $(NL) \
   $(DIFF) -i $(1).tmp $(2).tmp $(NL) \
   $(RM) -f $(1).tmp $(NL) \
   $(RM) -f $(2).tmp $(NL)
   
   endif
   
   DIFFSORTNOCASE = $(SORT) $(1) > $(1).tmp $(NL) \
   $(SORT) $(2) > $(2).tmp $(NL) \
   $(DIFF) -i $(1).tmp $(2).tmp $(NL) \
   $(RM) -f $(1).tmp $(NL) \
   $(RM) -f $(2).tmp $(NL)
   
   #
   # The following is used to define the usage message for MakeFile
   #
   # See the pegasus/Makfile for an exampleof its usage.
   #
   USAGE = @$(ECHO) " $(1)"
  
 ################################################################################ ################################################################################
 ## ##
Line 254 
Line 299 
 ## ##
 ################################################################################ ################################################################################
  
   
   ################################################################################
   ##
   ## PEGASUS_MAX_THREADS_PER_SVC_QUEUE
   ##
   ## Controls the maximum number of threads allowed per message service queue.
   ##     It is allowed to range between 1 and MAX_THREADS_PER_SVC_QUEUE_LIMIT
   ##     as set in pegasus/src/Pegasus/Common/MessageQueueService.cpp.  If the
   ##     specified value is out of range, MAX_THREADS_PER_SVC_QUEUE_LIMIT is
   ##     used.  The default value is MAX_THREADS_PER_SVC_QUEUE_DEFAULT, as
   ##     defined in pegasus/src/Pegasus/Common/MessageQueueService.cpp.
   ##
   ##      Label                                   Current value
   ##      --------------------------------------  -------------
   ##      MAX_THREADS_PER_SVC_QUEUE_LIMIT         5000
   ##      MAX_THREADS_PER_SVC_QUEUE_DEFAULT       5
   ##
   ##
   
   ifdef PEGASUS_MAX_THREADS_PER_SVC_QUEUE
     DEFINES += -DMAX_THREADS_PER_SVC_QUEUE=$(PEGASUS_MAX_THREADS_PER_SVC_QUEUE)
   endif
   
   ##############################################################################
   ##
   ## PEGASUS_INDICATIONS_Q_THRESHOLD
   ##
   ## Controls if indications providers are stalled if the indications
   ## service queue is too large.
   ##
   ##      defaults to not set.
   ##
   ##      It can be set to any positive value.
   ##
   ## If not set providers are never stalled. This implies that the
   ## indications service queue may become as large as neccesary to hold all
   ## the indicaitons generated.
   ##
   ## If set to any value then providers are stalled by forcing them to sleep
   ## when they try to deliver an indication and the indications service queue
   ## exceeds this value. They are resumed when the queue count falls 10 percent
   ## below this value.
   ##
   ## Stall and resume log entries are made to inform the administrator
   ## the condition has occured.
   ##
   ## WARNING: This also affects the Out of Process Providers (OOP Providers)
   ##    The OOP Providers use two one way pipes for communication.
   ##    By stalling the Provider this prevents the pipe from being read
   ##    which will cause the pipe to fill up and the remote side will block.
   ##    OOP Prividers mix indications and operations on these two pipes.
   ##    This means the operations will also be blocked as a side effect of
   ##    the indications being stalled.
   ##
   ##
   
   ifdef PEGASUS_INDICATIONS_Q_THRESHOLD
     DEFINES += -DPEGASUS_INDICATIONS_Q_THRESHOLD=$(PEGASUS_INDICATIONS_Q_THRESHOLD)
   endif
   
   
 # Setup the conditional compile for client displays. # Setup the conditional compile for client displays.
 # #
 ifdef PEGASUS_CLIENT_TRACE_ENABLE ifdef PEGASUS_CLIENT_TRACE_ENABLE
Line 310 
Line 416 
 endif endif
  
 # #
   # PEP 72
   # Allow Out-of-Process Providers to be disabled by default
   #
   ifdef PEGASUS_DEFAULT_OOP_ON
     ifeq ($(PEGASUS_DEFAULT_OOP_ON),true)
       DEFINES += -DPEGASUS_DEFAULT_OOP_ON
     else
       ifneq ($(PEGASUS_DEFAULT_OOP_ON),false)
         $(error PEGASUS_DEFAULT_OOP_ON ($(PEGASUS_DEFAULT_OOP_ON)) invalid, must be true or false)
       endif
     endif
   endif
   
   #
 # PEP 197 # PEP 197
 # Allow the Provider User Context feature to be disabled. # Allow the Provider User Context feature to be disabled.
 # #
Line 357 
Line 477 
   DEFINES += -DPEGASUS_ENABLE_EMAIL_HANDLER   DEFINES += -DPEGASUS_ENABLE_EMAIL_HANDLER
 endif endif
  
 # setup function to enable SLP functions in the Pegasus standard compile  # Allow qualifiers to be disabled for instance operations
 # Set the environment varaible PEGASUS_ENABLE_SLP to enable SLP code.  ifdef PEGASUS_DISABLE_INSTANCE_QUALIFIERS
 # NOTE. Effective with Bug # 2633 some platforms now enable SLP.    DEFINES += -DPEGASUS_DISABLE_INSTANCE_QUALIFIERS
   endif
   
   # Controls snmp indication handler to use NET-SNMP to deliver trap
   ifdef PEGASUS_USE_NET_SNMP
     DEFINES += -DPEGASUS_USE_NET_SNMP
   endif
   
   #
   # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP
   #
   # PEGASUS_DISABLE_SLP has been depracated. New use model is:
   #
   # Use PEGASUS_ENABLE_SLP=true  to enable  compilation of SLP functions.
   #
   # Use PEGASUS_ENABLE_SLP=false to disable compilation of SLP functions.
   #
   # Currently (Aug. 12, 2005) Windows is the only platform that enables SLP
   # by default.
   #
   # NOTE. Effective with Bug # 2633 some platforms enable SLP.
 # To see which platforms look for platform make files that set # To see which platforms look for platform make files that set
 # the variable PEGASUS_ENABLE_SLP  # the variable PEGASUS_ENABLE_SLP.
   #
   #
   
   ifdef PEGASUS_ENABLE_SLP
     ifdef PEGASUS_DISABLE_SLP
       $(error Conflicting defines PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP both set)
     endif
   endif
   
   ifdef PEGASUS_DISABLE_SLP
       $(error PEGASUS_DISABLE_SLP has been deprecated. Please use PEGASUS_ENABLE_SLP=[true/false] )
   
   PEGASUS_ENABLE_SLP=false
   
   endif
   
 ifdef PEGASUS_ENABLE_SLP ifdef PEGASUS_ENABLE_SLP
     ifeq ($(PEGASUS_ENABLE_SLP),true)
     DEFINES += -DPEGASUS_ENABLE_SLP     DEFINES += -DPEGASUS_ENABLE_SLP
     else
       ifneq ($(PEGASUS_ENABLE_SLP),false)
         $(error PEGASUS_ENABLE_SLP ($(PEGASUS_ENABLE_SLP)) invalid, must be true or false)
       endif
     endif
 endif endif
  
 # set PEGASUS_DEBUG into the DEFINES if it exists. # set PEGASUS_DEBUG into the DEFINES if it exists.
Line 388 
Line 550 
 # compile in the experimental APIs # compile in the experimental APIs
 DEFINES += -DPEGASUS_USE_EXPERIMENTAL_INTERFACES DEFINES += -DPEGASUS_USE_EXPERIMENTAL_INTERFACES
  
   # 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
   
 # Set compile flag to control compilation of CIMOM statistics # Set compile flag to control compilation of CIMOM statistics
 ifdef PEGASUS_DISABLE_PERFINST ifdef PEGASUS_DISABLE_PERFINST
     FLAGS += -DPEGASUS_DISABLE_PERFINST     FLAGS += -DPEGASUS_DISABLE_PERFINST
 endif endif
  
   # Set compile flag to control compilation of SNIA Extensions
   ifdef PEGASUS_SNIA_EXTENSIONS
       FLAGS += -DPEGASUS_SNIA_EXTENSIONS
   endif
   
   # Allow remote CMPI functionality to be enabled
   ifdef PEGASUS_ENABLE_REMOTE_CMPI
       FLAGS += -DPEGASUS_ENABLE_REMOTE_CMPI
   endif
   
 ############################################################ ############################################################
 # #
 # Set any vendor-specific compile flags # Set any vendor-specific compile flags
Line 425 
Line 604 
     FLAGS += -DPEGASUS_USE_RELEASE_DIRS     FLAGS += -DPEGASUS_USE_RELEASE_DIRS
 endif endif
  
   ifdef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
       FLAGS += -DPEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
   endif
   
 # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib
 ifndef PEGASUS_DEST_LIB_DIR ifndef PEGASUS_DEST_LIB_DIR
     PEGASUS_DEST_LIB_DIR = lib     PEGASUS_DEST_LIB_DIR = lib
Line 438 
Line 621 
  
 ################################################################################ ################################################################################
 ## ##
   ## PEGASUS_CLASS_CACHE_SIZE
   ##
   ##     This environment variable gives the size of the class cache used by
   ##     the CIM repository. When it is undefined, the size defaults to something
   ##     relatively small (see src/Pegasus/Repository/CIMRepository.cpp). If
   ##     defined, it gives the size of the class cache. If it is 0 , the class
   ##     cache is not defined compiled in at all.
   ##
   ################################################################################
   
   ifdef PEGASUS_CLASS_CACHE_SIZE
   DEFINES += -DPEGASUS_CLASS_CACHE_SIZE=$(PEGASUS_CLASS_CACHE_SIZE)
   endif
   
   ################################################################################
   ##
 ## Additional build flags passed in through environment variables. ## Additional build flags passed in through environment variables.
 ## These flags are added to the compile/link commands. ## These flags are added to the compile/link commands.
 ## ##


Legend:
Removed from v.1.92  
changed lines
  Added in v.1.112

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2