Shiboken binary now responds to the "--version" argument.

The version command line argument was previously answered by GeneratorRunner.
This commit also generally updates some CMake files.

3 files changed, 21 insertions, 3 deletions

diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index 1a2eb1f01..f3cbe0849 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -10,6 +10,7 @@ shibokennormalize.cpp
 )
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                    ${CMAKE_CURRENT_BINARY_DIR}
                     ${APIEXTRACTOR_INCLUDE_DIR}
                     ${GENERATORRUNNER_INCLUDE_DIR}
                     ${QT_INCLUDE_DIR}
@@ -23,6 +24,8 @@ target_link_libraries(shiboken_generator
                       ${GENERATORRUNNER_LIBRARY}
                       ${QT_QTCORE_LIBRARY})
 
+configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h" @ONLY)
+
 add_executable(shiboken main.cpp)
 set_target_properties(shiboken PROPERTIES OUTPUT_NAME shiboken${shiboken_SUFFIX})
 target_link_libraries(shiboken ${QT_QTCORE_LIBRARY})
diff --git a/generator/main.cpp b/generator/main.cpp
index b2f2d37ec..8545bcc9a 100644
--- a/generator/main.cpp
+++ b/generator/main.cpp
@@ -21,14 +21,22 @@
  *
  */
 
+#include "shibokenconfig.h"
+#include <iostream>
 #include <QtCore>
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
     QStringList args;
     args.append("--generator-set=shiboken");
-    for (int i = 1; i < argc; i++)
+    for (int i = 1; i < argc; i++) {
+        if (QString("--version") == argv[i]) {
+            std::cout << "shiboken v" SHIBOKEN_VERSION << std::endl;
+            std::cout << "Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies)" << std::endl;
+            return EXIT_SUCCESS;
+        }
         args.append(argv[i]);
-    return QProcess::execute("generatorrunner", args);
+    }
+    return QProcess::execute(GENERATOR_BINARY, args);
 }
 
diff --git a/generator/shibokenconfig.h.in b/generator/shibokenconfig.h.in
new file mode 100644
index 000000000..7d844a940
--- /dev/null
+++ b/generator/shibokenconfig.h.in
@@ -0,0 +1,7 @@
+#ifndef SHIBOKENCONFIG_H
+#define SHIBOKENCONFIG_H
+
+#define GENERATOR_BINARY    "@GENERATORRUNNER_BINARY@"
+#define SHIBOKEN_VERSION    "@shiboken_VERSION@"
+
+#endif