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

Diff for /pegasus/mak/config.mak between version 1.32.4.2 and 1.44

version 1.32.4.2, 2003/08/13 19:39:49 version 1.44, 2004/01/29 21:13:44
Line 37 
Line 37 
 ifdef PEGASUS_DISPLAYCONSUMER_DIR ifdef PEGASUS_DISPLAYCONSUMER_DIR
   DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_DISPLAYCONSUMER_DIR))   DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_DISPLAYCONSUMER_DIR))
 else else
   DISPLAYCONSUMER_DIR = $(PEGASUS_HOME)    DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_HOME))
 endif endif
  
 VALID_PLATFORMS = \ VALID_PLATFORMS = \
Line 85 
Line 85 
 # Update the following two environment variables to # Update the following two environment variables to
 # change the version. # change the version.
  
 CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM27  # The environment variable PEGASUS_CIM_SCHEMA can be used
 CIM_SCHEMA_VER=27  # 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 **** # ***** CIM_SCHEMA_DIR INFO ****
 # If CIM_SCHEMA_DIR changes to use a preliminary schema which # If CIM_SCHEMA_DIR changes to use a preliminary schema which
Line 95 
Line 122 
 # experimental classes.  Since experimental classes exist the -aE # experimental classes.  Since experimental classes exist the -aE
 # option of the mof compiler needs to be set. # option of the mof compiler needs to be set.
 # ***** # *****
 ifeq ($(CIM_SCHEMA_DIR), $(PEGASUS_ROOT)/Schemas/CIMPrelim271)  
   ifdef PEGASUS_CIM_SCHEMA
     CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
     CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))
   else
     CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM27
     CIM_SCHEMA_VER=27
   endif
   
   ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))
 ALLOW_EXPERIMENTAL = -aE ALLOW_EXPERIMENTAL = -aE
 else else
 ALLOW_EXPERIMENTAL = ALLOW_EXPERIMENTAL =
Line 197 
Line 233 
   DEFINES+= -DPEGASUS_CLIENT_TRACE_ENABLE   DEFINES+= -DPEGASUS_CLIENT_TRACE_ENABLE
 endif endif
  
   # do not compile trace code. sometimes it causes problems debugging
   ifdef PEGASUS_REMOVE_TRACE
           DEFINES+= -DPEGASUS_REMOVE_TRACE
   endif
   
   # PEP 123 use monitor2 (the default) or not
   ifdef PEGASUS_USE_23HTTPMONITOR
   DEFINES+= -DPEGASUS_USE_23HTTPMONITOR
   endif
   
   # is the pegasus slp classes
   ifdef PEGASUS_SLP_CLASSES
           DEFINES+= -DPEGASUS_SLP_CLASSES
   endif
   
   # setup function to enable SLP functions in the Pegasus standard compile
   # Set the environment varaible PEGASUS_ENABLE_SLP to enable SLP code.
   ifdef PEGASUS_ENABLE_SLP
     DEFINES+= -DPEGASUS_ENABLE_SLP
   endif
   
   # compile in the experimental APIs
   DEFINES+= -DPEGASUS_USE_EXPERIMENTAL_INTERFACES
  
  
 ############################################################ ############################################################


Legend:
Removed from v.1.32.4.2  
changed lines
  Added in v.1.44

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2