summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.Release8
-rw-r--r--env_var_HPUX.status1
-rw-r--r--env_var_Linux.status1
-rw-r--r--rpm/tog-pegasus.spec2
-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
9 files changed, 47 insertions, 14 deletions
diff --git a/Makefile.Release b/Makefile.Release
index 2a51832..e029a32 100644
--- a/Makefile.Release
+++ b/Makefile.Release
@@ -103,13 +103,17 @@ PEGASUS_LIBRARIES = \
libDefaultProviderManager \
libCertificateProvider \
libpegqueryexpression \
- libpegcql \
libpegquerycommon \
- libCIMQueryCapabilitiesProvider \
libInteropProvider \
libCIMOMStatDataProvider \
libpegservice
+ifndef PEGASUS_DISABLE_CQL
+ PEGASUS_LIBRARIES += \
+ libpegcql \
+ libCIMQueryCapabilitiesProvider
+endif
+
ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER
PEGASUS_LIBRARIES += \
libCMPIProviderManager \
diff --git a/env_var_HPUX.status b/env_var_HPUX.status
index acb8731..042f357 100644
--- a/env_var_HPUX.status
+++ b/env_var_HPUX.status
@@ -14,6 +14,7 @@ PEGASUS_ENABLE_MAKE_INSTALL = yes
PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
+PEGASUS_DISABLE_CQL=true
PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
PEGASUS_ENABLE_USERGROUP_AUTHORIZATION=true
PEGASUS_HAS_PERFSTATS=true
diff --git a/env_var_Linux.status b/env_var_Linux.status
index 5489995..b35adcb 100644
--- a/env_var_Linux.status
+++ b/env_var_Linux.status
@@ -17,6 +17,7 @@ ifndef PEGASUS_STAGING_DIR
PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
endif
+PEGASUS_DISABLE_CQL=true
PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
PEGASUS_ENABLE_USERGROUP_AUTHORIZATION=true
diff --git a/rpm/tog-pegasus.spec b/rpm/tog-pegasus.spec
index c7e3a60..52722c6 100644
--- a/rpm/tog-pegasus.spec
+++ b/rpm/tog-pegasus.spec
@@ -566,9 +566,7 @@ fi
%attr(555,root,root) /opt/tog-pegasus/lib/libDefaultProviderManager.so.1
%attr(555,root,root) /opt/tog-pegasus/lib/libCertificateProvider.so.1
%attr(555,root,root) /opt/tog-pegasus/lib/libpegqueryexpression.so.1
-%attr(555,root,root) /opt/tog-pegasus/lib/libpegcql.so.1
%attr(555,root,root) /opt/tog-pegasus/lib/libpegquerycommon.so.1
-%attr(555,root,root) /opt/tog-pegasus/lib/libCIMQueryCapabilitiesProvider.so.1
%attr(555,root,root) /opt/tog-pegasus/lib/libInteropProvider.so.1
%attr(555,root,root) /opt/tog-pegasus/lib/libCIMOMStatDataProvider.so.1
%attr(555,root,root) /opt/tog-pegasus/lib/libpegservice.so.1
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 += \