pegasus/mak/config.mak - diff

Return to config.mak CVS log

Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/config.mak between version 1.72 and 1.99

version 1.72, 2005/01/27 18:57:27

version 1.99, 2005/07/19 19:05:35

Line 1

#//%2005////////////////////////////////////////////////////////////////////////

#//

#// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

#// IBM Corp.; EMC Corporation, The Open Group.

#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

#// 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

Line 45

Line 73

endif

PLATFORM_FILES=$(wildcard $(ROOT)/mak/platform*.mak)

TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES))

PLATFORM_TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES))

VALID_PLATFORMS=$(subst .mak,, $(TEMP))

VALID_PLATFORMS=$(subst .mak,, $(PLATFORM_TEMP))

ifndef PEGASUS_PLATFORM

$(error PEGASUS_PLATFORM environment variable undefined. Please set to\

Line 63

Line 91

# 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)

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

###########################################################################

# The two variables, CIM_SCHEMA_DIR and CIM_SCHEMA_VER,

# are used to control the version of the CIM Schema

Line 121

Line 197

CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))

endif

else

CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM28

CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM29

CIM_SCHEMA_VER=28

CIM_SCHEMA_VER=

endif

ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))

Line 133

Line 209

LEX = flex

################################################################################

## ======================================================================

## Default installation paths

## 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.

## Default values to install files when 'make install' is invoked.

## see bug 2283 for background information concerning this config variable.

ifndef PREFIX

## Defaults to true.

PREFIX=$(HOME_DIR)/install

endif

ifndef PEGASUS_ENABLE_SORTED_DIFF

ifndef SYSCONF_PREFIX

PEGASUS_ENABLE_SORTED_DIFF=true

SYSCONF_PREFIX=$(PREFIX)/etc

endif

ifndef LOCAL_STATE_PREFIX

LOCAL_STATE_PREFIX=$(PREFIX)/var/

endif

ifndef DEST_LIB_DIR

DEST_LIB_DIR = $(PREFIX)/lib

endif

ifndef DEST_BIN_DIR

## ========================================================================

DEST_BIN_DIR = $(PREFIX)/bin

## DIFFSORT function definition

endif

## Here is an example using the DIFFSORT function:

## difftest: FORCE

## @ test > result

## @ $(call DIFFSORT,result,standard_result)

## @ $(ECHO) +++++ all test passed

ifndef DEST_SBIN_DIR

define NL

DEST_SBIN_DIR = $(PREFIX)/sbin

endif

ifndef DEST_ETC_DIR

DEST_ETC_DIR = $(SYSCONF_PREFIX)/pegasus

endif

ifndef DEST_MAN_DIR

endef

DEST_MAN_DIR = $(PREFIX)/man

endif

ifndef DEST_VAR_DIR

DIFFSORT = $(SORT) $(1) > $(1).tmp $(NL) \

DEST_VAR_DIR = $(LOCAL_STATE_PREFIX)

$(SORT) $(2) > $(2).tmp $(NL) \

endif

$(DIFF) $(1).tmp $(2).tmp $(NL) \

$(RM) -f $(1).tmp $(NL) \

$(RM) -f $(2).tmp $(NL)

################################################################################

Line 193

Line 263

################################################################################

## Default installation macros

## 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.

################################################################################

## INSTALL_LIB creates the destination directory if missing,

## copies the library and generates the symbolic link.

ifndef INSTALL_LIBRARY

################################################################################

## These macros are also defined in the Platform_<*>.mak files.

INSTALL_LIBRARY = $(MKDIRHIER) $(DEST_LIB_DIR); $(COPY) $(FULL_LIB) $(DEST_LIB_DIR)

## PEGASUS_MAX_THREADS_PER_SVC_QUEUE

endif

## 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.

## defaults to 0 (zero)

## if set to 0 (zero)

## then the max threads per service queue is

## set to MAX_THREADS_PER_SVC_QUEUE_DEFAULT.

## if set larger than MAX_THREADS_PER_SVC_QUEUE_LIMIT

## then the max threads per service queue is

## set to MAX_THREADS_PER_SVC_QUEUE_LIMIT.

## Label Current value

## -------------------------------------- -------------

## MAX_THREADS_PER_SVC_QUEUE_LIMIT 5000

## MAX_THREADS_PER_SVC_QUEUE_DEFAULT 5

## INSTALL_PROGRAM creates the destination directory if missing and

ifdef PEGASUS_MAX_THREADS_PER_SVC_QUEUE

## copies the file.

DEFINES += -DMAX_THREADS_PER_SVC_QUEUE=$(PEGASUS_MAX_THREADS_PER_SVC_QUEUE)

ifndef INSTALL_PROGRAM

else

INSTALL_PROGRAM = $(MKDIRHIER) $(DEST_BIN_DIR); $(COPY) $(FULL_PROGRAM) $(DEST_BIN_DIR)

DEFINES += -DMAX_THREADS_PER_SVC_QUEUE=0

endif

## INSTALL_PROGRAM creates the destination directory if missing and

## copies the file.

ifndef INSTALL_SBIN_PROGRAM

INSTALL_SBIN_PROGRAM = $(MKDIRHIER) $(DEST_SBIN_DIR); $(COPY) $(FULL_PROGRAM) $(DEST_SBIN_DIR)

endif

## The rest of the macros for DEST_MAN_DIR, DEST_VAR_DIR, etc. are not provided in this file.

################################################################################

##############################################################################

## Set up any platform independent compile conditionals by adding them to

## PEGASUS_INDICATIONS_Q_THRESHOLD

## precreated FLAGS parameter.

## Assumes that the basic flags have been setup in FLAGS.

## Assumes that compile time flags are controlled with -D CLI option.

################################################################################

## Controls if indications providers are stalled if the indications

## service queue is too large.

## defaults to 0 (zero)

## It can be set to any positive value.

## If set to zero (0) 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.

Line 232

Line 345

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

Line 280

Line 398

# PEP 197

# Allow the Provider User Context feature to be disabled.

#ifdef PEGASUS_DISABLE_PROV_USERCTXT

ifdef PEGASUS_DISABLE_PROV_USERCTXT

DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT

#endif

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

# 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

Line 299

Line 459

# 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

# compile in the experimental APIs

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

ifdef PEGASUS_HAS_PERFINST

ifdef PEGASUS_DISABLE_PERFINST

FLAGS += -DPEGASUS_HAS_PERFINST

FLAGS += -DPEGASUS_DISABLE_PERFINST

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

############################################################

Line 346

Line 532

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.72
changed lines
	Added in v.1.99

No CVS admin address has been configured