summaryrefslogtreecommitdiffstats
path: root/mak
diff options
context:
space:
mode:
authorjim.wunderlich <jim.wunderlich>2005-04-29 23:06:05 +0000
committerjim.wunderlich <jim.wunderlich>2005-04-29 23:06:05 +0000
commited40e8e98a9285a87486e5c0abe7888cd30e05a9 (patch)
tree761ecb13badc5e838401030f002da4082b6362f8 /mak
parent56e79fad0b2d3465ada8e403a0d6148c7d245313 (diff)
downloadtog-pegasus-ed40e8e98a9285a87486e5c0abe7888cd30e05a9.zip
tog-pegasus-ed40e8e98a9285a87486e5c0abe7888cd30e05a9.tar.gz
tog-pegasus-ed40e8e98a9285a87486e5c0abe7888cd30e05a9.tar.xz
BUG#: 3420
TITLE: REPOSITORY_XXX build_config variables DESCRIPTION: - Removed capability to set REPOSITORY_DIR, and REPOSITORY_NAME directly from the environemnt tey remain as internal build config variables. - Added capability to use PEGASUS_REPOSITORY_MODE environment variable to set REPOSITORY_MODE build config variable after it has been validated.
Diffstat (limited to 'mak')
-rw-r--r--mak/config.mak25
1 files changed, 19 insertions, 6 deletions
diff --git a/mak/config.mak b/mak/config.mak
index 0bf859c..8b5e24b 100644
--- a/mak/config.mak
+++ b/mak/config.mak
@@ -76,9 +76,8 @@ MSG_ROOT = $(HOME_DIR)/msg
# 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.
#
-ifndef REPOSITORY_DIR
+
REPOSITORY_DIR = $(HOME_DIR)
-endif
#
# WARNING: The REPOSITORY_NAME varible is not used by all the test,
@@ -86,9 +85,9 @@ endif
# is that you can change the repository name and build it. But you
# cannot run the test without many of them failing
#
-ifndef REPOSITORY_NAME
+
REPOSITORY_NAME = repository
-endif
+
REPOSITORY_ROOT = $(REPOSITORY_DIR)/$(REPOSITORY_NAME)
@@ -96,10 +95,24 @@ REPOSITORY_ROOT = $(REPOSITORY_DIR)/$(REPOSITORY_NAME)
# XML = XML format
# BIN = Binary format
#
-ifndef REPOSITORY_MODE
-REPOSITORY_MODE = XML
+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
+ endif
endif
+
###########################################################################
# The two variables, CIM_SCHEMA_DIR and CIM_SCHEMA_VER,