summaryrefslogtreecommitdiffstats
path: root/Schemas
diff options
context:
space:
mode:
authorkumpf <kumpf>2008-09-02 17:37:16 +0000
committerkumpf <kumpf>2008-09-02 17:37:16 +0000
commite0ecb23bc385b76d1feec9d8dc5f81970c513b74 (patch)
tree68aa263c2dc509e9efde131c404dc7e735acbeb8 /Schemas
parent274c8d3e99626cc5adf91971558aab7eaeb86906 (diff)
downloadtog-pegasus-e0ecb23bc385b76d1feec9d8dc5f81970c513b74.zip
tog-pegasus-e0ecb23bc385b76d1feec9d8dc5f81970c513b74.tar.gz
tog-pegasus-e0ecb23bc385b76d1feec9d8dc5f81970c513b74.tar.xz
BUG#: 7866
TITLE: Makefiles remove partial repository contents DESCRIPTION: Remove the entire repository in the top-level 'make repository' target. Do not remove specific namespaces from the repository in lower level 'make repository' targets.
Diffstat (limited to 'Schemas')
-rw-r--r--Schemas/Pegasus/InterOp/Makefile14
-rw-r--r--Schemas/Pegasus/Internal/Makefile12
-rw-r--r--Schemas/Pegasus/ManagedSystem/Makefile20
3 files changed, 10 insertions, 36 deletions
diff --git a/Schemas/Pegasus/InterOp/Makefile b/Schemas/Pegasus/InterOp/Makefile
index 67caf12..1670038 100644
--- a/Schemas/Pegasus/InterOp/Makefile
+++ b/Schemas/Pegasus/InterOp/Makefile
@@ -28,12 +28,9 @@
#// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#//
#//==============================================================================
-# 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.
+# Makefile builds the Pegasus InterOp Namespace
+# Note: For best results, ensure that the InterOp namespace does not
+# exist before calling this Makefile.
ROOT = $(PEGASUS_ROOT)
include $(ROOT)/mak/config.mak
@@ -48,8 +45,6 @@ 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 ...
@@ -128,9 +123,6 @@ endif
clean:
- @$(ECHO) +++++ Removing existing CIM Repository named $(INTEROPNS)
- @$(RMREPOSITORY) "$(INTEROPNSDIRECTORY)"
-
depend:
diff --git a/Schemas/Pegasus/Internal/Makefile b/Schemas/Pegasus/Internal/Makefile
index e5f94e5..d8f8317 100644
--- a/Schemas/Pegasus/Internal/Makefile
+++ b/Schemas/Pegasus/Internal/Makefile
@@ -29,11 +29,8 @@
#//
#//==============================================================================
# Makefile builds the Pegasus Internal 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.
+# Note: For best results, ensure that the Internal namespace does not
+# exist before calling this Makefile.
ROOT = $(PEGASUS_ROOT)
include $(ROOT)/mak/config.mak
@@ -52,8 +49,6 @@ all:
# Delete and rebuild the repository using the MOF compiler.
repository:
- @ $(ECHO) +++++ Removing existing repository named $(INTERNALNS)
- @ $(RMREPOSITORY) "$(INTERNALNSDIRECTORY)"
@ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(INTERNALNS) namespace ...
@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTERNALNS)" "$(CIM_SCHEMA_DIR)/Core$(CIM_SCHEMA_VER)_Qualifiers.mof"
@ $(ECHO) +++++ Loading PG_InternalSchema$(PG_SCHEMA_VER).mof into $(INTERNALNS) namespace...
@@ -75,9 +70,6 @@ ifeq ($(PEGASUS_ENABLE_SLP),true)
endif
clean:
- @ $(ECHO) +++++ Removing existing CIM Repository named $(REPOSITORY_ROOT)
- @ $(RMREPOSITORY) "$(INTERNALNSDIRECTORY)"
-
depend:
diff --git a/Schemas/Pegasus/ManagedSystem/Makefile b/Schemas/Pegasus/ManagedSystem/Makefile
index d4959e7..f3269c0 100644
--- a/Schemas/Pegasus/ManagedSystem/Makefile
+++ b/Schemas/Pegasus/ManagedSystem/Makefile
@@ -28,12 +28,9 @@
#// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#//
#//==============================================================================
-# Makefile builds a Managed System 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.
+# Makefile builds a ManagedSystem Namespace
+# Note: For best results, ensure that the ManagedSystem namespace does not
+# exist before calling this Makefile.
ROOT = $(PEGASUS_ROOT)
include $(ROOT)/mak/config.mak
@@ -64,8 +61,6 @@ endif
ifeq ($(MANAGEDSYSTEM_NS_SUPPORTED),true)
repository:
- @ $(ECHO) +++++ Removing existing repository named $(MANAGEDSYSTEMNS)
- @ $(RMREPOSITORY) "$(MANAGEDSYSTEMNSDIRECTORY)"
@ $(ECHO) +++++ Loading CIM_Schema$(CIM_SCHEMA_VER) into $(MANAGEDSYSTEMNS) namespace ...
@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(MANAGEDSYSTEMNS)" $(ALLOW_EXPERIMENTAL) "$(CIM_SCHEMA_DIR)/CIM_Schema$(CIM_SCHEMA_VER).mof"
@ $(ECHO) +++++ Loading PG_Events$(PG_INTEROP_SCHEMA_VER) into $(MANAGEDSYSTEMNS) namespace ...
@@ -116,19 +111,14 @@ ifeq ($(PEGASUS_ENABLE_SLP),true)
@ $(ECHO) +++++ Registering the SLPProvider in $(MANAGEDSYSTEMNS) namespace ...
@ cimmof "-I$(PG_MOF_PATH)" "-n$(INTEROPNS)" "$(PG_MOF_PATH)/PG_SLPProvider$(PG_SCHEMA_VER)R.mof"
endif
-
-clean:
- @ $(ECHO) +++++ Removing existing Repository named $(MANAGEDSYSTEMNS)
- @ $(RMREPOSITORY) "$(MANAGEDSYSTEMNSDIRECTORY)"
else
repository:
@ $(ECHO) +++++ No Managed System Namespace defined for this platform ++++
-
-clean:
-
endif
+clean:
+
depend:
sub: