Return to Makefile CVS log

Up to [Pegasus] / pegasus / Schemas / Pegasus / InterOp

BUG#: 2493

TITLE: Pegasus repository issues

DESCRIPTION:


BUG 2493 binary repository issues:
  Added compare xml to binary repository to unit tests
	- test is enabled on Windows and X86 Linux platforms only.
	- test should be enabled on other platforms by developers/testers
	   working on the those platforms by editing
	   the CompareRepositories Makefile.
	- Instructions are are in the Makefile documenting how to
	   enable it for a specific plaform.

  Added Files:
	src/Pegasus/Repository/tests/CompareRepositories/Makefile
	src/Pegasus/Repository/tests/CompareRepositories/CompareRepositories.cpp
  Modified Files:
  	Makefile Schemas/Pegasus/InterOp/Makefile
  	Schemas/Pegasus/Internal/Makefile
  	Schemas/Pegasus/ManagedSystem/Makefile mak/config.mak
  	src/Pegasus/Compiler/cimmofParser.cpp
  	src/Pegasus/Compiler/cimmofRepository.cpp
  	src/Pegasus/Compiler/cimmofRepository.h
  	src/Pegasus/Compiler/cimmofRepositoryInterface.cpp
  	src/Pegasus/Compiler/cimmofRepositoryInterface.h
  	src/Pegasus/Compiler/mofCompilerOptions.h
  	src/Pegasus/Compiler/cmdline/cimmof/cmdline.cpp
  	src/Pegasus/Compiler/cmdline/cimmof/cmdline.h
  	src/Pegasus/Repository/CIMRepository.cpp
  	src/Pegasus/Repository/CIMRepository.h
  	src/Pegasus/Repository/tests/Makefile
  	src/Pegasus/Server/CIMServer.cpp

# Makefile builds the Pegasus InterOp Namepspace
# ATTN: Today this makefile is implementation dependent.
#       It assumes that the repository is a set of directories
#       that can be removed by removing the directories.
#       This must be updated to an implementation independent repository
#       remove function.

ROOT = $(PEGASUS_ROOT)
include $(ROOT)/mak/config.mak
include $(ROOT)/mak/configschema.mak

# Create a single variable to control schema compile
ifdef PEGASUS_ENABLE_SLP
	PEGASUS_BUILD_INTEROP=TRUE
endif
ifndef PEGASUS_DISABLE_PERFINST
	PEGASUS_BUILD_INTEROP=TRUE
endif
# The following two variables determine the version of the Schema to
# be loaded into the Pegasus InterOp Namespace.
# Update the following two environment variables to change the version.

PG_SCHEMA_VER=20
PG_SCHEMA_DIR=VER$(PG_SCHEMA_VER)
PG_MOF_PATH=$(ROOT)/Schemas/Pegasus/InterOp/$(PG_SCHEMA_DIR)

all:

# Delete and rebuild the repository using the MOF compiler.

repository:
	@ $(ECHO) +++++ Removing existing repository named $(INTEROPNS)
	@ $(RMREPOSITORY) $(INTEROPNSDIRECTORY)
	@ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(INTEROPNS) namespace ...
	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" -N$(REPOSITORY_NAME) -M$(REPOSITORY_MODE) "-I$(CIM_SCHEMA_DIR)" -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
	@ $(ECHO) +++++ Loading CIM_Event$(CIM_SCHEMA_VER) into $(INTEROPNS) namespace ...
	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" -N$(REPOSITORY_NAME) -M$(REPOSITORY_MODE) "-I$(CIM_SCHEMA_DIR)" -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Event$(CIM_SCHEMA_VER).mof

ifdef PEGASUS_BUILD_INTEROP 
	@ $(ECHO) +++++ Loading CIM_Interop$(CIM_SCHEMA_VER) into $(INTEROPNS) namespace ...
	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" -N$(REPOSITORY_NAME) -M$(REPOSITORY_MODE) "-I$(CIM_SCHEMA_DIR)" -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Interop$(CIM_SCHEMA_VER).mof 
endif
 
	@ $(ECHO) +++++ Loading PG_InterOpSchema$(PG_SCHEMA_VER).mof into $(INTEROPNS) namespace...
	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" -N$(REPOSITORY_NAME) -M$(REPOSITORY_MODE) "-I$(PG_MOF_PATH)" -n$(INTEROPNS) $(PG_MOF_PATH)/PG_InterOpSchema$(PG_SCHEMA_VER).mof

# Bug 1222
# The following code is temporary.  These classes should be incorporated into PG_InteropSchema
# however, this cannot be done now because we cannot conditionally compile MOF.	
ifdef PEGASUS_BUILD_INTEROP 
	@ $(ECHO) +++++ Loading PG_CIMXMLCommunicationMechanism$(PG_SCHEMA_VER) into $(INTEROPNS) namespace ...
	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" -N$(REPOSITORY_NAME) -M$(REPOSITORY_MODE) "-I$(PG_MOF_PATH)" -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(PG_MOF_PATH)/PG_CIMXMLCommunicationMechanism$(PG_SCHEMA_VER).mof 
	@ $(ECHO) +++++ Loading PG_Namespace$(PG_SCHEMA_VER) into $(INTEROPNS) namespace ...
	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" -N$(REPOSITORY_NAME) -M$(REPOSITORY_MODE) "-I$(PG_MOF_PATH)" -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(PG_MOF_PATH)/PG_Namespace$(PG_SCHEMA_VER).mof
endif
	
install:
	$(MKDIRHIER) "$(LOCAL_STATE_PREFIX)"
	$(MAKE) "REPOSITORY_DIR=$(LOCAL_STATE_PREFIX)" repository

repositoryServer:
	@ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(INTEROPNS) namespace ...
	@ cimmof "-I$(CIM_SCHEMA_DIR)" -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
	@ $(ECHO) +++++ Loading CIM_Event$(CIM_SCHEMA_VER) into $(INTEROPNS) namespace ...
	@ cimmof "-I$(CIM_SCHEMA_DIR)" -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Event$(CIM_SCHEMA_VER).mof

ifdef PEGASUS_BUILD_INTEROP 
	@ $(ECHO) +++++ Loading CIM_Interop$(CIM_SCHEMA_VER) into $(INTEROPNS) namespace ...
	@ cimmof "-I$(CIM_SCHEMA_DIR)" -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Interop$(CIM_SCHEMA_VER).mof
endif

	@ $(ECHO) +++++ Loading PG_InterOpSchema$(PG_SCHEMA_VER).mof into $(INTEROPNS) namespace...
	@ cimmof "-I$(PG_MOF_PATH)" -n$(INTEROPNS) $(PG_MOF_PATH)/PG_InterOpSchema$(PG_SCHEMA_VER).mof

# Bug 1222
# The following code is temporary.  Eventually this class should be incorporated into PG_InteropSchema
# however, this cannot be done now because we cannot conditionally compile MOF.	
ifdef PEGASUS_BUILD_INTEROP 
	@ $(ECHO) +++++ Loading Loading PG_CIMXMLCommunicationMechanism$(PG_SCHEMA_VER) into $(INTEROPNS) namespace ...
	@ cimmof "-I$(PG_MOF_PATH)" -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(PG_MOF_PATH)/PG_CIMXMLCommunicationMechanism$(PG_SCHEMA_VER).mof
	@ $(ECHO) +++++ Loading Loading PG_Namespace$(PG_SCHEMA_VER) into $(INTEROPNS) namespace ...
	@ cimmof "-I$(PG_MOF_PATH)" -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(PG_MOF_PATH)/PG_Namespace$(PG_SCHEMA_VER).mof
endif

clean:
	@ $(ECHO) +++++ Removing existing CIM Repository named $(INTEROPNS)
	@ $(RMREPOSITORY) $(INTEROPNSDIRECTORY)


depend:

sub:

misc:

tests:

poststarttests:

general: