diff options
author | José Alburquerque <jaalburqu@svn.gnome.org> | 2012-02-28 14:20:48 -0500 |
---|---|---|
committer | José Alburquerque <jaalburqu@svn.gnome.org> | 2012-02-28 14:23:23 -0500 |
commit | fd90d1f8329d7e0840e176ae2e493190cea57521 (patch) | |
tree | e34468ace855e4303ea41fa225905b35aedc3d7e /gio/src/gio_enums.defs | |
parent | 33f7f9a873c6e07d08a77963d237ca966ea057bc (diff) | |
download | glibmm-fd90d1f8329d7e0840e176ae2e493190cea57521.tar.gz |
tools: Add XML docs and defs generation scripts.
* tools/gen_scripts/gio_generate_docs.sh:
* tools/gen_scripts/gio_generate_enums.sh:
* tools/gen_scripts/gio_generate_extra_defs.sh:
* tools/gen_scripts/gio_generate_methods.sh:
* tools/gen_scripts/glib_generate_docs.sh:
* tools/gen_scripts/glib_generate_enums.sh:
* tools/gen_scripts/glib_generate_extra_defs.sh:
* tools/gen_scripts/glib_generate_methods.sh: Add these scripts to
generate the XML docs and defs files for glibmm and giomm. A
'JHBUILD_SOURCES' variable pointing to the jhbuild root source
directory needs to be defined and the various tools (like h2def.py,
enum.pl, etc.) need to be in the command path for these scripts to run
successfully. They generate the appropriate files, patch them if
necessary, and place them in the correct place. All that's needed is
to run the scripts.
* gio/src/gio_docs.xml:
* gio/src/gio_enums.defs:
* gio/src/gio_methods.defs:
* gio/src/gio_signals.defs:
* glib/src/glib_docs.xml:
* glib/src/glib_enums.defs:
* glib/src/glib_functions.defs:
* glib/src/gmodule_functions.defs:
* glib/src/gobject_enums.defs:
* glib/src/gobject_functions.defs: Regenerate all the XML and defs
files to ensure that the scripts work.
* glib/src/glib_enums.defs.patch: Add this patch file so that it isn't
necessary to manually edit the defs file.
* gio/src/gio_signals.defs.patch:
* glib/src/glib_functions.defs.patch: Update these patch files so the
defs files patch successfully.
Bug #668918.
Diffstat (limited to 'gio/src/gio_enums.defs')
-rw-r--r-- | gio/src/gio_enums.defs | 106 |
1 files changed, 101 insertions, 5 deletions
diff --git a/gio/src/gio_enums.defs b/gio/src/gio_enums.defs index 145998d4..09e07add 100644 --- a/gio/src/gio_enums.defs +++ b/gio/src/gio_enums.defs @@ -1,3 +1,26 @@ +;; From gdbusauthmechanism.h + +;; Original typedef: +;; typedef enum { +;; G_DBUS_AUTH_MECHANISM_STATE_INVALID, +;; G_DBUS_AUTH_MECHANISM_STATE_WAITING_FOR_DATA, +;; G_DBUS_AUTH_MECHANISM_STATE_HAVE_DATA_TO_SEND, +;; G_DBUS_AUTH_MECHANISM_STATE_REJECTED, +;; G_DBUS_AUTH_MECHANISM_STATE_ACCEPTED, +;; } GDBusAuthMechanismState; + +(define-enum-extended DBusAuthMechanismState + (in-module "G") + (c-name "GDBusAuthMechanismState") + (values + '("invalid" "G_DBUS_AUTH_MECHANISM_STATE_INVALID" "0") + '("waiting-for-data" "G_DBUS_AUTH_MECHANISM_STATE_WAITING_FOR_DATA" "1") + '("have-data-to-send" "G_DBUS_AUTH_MECHANISM_STATE_HAVE_DATA_TO_SEND" "2") + '("rejected" "G_DBUS_AUTH_MECHANISM_STATE_REJECTED" "3") + '("accepted" "G_DBUS_AUTH_MECHANISM_STATE_ACCEPTED" "4") + ) +) + ;; From gioenums.h ;; Original typedef: @@ -189,7 +212,7 @@ ) ;; Original typedef: -;; typedef enum { +;; typedef enum /*< flags >*/ { ;; G_MOUNT_MOUNT_NONE = 0 ;; } GMountMountFlags; @@ -217,7 +240,7 @@ ) ;; Original typedef: -;; typedef enum { +;; typedef enum /*< flags >*/ { ;; G_DRIVE_START_NONE = 0 ;; } GDriveStartFlags; @@ -442,7 +465,6 @@ '("busy" "G_IO_ERROR_BUSY" "26") '("would-block" "G_IO_ERROR_WOULD_BLOCK" "27") '("host-not-found" "G_IO_ERROR_HOST_NOT_FOUND" "28") - '("host-not-found" "G_IO_ERROR_HOST_WAS_NOT_FOUND" "28") '("would-merge" "G_IO_ERROR_WOULD_MERGE" "29") '("failed-handled" "G_IO_ERROR_FAILED_HANDLED" "30") '("too-many-open-files" "G_IO_ERROR_TOO_MANY_OPEN_FILES" "31") @@ -590,6 +612,49 @@ ;; Original typedef: ;; typedef enum { +;; G_RESOURCE_ERROR_NOT_FOUND, +;; G_RESOURCE_ERROR_INTERNAL +;; } GResourceError; + +(define-enum-extended ResourceError + (in-module "G") + (c-name "GResourceError") + (values + '("not-found" "G_RESOURCE_ERROR_NOT_FOUND" "0") + '("internal" "G_RESOURCE_ERROR_INTERNAL" "1") + ) +) + +;; Original typedef: +;; typedef enum { +;; G_RESOURCE_FLAGS_NONE = 0, +;; G_RESOURCE_FLAGS_COMPRESSED = (1<<0) +;; } GResourceFlags; + +(define-flags-extended ResourceFlags + (in-module "G") + (c-name "GResourceFlags") + (values + '("none" "G_RESOURCE_FLAGS_NONE" "0x0") + '("compressed" "G_RESOURCE_FLAGS_COMPRESSED" "(1<<0)") + ) +) + +;; Original typedef: +;; typedef enum /*< flags >*/ { +;; G_RESOURCE_LOOKUP_FLAGS_NONE = 0 +;; } GResourceLookupFlags; + +(define-flags-extended ResourceLookupFlags + (in-module "G") + (c-name "GResourceLookupFlags") + (values + '("none" "G_RESOURCE_LOOKUP_FLAGS_NONE" "0x0") + ) +) + +;; Original typedef: +;; typedef enum { ;; G_SOCKET_FAMILY_INVALID, ;; #ifdef GLIB_SYSDEF_AF_UNIX ;; G_SOCKET_FAMILY_UNIX = GLIB_SYSDEF_AF_UNIX, @@ -768,7 +833,8 @@ ;; G_DBUS_PROXY_FLAGS_NONE = 0, ;; G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES = (1<<0), ;; G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS = (1<<1), -;; G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START = (1<<2) +;; G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START = (1<<2), +;; G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES = (1<<3) ;; } GDBusProxyFlags; (define-flags-extended DBusProxyFlags @@ -779,6 +845,7 @@ '("do-not-load-properties" "G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES" "(1<<0)") '("do-not-connect-signals" "G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS" "(1<<1)") '("do-not-auto-start" "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" "(1<<2)") + '("get-invalidated-properties" "G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES" "(1<<3)") ) ) @@ -1304,7 +1371,7 @@ ) ;; Original typedef: -;; typedef enum { +;; typedef enum /*< flags >*/ { ;; G_TLS_DATABASE_VERIFY_NONE = 0 ;; } GTlsDatabaseVerifyFlags; @@ -1346,6 +1413,35 @@ ) ) +;; Original typedef: +;; typedef enum { +;; G_SOCKET_CLIENT_RESOLVING, +;; G_SOCKET_CLIENT_RESOLVED, +;; G_SOCKET_CLIENT_CONNECTING, +;; G_SOCKET_CLIENT_CONNECTED, +;; G_SOCKET_CLIENT_PROXY_NEGOTIATING, +;; G_SOCKET_CLIENT_PROXY_NEGOTIATED, +;; G_SOCKET_CLIENT_TLS_HANDSHAKING, +;; G_SOCKET_CLIENT_TLS_HANDSHAKED, +;; G_SOCKET_CLIENT_COMPLETE +;; } GSocketClientEvent; + +(define-enum-extended SocketClientEvent + (in-module "G") + (c-name "GSocketClientEvent") + (values + '("resolving" "G_SOCKET_CLIENT_RESOLVING" "0") + '("resolved" "G_SOCKET_CLIENT_RESOLVED" "1") + '("connecting" "G_SOCKET_CLIENT_CONNECTING" "2") + '("connected" "G_SOCKET_CLIENT_CONNECTED" "3") + '("proxy-negotiating" "G_SOCKET_CLIENT_PROXY_NEGOTIATING" "4") + '("proxy-negotiated" "G_SOCKET_CLIENT_PROXY_NEGOTIATED" "5") + '("tls-handshaking" "G_SOCKET_CLIENT_TLS_HANDSHAKING" "6") + '("tls-handshaked" "G_SOCKET_CLIENT_TLS_HANDSHAKED" "7") + '("complete" "G_SOCKET_CLIENT_COMPLETE" "8") + ) +) + ;; From gsettings.h ;; Original typedef: |