summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authordenise.eckstein <denise.eckstein>2005-08-17 21:00:43 +0000
committerdenise.eckstein <denise.eckstein>2005-08-17 21:00:43 +0000
commit0ada80d3bf1bd9a5e9b646f8ea8078fd3596911f (patch)
tree7847f278f9af5d365680d6bebb18d63dcaf068ba /src
parent8aaf4925918dbbe8d91bea0ed764a457005f0977 (diff)
downloadtog-pegasus-0ada80d3bf1bd9a5e9b646f8ea8078fd3596911f.zip
tog-pegasus-0ada80d3bf1bd9a5e9b646f8ea8078fd3596911f.tar.gz
tog-pegasus-0ada80d3bf1bd9a5e9b646f8ea8078fd3596911f.tar.xz
BUG#: 4109
TITLE: Set PEGASUS_DISABLE_CQL flag for 2.5 release build DESCRIPTION: Changes required to set PEGASUS_DISABLE_CQL for the release build.
Diffstat (limited to 'src')
-rw-r--r--src/Pegasus/ProviderManager2/CMPI/Makefile6
-rw-r--r--src/Pegasus/ProviderManager2/Default/Makefile6
-rw-r--r--src/Pegasus/Query/QueryExpression/Makefile8
-rw-r--r--src/Pegasus/Query/QueryExpression/QueryExpression.cpp22
-rw-r--r--src/Server/Makefile7
5 files changed, 39 insertions, 10 deletions
diff --git a/src/Pegasus/ProviderManager2/CMPI/Makefile b/src/Pegasus/ProviderManager2/CMPI/Makefile
index c143daf..a11f0eb 100644
--- a/src/Pegasus/ProviderManager2/CMPI/Makefile
+++ b/src/Pegasus/ProviderManager2/CMPI/Makefile
@@ -50,9 +50,13 @@ LIBRARIES = \
pegquerycommon \
pegconfig \
pegwql \
- pegcql \
pegcommon
+ifndef PEGASUS_DISABLE_CQL
+ LIBRARIES += \
+ pegcql
+endif
+
SOURCES = \
CMPIProviderManagerMain.cpp \
CMPIProviderManager.cpp \
diff --git a/src/Pegasus/ProviderManager2/Default/Makefile b/src/Pegasus/ProviderManager2/Default/Makefile
index 8e370b0..66de80d 100644
--- a/src/Pegasus/ProviderManager2/Default/Makefile
+++ b/src/Pegasus/ProviderManager2/Default/Makefile
@@ -42,12 +42,16 @@ LIBRARIES = \
pegprovider \
pegprovidermanager \
pegqueryexpression \
- pegcql \
pegwql \
pegquerycommon \
pegconfig \
pegcommon
+ifndef PEGASUS_DISABLE_CQL
+ LIBRARIES += \
+ pegcql
+endif
+
SOURCES = \
DefaultProviderManagerMain.cpp \
DefaultProviderManager.cpp \
diff --git a/src/Pegasus/Query/QueryExpression/Makefile b/src/Pegasus/Query/QueryExpression/Makefile
index d9f36fd..c2100fe 100644
--- a/src/Pegasus/Query/QueryExpression/Makefile
+++ b/src/Pegasus/Query/QueryExpression/Makefile
@@ -43,8 +43,12 @@ LIBRARY = pegqueryexpression
LIBRARIES = \
pegcommon \
pegquerycommon \
- pegwql \
- pegcql
+ pegwql
+
+ifndef PEGASUS_DISABLE_CQL
+ LIBRARIES += \
+ pegcql
+endif
SOURCES = \
QueryExpression.cpp
diff --git a/src/Pegasus/Query/QueryExpression/QueryExpression.cpp b/src/Pegasus/Query/QueryExpression/QueryExpression.cpp
index 5c91fe1..383f844 100644
--- a/src/Pegasus/Query/QueryExpression/QueryExpression.cpp
+++ b/src/Pegasus/Query/QueryExpression/QueryExpression.cpp
@@ -58,6 +58,7 @@ QueryExpression::QueryExpression(String queryLang, String query, QueryContext& c
String cql("CIM:CQL");
String wql("WQL");
+#ifndef PEGASUS_DISABLE_CQL
if (queryLang == cql)
{
CQLSelectStatement* cqlss = new CQLSelectStatement(queryLang, query, ctx);
@@ -71,7 +72,9 @@ QueryExpression::QueryExpression(String queryLang, String query, QueryContext& c
_ss = cqlss;
}
- else if (queryLang == wql)
+ else
+#endif
+ if (queryLang == wql)
{
WQLSelectStatement* wqlss = new WQLSelectStatement(queryLang, query, ctx);
@@ -95,6 +98,7 @@ QueryExpression::QueryExpression(String queryLang, String query):
String cql("CIM:CQL");
String wql("WQL");
+#ifndef PEGASUS_DISABLE_CQL
if (queryLang == cql)
{
CQLSelectStatement* cqlss = new CQLSelectStatement(queryLang, query);
@@ -105,7 +109,9 @@ QueryExpression::QueryExpression(String queryLang, String query):
_ss = cqlss;
}
- else if (queryLang == wql)
+ else
+#endif
+ if (queryLang == wql)
{
WQLSelectStatement* wqlss = new WQLSelectStatement(queryLang, query);
@@ -137,13 +143,16 @@ QueryExpression::QueryExpression(const QueryExpression& expr):
String cql("CIM:CQL");
String wql("WQL");
+#ifndef PEGASUS_DISABLE_CQL
if (expr._queryLang == cql)
{
CQLSelectStatement* tempSS = dynamic_cast<CQLSelectStatement*>(expr._ss);
if (tempSS != NULL)
_ss = new CQLSelectStatement(*tempSS);
}
- else if (expr._queryLang == wql)
+ else
+#endif
+ if (expr._queryLang == wql)
{
WQLSelectStatement* tempSS = dynamic_cast<WQLSelectStatement*>(expr._ss);
if (tempSS != NULL)
@@ -172,13 +181,16 @@ QueryExpression QueryExpression::operator=(const QueryExpression& rhs)
String cql("CIM:CQL");
String wql("WQL");
+#ifndef PEGASUS_DISABLE_CQL
if (rhs._queryLang == cql)
{
CQLSelectStatement* tempSS = dynamic_cast<CQLSelectStatement*>(rhs._ss);
if (tempSS != NULL)
_ss = new CQLSelectStatement(*tempSS);
}
- else if (rhs._queryLang == wql)
+ else
+#endif
+ if (rhs._queryLang == wql)
{
WQLSelectStatement* tempSS = dynamic_cast<WQLSelectStatement*>(rhs._ss);
if (tempSS != NULL)
@@ -387,6 +399,7 @@ void QueryExpression::setQueryContext(QueryContext& inCtx)
// SelectStatement only allows this to be called once.
_ss->setQueryContext(inCtx);
+#ifndef PEGASUS_DISABLE_CQL
String cql("CIM:CQL");
if (_queryLang == cql)
@@ -400,6 +413,7 @@ void QueryExpression::setQueryContext(QueryContext& inCtx)
tempSS->applyContext();
}
}
+#endif
}
PEGASUS_NAMESPACE_END
diff --git a/src/Server/Makefile b/src/Server/Makefile
index 6d94c7a..5a3da61 100644
--- a/src/Server/Makefile
+++ b/src/Server/Makefile
@@ -44,10 +44,8 @@ LIBRARIES = \
pegauthentication \
UserAuthProvider \
pegqueryexpression \
- pegcql \
pegquerycommon \
pegwql \
- CIMQueryCapabilitiesProvider \
pegprovidermanager \
pegprovider \
pegexportserver \
@@ -56,6 +54,11 @@ LIBRARIES = \
pegcommon \
pegservice
+ifndef PEGASUS_DISABLE_CQL
+ LIBRARIES += \
+ pegcql \
+ CIMQueryCapabilitiesProvider
+endif
ifndef PEGASUS_DISABLE_PERFINST
LIBRARIES += \