ref: refs/heads/master
commit 5ae1d161dee8636d440abaafd4fd867ec20f4dee
Author: Michael Andres
Date: Mon Oct 5 18:04:36 2009 +0200
Add deptestomatic.noui not requiring qdialogsolver or yast.
---
.gitignore | 1 +
solver/src/Makefile.am | 7 ++++++-
solver/src/deptestomatic.cc | 23 +++++++++++++++++------
3 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index 13e8395..22ea2d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,5 @@ libzypp-testsuite-tools.spec
ltmain.sh
missing
solver/src/deptestomatic.multi
+solver/src/deptestomatic.noui
stamp-h1
diff --git a/solver/src/Makefile.am b/solver/src/Makefile.am
index 3dce3b8..ceb24b8 100644
--- a/solver/src/Makefile.am
+++ b/solver/src/Makefile.am
@@ -14,7 +14,7 @@ LDADD = -lzypp -lexpat -lQtCore -lQtGui -lQt3Support -lqdialogsolver -lyui
# We're not ready for this yet.
#check_PROGRAMS = deptestomatic.multi
-noinst_PROGRAMS = deptestomatic.multi
+noinst_PROGRAMS = deptestomatic.multi deptestomatic.noui
testsuitesolversrcbindir = ${testsuitebindir}
testsuitesolversrcbin_DATA = deptestomatic.multi
@@ -24,3 +24,8 @@ deptestomatic_multi_SOURCES = \
KeyRingCallbacks.h \
XmlNode.cc \
XmlNode.h
+
+# ----
+deptestomatic_noui_SOURCES = $(deptestomatic_multi_SOURCES)
+deptestomatic_noui_CXXFLAGS = -DNOUI
+deptestomatic_noui_LDADD = -lzypp -lexpat
diff --git a/solver/src/deptestomatic.cc b/solver/src/deptestomatic.cc
index ed2282b..8def50d 100644
--- a/solver/src/deptestomatic.cc
+++ b/solver/src/deptestomatic.cc
@@ -23,16 +23,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*/
-
#include <sstream>
#include <iostream>
#include <map>
#include <set>
-#include
-#include
-#include
-#include
-#include
#include
#include <cstdlib>
#include <cstring>
@@ -87,6 +81,13 @@
#include "KeyRingCallbacks.h"
#include "XmlNode.h"
+#ifndef NOUI
+#include
+#include
+#include
+#include
+#include
+
#define YUILogComponent "example"
#include "YUILog.h"
#include "YUI.h"
@@ -95,6 +96,7 @@
#include "YLayoutBox.h"
#include "YPackageSelector.h"
#include "YEvent.h"
+#endif
using namespace std;
using namespace zypp;
@@ -1129,6 +1131,7 @@ parse_xml_trial (XmlNode_Ptr node, ResPool & pool)
cout << "Selectable '" << name << "' not valid" << endl;
}
else if (node->equals ("graphic")) {
+#ifndef NOUI
resolver->resolvePool();
QApplication app(0, NULL);
QZyppSolverDialog *dialog = new QZyppSolverDialog(resolver);
@@ -1137,7 +1140,12 @@ parse_xml_trial (XmlNode_Ptr node, ResPool & pool)
dialog->setMinimumSize ( 700, 700 );
dialog->show();
app.exec();
+#else
+ RESULT << "<graphic> is not supported by deptestomatic.noui" << endl;
+#endif
} else if (node->equals ("YOU") || node->equals ("PkgUI") ) {
+#ifndef NOUI
+
resolver->resolvePool();
YUILog::setLogFileName( "/tmp/testUI.log" );
@@ -1158,6 +1166,9 @@ parse_xml_trial (XmlNode_Ptr node, ResPool & pool)
myUI->runPkgSelection( pkgSelector );
dialog->destroy();
+#else
+ RESULT << "<YOU> or <PkgUI> are not supported by deptestomatic.noui" << endl;
+#endif
} else if (node->equals ("lock")) {
string source_alias = node->getProp ("channel");
string package_name = node->getProp ("name");
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
