Merge lp:~jonnor/smoke-gobject/856878 into lp:smoke-gobject

[Jon Nordby]

Proposed fix for bug #856878

Note that parallel make in modules can still fail; cross-module dependencies are not tracked properly yet.

[Jon Nordby (jonnor)]

Pretty clear improvement to current situation, so I merged it.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-09-22 17:22:15 +0000
+++ .bzrignore	2011-09-25 21:38:17 +0000
@@ -11,9 +11,10 @@
 ./tests/codegen/tst_codegen
 ./tests/everything/tst_everything
 ./tests/gimarshallingtests/tst_gimarshallingtests
-./tests/helloworld/helloworld
 ./tools/dumper/gi_dumper
 ./tools/gsmokegen/gsmokegen
 
+./modules/tests/helloworld/helloworld
 ./modules/*/*.cpp
 ./modules/*/*.h
+

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-08-14 08:33:47 +0000
+++ CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -4,11 +4,30 @@
 find_package(Qt4)
 find_package(PkgConfig)
 pkg_check_modules(GLIB2 REQUIRED glib-2.0)
+pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
 pkg_check_modules(GOBJECT-INTROSPECTION REQUIRED gobject-introspection-1.0)
 
+
 set(GSMOKE_GEN_BIN ${CMAKE_BINARY_DIR}/tools/gsmokegen/gsmokegen)
+set(GSMOKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/src)
+set(GSMOKE_BINARY_DIR ${CMAKE_BINARY_DIR}/src)
+
+set(GSMOKE_INCLUDES ${GLIB2_INCLUDE_DIRS}
+		 	 ${GOBJECT-INTROSPECTION_INCLUDE_DIRS}
+		 	 ${QT_INCLUDES})
+
+set(GSMOKE_LIBS
+    gio-2.0
+    gobject-2.0
+    gmodule-2.0
+    ${GLIB2_LIBRARIES}
+    ffi
+    ${QT_QTCORE_LIBRARY}
+    girepository-1.0)
+
+configure_file(GSmokeConfig.cmake.in "${CMAKE_BINARY_DIR}/GSmokeConfig.cmake" @ONLY )
 
 add_subdirectory(src)
 add_subdirectory(tools)
-add_subdirectory(modules)
 add_subdirectory(tests)
+# modules is built separately

=== added file 'GSmokeConfig.cmake.in'
--- GSmokeConfig.cmake.in	1970-01-01 00:00:00 +0000
+++ GSmokeConfig.cmake.in	2011-09-25 21:38:17 +0000
@@ -0,0 +1,15 @@
+# - Config file for the GSmoke package
+# It defines the following variables
+#  GSMOKE_INCLUDE_DIRS     - include directories for GSmoke
+#  GSMOKE_LIBRARIES        - libraries to link against
+#  GSMOKE_GEN_EXECUTABLE   - the module generator executable
+#
+# Note: currently only supports in-tree builds
+
+set(GSMOKE_INCLUDE_DIRS
+  "@GSMOKE_SOURCE_DIR@"
+  "@GSMOKE_BINARY_DIR@")
+set(GSMOKE_LIBRARIES "@GSMOKE_LIBS@" gsmoke)
+set(GSMOKE_GEN_EXECUTABLE "@GSMOKE_GEN_BIN@")
+set(GSMOKE_LIBRARY_DIRS
+   "@GSMOKE_BINARY_DIR@")

=== modified file 'README'
--- README	2011-07-14 07:57:32 +0000
+++ README	2011-09-25 21:38:17 +0000
@@ -25,6 +25,11 @@
 called 'build' in the source tree, and then type 'cmake ..' from
 there
 
+Modules need to be built separately, after having built the toplevel.
+  cd modules
+  cmake .
+  make
+
 Testing
 =======
 In build/tests/gimarshallingtests use the following command:
@@ -49,4 +54,4 @@
 generator.generate("Gio");
 
 This will generate the C++ source files for the Gio namespace and all
-the classes within it
\ No newline at end of file
+the classes within it

=== added file 'gsmoke_module_gen.cmake'
--- gsmoke_module_gen.cmake	1970-01-01 00:00:00 +0000
+++ gsmoke_module_gen.cmake	2011-09-25 21:38:17 +0000
@@ -0,0 +1,56 @@
+MACRO(GSMOKE_MODULE_GEN LIB_NAME GI_NAME EXTRA_FILES)
+# Macro for generating a gsmoke module
+# Arguments - 
+#   LIB_NAME          - The library name. Example: gtk
+#   GI_NAME           - The GObject instrospection name. Example: Gtk
+#   EXTRA_FILES       - Extra files (not generated) that should be included
+#   EXCLUDE           - Path to an exclude file
+
+# FIXME: make exclude optional
+
+set(EXCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/exclude.txt)
+
+execute_process(COMMAND ${GSMOKE_GEN_EXECUTABLE}
+               --list-files -o ${CMAKE_CURRENT_BINARY_DIR} -e ${EXCLUDE} ${GI_NAME}
+               OUTPUT_VARIABLE GENERATED)
+
+string(REPLACE \n " " GENERATED_FILES ${GENERATED})
+
+string(REPLACE \n " " GENERATED_FILES_TEMP ${GENERATED})
+separate_arguments(GENERATED_FILES_TEMP)
+
+foreach(FILE ${GENERATED_FILES_TEMP})
+	if (FILE MATCHES .*.cpp)
+		list(APPEND GENERATED_FILES_CPP ${FILE})
+	endif (FILE MATCHES .*.cpp)
+endforeach(FILE)
+
+
+set_source_files_properties(${GENERATED_FILES_CPP}
+                            PROPERTIES GENERATED true)
+
+SET(SOURCES
+    ${EXTRA_FILES}
+    ${GENERATED_FILES_CPP}
+)
+
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}/.. # For other modules
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${GSMOKE_INCLUDE_DIRS}
+)
+
+link_directories(${GSMOKE_LIBRARY_DIRS})
+
+add_custom_command(OUTPUT ${GENERATED_FILES_CPP}
+    COMMAND ${GSMOKE_GEN_EXECUTABLE}
+    ARGS -o ${CMAKE_CURRENT_BINARY_DIR} -e ${EXCLUDE} ${GI_NAME}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+add_library(smoke${LIB_NAME} SHARED ${SOURCES})
+
+target_link_libraries(smoke${LIB_NAME}
+    ${GSMOKE_LIBRARIES}
+)
+
+ENDMACRO(GSMOKE_MODULE_GEN LIB_NAME GI_NAME EXTRA_FILES)

=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt	2011-08-14 12:58:51 +0000
+++ modules/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,3 +1,17 @@
+
+cmake_minimum_required(VERSION 2.6)
+
+find_package(Qt4)
+find_package(PkgConfig)
+pkg_check_modules(GOBJECT2 REQUIRED gobject-2.0)
+pkg_check_modules(GOBJECT-INTROSPECTION REQUIRED gobject-introspection-1.0)
+
+SET(CMAKE_MODULE_PATH ../)
+SET(GSmoke_DIR ../)
+
+find_package(GSmoke REQUIRED)
+include(gsmoke_module_gen)
+
 add_subdirectory(glib)
 add_subdirectory(cairo)
 add_subdirectory(gobject)
@@ -13,3 +27,4 @@
 add_subdirectory(json)
 add_subdirectory(clutter)
 
+add_subdirectory(tests)

=== modified file 'modules/atk/CMakeLists.txt'
--- modules/atk/CMakeLists.txt	2011-08-15 16:23:02 +0000
+++ modules/atk/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,28 +1,2 @@
 
-FILE(GLOB ATK_CPP "${CMAKE_CURRENT_BINARY_DIR}/*.cpp")
-
-SET(smokeatk_LIB_SRCS 
-    atk.cpp
-    ${ATK_CPP}
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/modules
-    ${QT_INCLUDES}
-)
-
-add_custom_command(OUTPUT atk.cpp
-    COMMAND gsmokegen
-    ARGS  -o ${CMAKE_CURRENT_BINARY_DIR}
-         Atk
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(smokeatk SHARED ${smokeatk_LIB_SRCS})
-
-target_link_libraries(smokeatk
-    ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-    gsmoke
-)
+GSMOKE_MODULE_GEN(atk Atk "")

=== modified file 'modules/cairo/CMakeLists.txt'
--- modules/cairo/CMakeLists.txt	2011-08-15 16:23:02 +0000
+++ modules/cairo/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,28 +1,2 @@
 
-FILE(GLOB CAIRO_CPP "${CMAKE_CURRENT_BINARY_DIR}/*.cpp")
-
-SET(smokecairo_LIB_SRCS 
-    cairo.cpp
-    ${CAIRO_CPP}
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/modules
-    ${QT_INCLUDES}
-)
-
-add_custom_command(OUTPUT cairo.cpp
-    COMMAND gsmokegen
-    ARGS  -o ${CMAKE_CURRENT_BINARY_DIR}
-         cairo
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(smokecairo SHARED ${smokecairo_LIB_SRCS})
-
-target_link_libraries(smokecairo 
-    ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-    gsmoke
-)
+GSMOKE_MODULE_GEN(cairo cairo "")

=== modified file 'modules/clutter/CMakeLists.txt'
--- modules/clutter/CMakeLists.txt	2011-08-15 16:23:02 +0000
+++ modules/clutter/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,28 +1,2 @@
 
-FILE(GLOB CLUTTER_CPP "${CMAKE_CURRENT_BINARY_DIR}/*.cpp")
-
-SET(smokeclutter_LIB_SRCS 
-    clutter.cpp
-    ${CLUTTER_CPP}
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/modules
-    ${QT_INCLUDES}
-)
-
-add_custom_command(OUTPUT clutter.cpp
-    COMMAND gsmokegen
-    ARGS  -o ${CMAKE_CURRENT_BINARY_DIR} -e ${CMAKE_CURRENT_SOURCE_DIR}/exclude.txt
-         Clutter
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(smokeclutter SHARED ${smokeclutter_LIB_SRCS})
-
-target_link_libraries(smokeclutter
-    ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-    gsmoke
-)
+GSMOKE_MODULE_GEN(clutter Clutter "")

=== modified file 'modules/cogl/CMakeLists.txt'
--- modules/cogl/CMakeLists.txt	2011-08-15 16:23:02 +0000
+++ modules/cogl/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,28 +1,3 @@
 
-FILE(GLOB COGL_CPP "${CMAKE_CURRENT_BINARY_DIR}/*.cpp")
-
-SET(smokecogl_LIB_SRCS 
-    cogl.cpp
-    ${COGL_CPP}
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/modules
-    ${QT_INCLUDES}
-)
-
-add_custom_command(OUTPUT cogl.cpp
-    COMMAND gsmokegen
-    ARGS  -o ${CMAKE_CURRENT_BINARY_DIR}
-         Cogl
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(smokecogl SHARED ${smokecogl_LIB_SRCS})
-
-target_link_libraries(smokecogl
-    ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-    gsmoke
-)
+GSMOKE_MODULE_GEN(cogl Cogl "")
+

=== modified file 'modules/gdk/CMakeLists.txt'
--- modules/gdk/CMakeLists.txt	2011-09-22 14:41:13 +0000
+++ modules/gdk/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,28 +1,3 @@
 
-FILE(GLOB GDK_CPP "${CMAKE_CURRENT_BINARY_DIR}/*.cpp")
-
-SET(smokegdk_LIB_SRCS 
-    gdk.cpp
-    ${GDK_CPP}
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/modules
-    ${QT_INCLUDES}
-)
-
-add_custom_command(OUTPUT gdk.cpp
-    COMMAND gsmokegen
-    ARGS  -o ${CMAKE_CURRENT_BINARY_DIR}
-         Gdk
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(smokegdk SHARED ${smokegdk_LIB_SRCS})
-
-target_link_libraries(smokegdk 
-    ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-    gsmoke
-)
+GSMOKE_MODULE_GEN(gdk Gdk "")
+

=== modified file 'modules/gdkpixbuf/CMakeLists.txt'
--- modules/gdkpixbuf/CMakeLists.txt	2011-08-15 16:23:02 +0000
+++ modules/gdkpixbuf/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,28 +1,3 @@
 
-FILE(GLOB GDKPIXBUF_CPP "${CMAKE_CURRENT_BINARY_DIR}/*.cpp")
-
-SET(smokegdkpixbuf_LIB_SRCS 
-    gdkpixbuf.cpp
-    ${GDKPIXBUF_CPP}
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/modules
-    ${QT_INCLUDES}
-)
-
-add_custom_command(OUTPUT gdkpixbuf.cpp
-    COMMAND gsmokegen
-    ARGS  -o ${CMAKE_CURRENT_BINARY_DIR}
-         GdkPixbuf
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(smokegdkpixbuf SHARED ${smokegdkpixbuf_LIB_SRCS})
-
-target_link_libraries(smokegdkpixbuf 
-    ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-    gsmoke
-)
+GSMOKE_MODULE_GEN(gdkpixbuf GdkPixbuf "")
+

=== modified file 'modules/gio/CMakeLists.txt'
--- modules/gio/CMakeLists.txt	2011-08-15 16:23:02 +0000
+++ modules/gio/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,28 +1,2 @@
 
-FILE(GLOB GIO_CPP "${CMAKE_CURRENT_BINARY_DIR}/*.cpp")
-
-SET(smokegio_LIB_SRCS 
-    gio.cpp
-    ${GIO_CPP}
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/modules
-    ${QT_INCLUDES}
-)
-
-add_custom_command(OUTPUT gio.cpp
-    COMMAND gsmokegen
-    ARGS  -o ${CMAKE_CURRENT_BINARY_DIR} -e ${CMAKE_CURRENT_SOURCE_DIR}/exclude.txt
-         Gio
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(smokegio SHARED ${smokegio_LIB_SRCS})
-
-target_link_libraries(smokegio
-    ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-    gsmoke
-)
+GSMOKE_MODULE_GEN(gio Gio "")

=== modified file 'modules/gl/CMakeLists.txt'
--- modules/gl/CMakeLists.txt	2011-08-15 16:23:02 +0000
+++ modules/gl/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,28 +1,2 @@
 
-FILE(GLOB GL_CPP "${CMAKE_CURRENT_BINARY_DIR}/*.cpp")
-
-SET(smokegl_LIB_SRCS 
-    gl.cpp
-    ${GL_CPP}
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/modules
-    ${QT_INCLUDES}
-)
-
-add_custom_command(OUTPUT gl.cpp
-    COMMAND gsmokegen
-    ARGS  -o ${CMAKE_CURRENT_BINARY_DIR}
-         GL
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(smokegl SHARED ${smokegl_LIB_SRCS})
-
-target_link_libraries(smokegl
-    ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-    gsmoke
-)
+GSMOKE_MODULE_GEN(gl GL "")

=== modified file 'modules/glib/CMakeLists.txt'
--- modules/glib/CMakeLists.txt	2011-09-22 14:41:13 +0000
+++ modules/glib/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,28 +1,2 @@
 
-FILE(GLOB GLIB_CPP "${CMAKE_CURRENT_BINARY_DIR}/*.cpp")
-
-SET(smokeglib_LIB_SRCS 
-    glib.cpp
-    ${GLIB_CPP}
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/modules
-    ${QT_INCLUDES}
-)
-
-add_custom_command(OUTPUT glib.cpp
-    COMMAND gsmokegen
-    ARGS  -o ${CMAKE_CURRENT_BINARY_DIR}
-         GLib
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(smokeglib SHARED ${smokeglib_LIB_SRCS})
-
-target_link_libraries(smokeglib 
-    ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-    gsmoke
-)
+GSMOKE_MODULE_GEN(glib GLib "")

=== modified file 'modules/gmodule/CMakeLists.txt'
--- modules/gmodule/CMakeLists.txt	2011-08-15 16:23:02 +0000
+++ modules/gmodule/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,28 +1,3 @@
 
-FILE(GLOB GMODULE_CPP "${CMAKE_CURRENT_BINARY_DIR}/*.cpp")
-
-SET(smokegmodule_LIB_SRCS 
-    gmodule.cpp
-    ${GMODULE_CPP}
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/modules
-    ${QT_INCLUDES}
-)
-
-add_custom_command(OUTPUT gmodule.cpp
-    COMMAND gsmokegen
-    ARGS  -o ${CMAKE_CURRENT_BINARY_DIR}
-         GModule
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(smokegmodule SHARED ${smokegmodule_LIB_SRCS})
-
-target_link_libraries(smokegmodule 
-    ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-    gsmoke
-)
\ No newline at end of file
+
+GSMOKE_MODULE_GEN(gmodule GModule "")

=== modified file 'modules/gobject/CMakeLists.txt'
--- modules/gobject/CMakeLists.txt	2011-08-15 16:23:02 +0000
+++ modules/gobject/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,28 +1,2 @@
 
-FILE(GLOB GOBJECT_CPP "${CMAKE_CURRENT_BINARY_DIR}/*.cpp")
-
-SET(smokegobject_LIB_SRCS 
-    gobject.cpp
-    ${GOBJECT_CPP}
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/modules
-    ${QT_INCLUDES}
-)
-
-add_custom_command(OUTPUT gobject.cpp
-    COMMAND gsmokegen
-    ARGS  -o ${CMAKE_CURRENT_BINARY_DIR}
-         GObject
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(smokegobject SHARED ${smokegobject_LIB_SRCS})
-
-target_link_libraries(smokegobject 
-    ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-    gsmoke
-)
+GSMOKE_MODULE_GEN(gobject GObject "")

=== modified file 'modules/gtk/CMakeLists.txt'
--- modules/gtk/CMakeLists.txt	2011-08-15 16:23:02 +0000
+++ modules/gtk/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,29 +1,2 @@
 
-FILE(GLOB GTK_CPP "${CMAKE_CURRENT_BINARY_DIR}/*.cpp")
-
-SET(smokegtk_LIB_SRCS 
-    gtk.cpp
-    gtkinit.cpp
-    ${GTK_CPP}
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/modules
-    ${QT_INCLUDES}
-)
-
-add_custom_command(OUTPUT gtk.cpp
-    COMMAND gsmokegen
-    ARGS  -o ${CMAKE_CURRENT_BINARY_DIR}
-         Gtk
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(smokegtk SHARED ${smokegtk_LIB_SRCS})
-
-target_link_libraries(smokegtk 
-    ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-    gsmoke
-)
\ No newline at end of file
+GSMOKE_MODULE_GEN(gtk Gtk gtkinit.cpp)

=== modified file 'modules/json/CMakeLists.txt'
--- modules/json/CMakeLists.txt	2011-08-15 16:23:02 +0000
+++ modules/json/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,28 +1,1 @@
-
-FILE(GLOB JSON_CPP "${CMAKE_CURRENT_BINARY_DIR}/*.cpp")
-
-SET(smokejson_LIB_SRCS 
-    json.cpp
-    ${JSON_CPP}
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/modules
-    ${QT_INCLUDES}
-)
-
-add_custom_command(OUTPUT json.cpp
-    COMMAND gsmokegen
-    ARGS  -o ${CMAKE_CURRENT_BINARY_DIR}
-         Json
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(smokejson SHARED ${smokejson_LIB_SRCS})
-
-target_link_libraries(smokejson
-    ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-    gsmoke
-)
+GSMOKE_MODULE_GEN(json Json "")

=== modified file 'modules/pango/CMakeLists.txt'
--- modules/pango/CMakeLists.txt	2011-08-15 16:23:02 +0000
+++ modules/pango/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,28 +1,2 @@
 
-FILE(GLOB PANGO_CPP "${CMAKE_CURRENT_BINARY_DIR}/*.cpp")
-
-SET(smokepango_LIB_SRCS 
-    pango.cpp
-    ${PANGO_CPP}
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/modules
-    ${QT_INCLUDES}
-)
-
-add_custom_command(OUTPUT pango.cpp
-    COMMAND gsmokegen
-    ARGS  -o ${CMAKE_CURRENT_BINARY_DIR}
-         Pango
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(smokepango SHARED ${smokepango_LIB_SRCS})
-
-target_link_libraries(smokepango 
-    ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-    gsmoke
-)
\ No newline at end of file
+GSMOKE_MODULE_GEN(pango Pango "")

=== added directory 'modules/tests'
=== added file 'modules/tests/CMakeLists.txt'
--- modules/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ modules/tests/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(helloworld)

=== renamed directory 'tests/helloworld' => 'modules/tests/helloworld'
=== modified file 'modules/tests/helloworld/CMakeLists.txt'
--- tests/helloworld/CMakeLists.txt	2011-08-15 15:29:10 +0000
+++ modules/tests/helloworld/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -14,14 +14,13 @@
     myobject.cpp
 )
 
+link_directories(${GSMOKE_LIBRARY_DIRS})
+
 include_directories(
-    # ${GLIB2_INCLUDE_DIRS}
     ${QT_INCLUDES}
-    # ${GOBJECT-INTROSPECTION_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_SOURCE_DIR}/tests/helloworld
-    ${CMAKE_BINARY_DIR}/modules
-    ${CMAKE_SOURCE_DIR}/modules
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}
+    ${GSMOKE_INCLUDE_DIRS}
 )
 
 #qt4_automoc(${helloworld_SRCS})
@@ -31,10 +30,7 @@
 
 target_link_libraries(  helloworld
     ${QT_QTCORE_LIBRARY}
-    gobject-2.0
-    glib-2.0
-#   gtk-2.0
-    gsmoke
+    ${GSMOKE_LIBRARIES}
     smokeatk
     smokecairo
     smokegdkpixbuf

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2011-08-13 15:52:51 +0000
+++ src/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -15,22 +15,11 @@
     utils.cpp
     )
 
-include_directories( ${GLIB2_INCLUDE_DIRS}
-                     ${GOBJECT-INTROSPECTION_INCLUDE_DIRS}
-                     ${QT_INCLUDES}
-                     )
+include_directories(${GSMOKE_INCLUDES})
 
 add_library(gsmoke SHARED ${gsmoke_SRCS})
 
-target_link_libraries(  gsmoke
-    gio-2.0
-    gobject-2.0
-    gmodule-2.0
-    ${GLIB2_LIBRARIES}
-    ffi
-    ${QT_QTCORE_LIBRARY}
-    girepository-1.0
-    )
+target_link_libraries(gsmoke ${GSMOKE_LIBS})
 
 # A bit early to install yet..
 # INSTALL(TARGETS gsmoke DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2011-08-13 09:44:01 +0000
+++ tests/CMakeLists.txt	2011-09-25 21:38:17 +0000
@@ -1,5 +1,4 @@
 add_subdirectory(libs)
 add_subdirectory(codegen)
-add_subdirectory(helloworld)
 add_subdirectory(everything)
 add_subdirectory(gimarshallingtests)

=== modified file 'tools/gsmokegen/cppgenerator.cpp'
--- tools/gsmokegen/cppgenerator.cpp	2011-08-15 14:37:24 +0000
+++ tools/gsmokegen/cppgenerator.cpp	2011-09-25 21:38:17 +0000
@@ -648,7 +648,26 @@
     header() << "    };" << endl << endl;
 }
 
-void CppGenerator::generateClass(const QByteArray& classPath, int classId)
+void CppGenerator::generateClass(const QByteArray& classPath, int classId, GenerationMode mode)
+{
+    QByteArray headerFilename(classPath + ".h");
+    headerFilename.replace("::", "_");
+    headerFilename = headerFilename.toLower();
+    QFile headerFile(m_directory.absolutePath() + QDir::separator() + QString::fromUtf8(headerFilename));
+
+    QByteArray cppFilename(classPath + ".cpp");
+    cppFilename.replace("::", "_");
+    cppFilename = cppFilename.toLower();
+    QFile cppFile(m_directory.absolutePath() + QDir::separator() + QString::fromUtf8(cppFilename));
+
+    m_generatedFiles << headerFile.fileName() << cppFile.fileName();
+
+    if (mode == GenerateCode) {
+        generateClassCode(classPath, classId, headerFile, cppFile);
+    }
+}
+
+void CppGenerator::generateClassCode(const QByteArray& classPath, int classId, QFile& headerFile, QFile& cppFile)
 {
     const QMetaObject *meta = Smoke::GObjectNamespace::findMetaObject(classPath);
     if (meta == 0) {
@@ -658,25 +677,15 @@
 
     QByteArray className = classPath.mid(classPath.lastIndexOf(":") + 1);
 
-    QByteArray headerFilename(classPath + ".h");
-    headerFilename.replace("::", "_");
-    headerFilename = headerFilename.toLower();
-    QFile headerFile(m_directory.absolutePath() + QDir::separator() + QString::fromUtf8(headerFilename));
-
     if (!headerFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        qWarning() << Q_FUNC_INFO << "File open failed:" << headerFilename;
+        qWarning() << Q_FUNC_INFO << "File open failed:" << headerFile.fileName();
         return;
     }
 
     m_header = new QTextStream(&headerFile);
 
-    QByteArray cppFilename(classPath + ".cpp");
-    cppFilename.replace("::", "_");
-    cppFilename = cppFilename.toLower();
-    QFile cppFile(m_directory.absolutePath() + QDir::separator() + QString::fromUtf8(cppFilename));
-
     if (!cppFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        qWarning() << Q_FUNC_INFO << "File open failed:" << cppFilename;
+        qWarning() << Q_FUNC_INFO << "File open failed:" << cppFile.fileName();
         return;
     }
 
@@ -704,7 +713,7 @@
         header() << "#include <" << superclassHeader << ">" << endl << endl;
     }
 
-    cpp() << "#include <" << module + "/" + headerFilename << ">" << endl << endl;
+    cpp() << "#include <" << module + "/" + QFileInfo(headerFile).fileName() << ">" << endl << endl;
 
     generateClassForwardDeclarations(className);
 
@@ -960,7 +969,7 @@
     cppFile.close();
 }
 
-void CppGenerator::generate(const QByteArray& name, const QString &outputDirectory)
+void CppGenerator::generate(const QByteArray& name, const QString &outputDirectory, GenerationMode mode)
 {
     m_directory = QDir(outputDirectory);
     nameSpace = name;
@@ -970,31 +979,52 @@
         return;
     }
 
+    QByteArray headerFilename(nameSpace + ".h");
+    headerFilename.replace("::", "_");
+    headerFilename = headerFilename.toLower();
+    QFile headerFile(m_directory.absolutePath() + QDir::separator() + QString::fromUtf8(headerFilename));
+
+    QByteArray cppFilename(nameSpace + ".cpp");
+    cppFilename.replace("::", "_");
+    cppFilename = cppFilename.toLower();
+    QFile cppFile(m_directory.absolutePath() + QDir::separator() + QString::fromUtf8(cppFilename));
+
+    m_generatedFiles << headerFile.fileName() << cppFile.fileName();
+
+    if (mode == GenerateCode) {
+        generateCode(name, headerFile, cppFile);
+    }
+
+    for (int classId = 0; classId < ns->classNames.size(); ++classId) {
+        generateClass(ns->classNames[classId], classId, mode);
+    }
+
+    if (mode == GenerateFileList ) {
+        QFile f;
+        f.open(stdout, QIODevice::WriteOnly);
+        QTextStream stream(&f);
+        stream << m_generatedFiles.join("\n") << "\n";
+        f.close();
+    }
+}
+
+void CppGenerator::generateCode(const QByteArray& name, QFile& headerFile, QFile& cppFile)
+{
     const QMetaObject *meta = Smoke::GObjectNamespace::findMetaObject(nameSpace);
     if (meta == 0) {
         qWarning() << Q_FUNC_INFO << "QMetaObject not found:" << nameSpace;
         return;
     }
 
-    QByteArray headerFilename(nameSpace + ".h");
-    headerFilename.replace("::", "_");
-    headerFilename = headerFilename.toLower();
-    QFile headerFile(m_directory.absolutePath() + QDir::separator() + QString::fromUtf8(headerFilename));
-
     if (!headerFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        qWarning() << Q_FUNC_INFO << "File open failed:" << headerFilename;
+        qWarning() << Q_FUNC_INFO << "File open failed:" << headerFile.fileName();
         return;
     }
 
     m_header = new QTextStream(&headerFile);
 
-    QByteArray cppFilename(nameSpace + ".cpp");
-    cppFilename.replace("::", "_");
-    cppFilename = cppFilename.toLower();
-    QFile cppFile(m_directory.absolutePath() + QDir::separator() + QString::fromUtf8(cppFilename));
-
     if (!cppFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        qWarning() << Q_FUNC_INFO << "File open failed:" << cppFilename;
+        qWarning() << Q_FUNC_INFO << "File open failed:" << cppFile.fileName();
         return;
     }
 
@@ -1018,7 +1048,7 @@
         header() << "#include \"" << superclassHeader << "\"" << endl << endl;
     }
 
-    cpp() << "#include \"" << headerFilename << "\"" << endl << endl;
+    cpp() << "#include \"" << QFileInfo(headerFile).fileName() << "\"" << endl << endl;
 
     generateForwardDeclarations();
 
@@ -1180,10 +1210,6 @@
 
     headerFile.close();
     cppFile.close();
-
-    for (int classId = 0; classId < ns->classNames.size(); ++classId) {
-        generateClass(ns->classNames[classId], classId);
-    }
 }
 
 }

=== modified file 'tools/gsmokegen/cppgenerator.h'
--- tools/gsmokegen/cppgenerator.h	2011-08-15 14:24:53 +0000
+++ tools/gsmokegen/cppgenerator.h	2011-09-25 21:38:17 +0000
@@ -34,6 +34,11 @@
 
 class CppGenerator {
 public:
+    enum GenerationMode {
+        GenerateCode,
+        GenerateFileList
+    };
+
     CppGenerator(const QList<QRegExp>& excludeSignatures = QList<QRegExp>());
     QTextStream &header() {  return *m_header; }
     QTextStream &cpp()  {  return *m_cpp; }
@@ -54,8 +59,11 @@
     void generateStructs();
     QByteArray generateMethodSignature(GIFunctionInfo * function, QByteArray& signature);
     void generateInterface(GIInterfaceInfo* interface);
-    void generateClass(const QByteArray& classPath, int classId);
-    void generate(const QByteArray& nameSpace, const QString &outputDirectory = QString());
+    void generateClass(const QByteArray& classPath, int classId, GenerationMode mode = GenerateCode);
+    void generateClassCode(const QByteArray& classPath, int classId, QFile& headerFile, QFile& cppFile);
+    void generate(const QByteArray& nameSpace, const QString &outputDirectory = QString(), GenerationMode mode = GenerateCode);
+    void generateCode(const QByteArray& name, QFile& headerFile, QFile& cppFile);
+
 private:
     QByteArray nameSpace;
     GObjectNamespace *ns;
@@ -63,6 +71,7 @@
     QTextStream *m_cpp;
     QDir m_directory;
     QList<QRegExp> m_excludeSignatures;
+    QStringList m_generatedFiles;
 };
 
 }

=== modified file 'tools/gsmokegen/main.cpp'
--- tools/gsmokegen/main.cpp	2011-08-15 12:54:01 +0000
+++ tools/gsmokegen/main.cpp	2011-09-25 21:38:17 +0000
@@ -25,24 +25,30 @@
 static QStringList modules;
 
 
-#define PRINT_USAGE() \
-    qDebug() << "Usage:" << argv[0] << "[-o <output directory>] [-e <exclude file>] module.."
+void print_usage(const char *programName)
+{
+    qDebug() << "Usage:" << programName <<
+                "[-o <output directory>] [-e <exclude file>] [-l] module.." << "\n\n" <<
+                "If -l or --list-files is passed, a list of the files generated will be \n"
+                "printed to stdout without actually generating the files.";
+}
 
 int main(int argc, char** argv)
 {
     QCoreApplication app(argc, argv);
     QStringList arguments = app.arguments();
     QList<QRegExp> excludeSignatures;
+    Smoke::CppGenerator::GenerationMode generationMode = Smoke::CppGenerator::GenerateCode;
 
     if (argc == 1) {
-        PRINT_USAGE();
+        print_usage(argv[0]);
         return 0;
     }
 
     int i = 1;
     while (i < arguments.length()) {
         if (arguments[i] == QLatin1String("-h") || arguments[i] == QLatin1String("--help")) {
-            PRINT_USAGE();
+            print_usage(argv[0]);
             return 0;
         } else if (arguments[i] == QLatin1String("-o") || arguments[i] == QLatin1String("--output")) {
             i++;
@@ -50,6 +56,9 @@
                 outputDirectory = arguments[i].toUtf8();
             }
             i++;
+        } else if (arguments[i] == QLatin1String("-l") || arguments[i] == QLatin1String("--list-files")) {
+            generationMode = Smoke::CppGenerator::GenerateFileList;
+            i++;
         } else if (arguments[i] == QLatin1String("-e") || arguments[i] == QLatin1String("--excludes")) {
             i++;
             if (i < arguments.length()) {
@@ -78,7 +87,7 @@
     
     foreach (QString module, modules) {
         Smoke::GObjectNamespace *ns = new Smoke::GObjectNamespace(module.toLatin1());
-        generator.generate(module.toLatin1(), outputDirectory);
+        generator.generate(module.toLatin1(), outputDirectory, generationMode);
     }
 
     return 0;