Remove marshallers from the tree and ignore them.

Require glib-genmarshal (a part of the standard GTK+ distribution).

4 files changed, 34 insertions, 185 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7d1da53
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/build
+/win32-depends
+/liblogdiag/ld-marshal.[ch]
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0169eee..0b0e4fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -166,38 +166,37 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
 include_directories (${CMAKE_CURRENT_BINARY_DIR})
 
 # Generate marshallers
+find_program (GLIB_GENMARSHAL_EXECUTABLE glib-genmarshal)
+if (NOT GLIB_GENMARSHAL_EXECUTABLE)
+	message (FATAL_ERROR "glib-genmarshal not found")
+endif (NOT GLIB_GENMARSHAL_EXECUTABLE)
+
 function (glib_genmarshal base prefix)
-	find_program (GLIB_GENMARSHAL_EXECUTABLE glib-genmarshal)
-
-	if (GLIB_GENMARSHAL_EXECUTABLE)
-		get_filename_component (base_path "${base}" PATH)
-		get_filename_component (base_name "${base}" NAME)
-		set (command_base ${GLIB_GENMARSHAL_EXECUTABLE}
-			--prefix ${prefix} "${base_name}.list")
-
-		# On Windows, the final makefile may contain:
-		#   cd e:\abc && ...
-		# That won't actually change the directory. We have to do:
-		#   cd e:\abc && e: && ...
-		if (WIN32 AND "${base_path}" MATCHES "^.:[/\\\\]")
-			string (SUBSTRING "${base_path}" 0 2 base_drive)
-			set (command_base "${base_drive}" && "${command_base}")
-		endif (WIN32 AND "${base_path}" MATCHES "^.:[/\\\\]")
-
-		# NOTE: VERBATIM would cause problems, so it is not used here
-		add_custom_command (OUTPUT ${base}.c
-			COMMAND ${command_base} --body   > "${base_name}.c"
-			DEPENDS "${base}.list"
-			WORKING_DIRECTORY "${base_path}"
-			COMMENT "Generating marshallers source file")
-		add_custom_command (OUTPUT ${base}.h
-			COMMAND ${command_base} --header > "${base_name}.h"
-			DEPENDS "${base}.list"
-			WORKING_DIRECTORY "${base_path}"
-			COMMENT "Generating marshallers header file")
-	else (GLIB_GENMARSHAL_EXECUTABLE)
-		message (WARNING "glib-genmarshal is not present on this system")
-	endif (GLIB_GENMARSHAL_EXECUTABLE)
+	get_filename_component (base_path "${base}" PATH)
+	get_filename_component (base_name "${base}" NAME)
+	set (command_base ${GLIB_GENMARSHAL_EXECUTABLE}
+		--prefix ${prefix} "${base_name}.list")
+
+	# On Windows, the final makefile may contain:
+	#   cd e:\abc && ...
+	# That won't actually change the directory. We have to do:
+	#   cd e:\abc && e: && ...
+	if (WIN32 AND "${base_path}" MATCHES "^.:[/\\\\]")
+		string (SUBSTRING "${base_path}" 0 2 base_drive)
+		set (command_base "${base_drive}" && "${command_base}")
+	endif (WIN32 AND "${base_path}" MATCHES "^.:[/\\\\]")
+
+	# NOTE: VERBATIM would cause problems, so it is not used here
+	add_custom_command (OUTPUT ${base}.c
+		COMMAND ${command_base} --body   > "${base_name}.c"
+		DEPENDS "${base}.list"
+		WORKING_DIRECTORY "${base_path}"
+		COMMENT "Generating marshallers source file")
+	add_custom_command (OUTPUT ${base}.h
+		COMMAND ${command_base} --header > "${base_name}.h"
+		DEPENDS "${base}.list"
+		WORKING_DIRECTORY "${base_path}"
+		COMMENT "Generating marshallers header file")
 endfunction (glib_genmarshal)
 
 glib_genmarshal (${CMAKE_CURRENT_SOURCE_DIR}/liblogdiag/ld-marshal
@@ -283,7 +282,7 @@ set (CPACK_NSIS_DELETE_ICONS_EXTRA
 	Delete '\$SMPROGRAMS\\\\$SM_FOLDER\\\\logdiag.lnk'")
 
 set (CPACK_SOURCE_GENERATOR "TGZ;ZIP")
-set (CPACK_SOURCE_IGNORE_FILES "/build;/.svn;/.git;/win32-depends")
+set (CPACK_SOURCE_IGNORE_FILES "/.git;/build;/win32-depends;/liblogdiag/ld-marshal.[ch]")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME
 	"${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
 
diff --git a/liblogdiag/ld-marshal.c b/liblogdiag/ld-marshal.c
deleted file mode 100644
index a086127..0000000
--- a/liblogdiag/ld-marshal.c
+++ /dev/null
@@ -1,125 +0,0 @@
-
-#include	<glib-object.h>
-
-
-#ifdef G_ENABLE_DEBUG
-#define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
-#define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
-#define g_marshal_value_peek_int(v)      g_value_get_int (v)
-#define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
-#define g_marshal_value_peek_long(v)     g_value_get_long (v)
-#define g_marshal_value_peek_ulong(v)    g_value_get_ulong (v)
-#define g_marshal_value_peek_int64(v)    g_value_get_int64 (v)
-#define g_marshal_value_peek_uint64(v)   g_value_get_uint64 (v)
-#define g_marshal_value_peek_enum(v)     g_value_get_enum (v)
-#define g_marshal_value_peek_flags(v)    g_value_get_flags (v)
-#define g_marshal_value_peek_float(v)    g_value_get_float (v)
-#define g_marshal_value_peek_double(v)   g_value_get_double (v)
-#define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
-#define g_marshal_value_peek_param(v)    g_value_get_param (v)
-#define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
-#define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
-#define g_marshal_value_peek_object(v)   g_value_get_object (v)
-#define g_marshal_value_peek_variant(v)  g_value_get_variant (v)
-#else /* !G_ENABLE_DEBUG */
-/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
- *          Do not access GValues directly in your code. Instead, use the
- *          g_value_get_*() functions
- */
-#define g_marshal_value_peek_boolean(v)  (v)->data[0].v_int
-#define g_marshal_value_peek_char(v)     (v)->data[0].v_int
-#define g_marshal_value_peek_uchar(v)    (v)->data[0].v_uint
-#define g_marshal_value_peek_int(v)      (v)->data[0].v_int
-#define g_marshal_value_peek_uint(v)     (v)->data[0].v_uint
-#define g_marshal_value_peek_long(v)     (v)->data[0].v_long
-#define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
-#define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
-#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
-#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
-#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
-#define g_marshal_value_peek_float(v)    (v)->data[0].v_float
-#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
-#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
-#define g_marshal_value_peek_param(v)    (v)->data[0].v_pointer
-#define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
-#define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
-#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
-#define g_marshal_value_peek_variant(v)  (v)->data[0].v_pointer
-#endif /* !G_ENABLE_DEBUG */
-
-
-/* VOID:OBJECT,OBJECT (ld-marshal.list:1) */
-void
-ld_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
-                                GValue       *return_value G_GNUC_UNUSED,
-                                guint         n_param_values,
-                                const GValue *param_values,
-                                gpointer      invocation_hint G_GNUC_UNUSED,
-                                gpointer      marshal_data)
-{
-  typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer     data1,
-                                                    gpointer     arg_1,
-                                                    gpointer     arg_2,
-                                                    gpointer     data2);
-  register GMarshalFunc_VOID__OBJECT_OBJECT callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
-
-  callback (data1,
-            g_marshal_value_peek_object (param_values + 1),
-            g_marshal_value_peek_object (param_values + 2),
-            data2);
-}
-
-/* VOID:OBJECT,STRING (ld-marshal.list:2) */
-void
-ld_marshal_VOID__OBJECT_STRING (GClosure     *closure,
-                                GValue       *return_value G_GNUC_UNUSED,
-                                guint         n_param_values,
-                                const GValue *param_values,
-                                gpointer      invocation_hint G_GNUC_UNUSED,
-                                gpointer      marshal_data)
-{
-  typedef void (*GMarshalFunc_VOID__OBJECT_STRING) (gpointer     data1,
-                                                    gpointer     arg_1,
-                                                    gpointer     arg_2,
-                                                    gpointer     data2);
-  register GMarshalFunc_VOID__OBJECT_STRING callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data : cc->callback);
-
-  callback (data1,
-            g_marshal_value_peek_object (param_values + 1),
-            g_marshal_value_peek_string (param_values + 2),
-            data2);
-}
-
diff --git a/liblogdiag/ld-marshal.h b/liblogdiag/ld-marshal.h
deleted file mode 100644
index c326e86..0000000
--- a/liblogdiag/ld-marshal.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#ifndef __ld_marshal_MARSHAL_H__
-#define __ld_marshal_MARSHAL_H__
-
-#include	<glib-object.h>
-
-G_BEGIN_DECLS
-
-/* VOID:OBJECT,OBJECT (ld-marshal.list:1) */
-extern void ld_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-
-/* VOID:OBJECT,STRING (ld-marshal.list:2) */
-extern void ld_marshal_VOID__OBJECT_STRING (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-
-G_END_DECLS
-
-#endif /* __ld_marshal_MARSHAL_H__ */
-