X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=b12d642ebd7abb9eb29a52fcf4424025a939b65f;hp=a17955923fae85b6172dda0e5224ce3e72c1893d;hb=7b4bac1b744a407d51f0ece67e0d531206ddad0b;hpb=907e6c4c2f5e199600b54213f6964d2c50bdc700

diff --git a/src/common/main.cpp b/src/common/main.cpp
index a1795592..b12d642e 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,7 +21,7 @@
 #include <cstdlib>
 
 #ifdef BUILD_CORE
-#  include "../core/coreapplication.h"
+#  include "coreapplication.h"
 #elif defined BUILD_QTUI
 #  include "qtuiapplication.h"
 #elif defined BUILD_MONO
@@ -31,18 +31,102 @@
 #error "Something is wrong - you need to #define a build mode!"
 #endif
 
+// We don't want quasselcore to depend on KDE
+#if defined HAVE_KDE && defined BUILD_CORE
+#  undef HAVE_KDE
+#endif
+
+#ifdef HAVE_KDE
+#  include <KAboutData>
+#  include "kcmdlinewrapper.h"
+#endif
+
+#if !defined(BUILD_CORE) && defined(STATIC)
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qjpeg)
+Q_IMPORT_PLUGIN(qgif)
+#endif
+
+#include "cliparser.h"
 #include "quassel.h"
 
 int main(int argc, char **argv) {
 
-#  ifdef BUILD_CORE
+  // Setup build information and version string
+  # include "version.gen"
+  buildinfo.append(QString(",%1,%2").arg(__DATE__, __TIME__));
+  Quassel::setupBuildInfo(buildinfo);
+  QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName);
+  QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName);
+  QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain);
+
+  AbstractCliParser *cliParser;
+
+#ifdef HAVE_KDE
+  // We need to init KCmdLineArgs first
+  // TODO: build an AboutData compat class to replace our aboutDlg strings
+  KAboutData aboutData("quassel", "kdelibs4", ki18n("Quassel IRC"), Quassel::buildInfo().plainVersionString.toUtf8(),
+                        ki18n("A modern, distributed IRC client"));
+  aboutData.addLicense(KAboutData::License_GPL_V2);
+  aboutData.addLicense(KAboutData::License_GPL_V3);
+  aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8());
+  KCmdLineArgs::init(argc, argv, &aboutData);
+
+  cliParser = new KCmdLineWrapper();
+#else
+  cliParser = new CliParser();
+#endif
+  Quassel::setCliParser(cliParser);
+
+  // Initialize CLI arguments
+  // NOTE: We can't use tr() at this point, since app is not yet created
+
+  // put shared client&core arguments here
+  cliParser->addSwitch("debug",'d', "Enable debug output");
+  cliParser->addSwitch("help",'h', "Display this help and exit");
+
+#ifndef BUILD_CORE
+  // put client-only arguments here
+  cliParser->addSwitch("debugbufferswitches", 0, "Enables debugging for bufferswitches");
+  cliParser->addSwitch("debugmodel", 0, "Enables debugging for models");
+#endif
+#ifndef BUILD_QTCLIENT
+  // put core-only arguments here
+  cliParser->addOption("listen <address>[,<address[,...]]>", 0, "The address(es) quasselcore will listen on", "0.0.0.0,::");
+  cliParser->addOption("port <port>",'p', "The port quasselcore will listen at", QString("4242"));
+  cliParser->addSwitch("norestore", 'n', "Don't restore last core's state");
+  cliParser->addOption("logfile <path>", 'l', "Path to logfile");
+  cliParser->addOption("loglevel <level>", 'L', "Loglevel Debug|Info|Warning|Error", "Info");
+  cliParser->addOption("configdir <path>", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL Cert");
+  cliParser->addOption("datadir <path>", 0, "DEPRECATED - Use --configdir instead");
+  cliParser->addOption("migrate-backend <backendidentifier>", 0, "Starts an interactive session and attempts to migrate your current storage backend to the new one");
+  cliParser->addOption("select-backend <backendidentifier>", 0, "Starts an interactive session and switches your current storage backend to the new one. No migration will be done!");
+#endif
+
+#ifdef HAVE_KDE
+  // the KDE version needs this extra call to parse argc/argv before app is instantiated
+  if(!cliParser->init()) {
+    cliParser->usage();
+    return EXIT_FAILURE;
+  }
+#endif
+
+#  if defined BUILD_CORE
     CoreApplication app(argc, argv);
-#  elif BUILD_QTUI
+#  elif defined BUILD_QTUI
     QtUiApplication app(argc, argv);
-#  elif BUILD_MONO
+#  elif defined BUILD_MONO
     MonolithicApplication app(argc, argv);
 #  endif
 
+#ifndef HAVE_KDE
+  // the non-KDE version parses after app has been instantiated
+  if(!cliParser->init(app.arguments())) {
+    cliParser->usage();
+    return false;
+  }
+#endif
+
   if(!app.init()) return EXIT_FAILURE;
   return app.exec();
 }