...
  View open merge request
Commits (3)
This diff is collapsed.
......@@ -32,31 +32,27 @@ single-test-variant = [ "single-test" ]
single-test-works-in-2015 = [ "single-test"]
[dependencies]
glib = "0.6.0"
glib-sys = "0.7.0"
gobject-sys = "0.7.0"
libc = "0.2"
proc-macro2 = {version = "0.4.8"}
quote = { version="0.6" }
syn = { version="0.15.3", features=["full", "extra-traits"] }
unicode-xid = "0.0.4"
glib = "0.7.1"
glib-sys = "0.8.0"
gobject-sys = "0.8.0"
libc = "0.2.54"
proc-macro2 = "0.4.30"
quote = "0.6.12"
syn = { version = "0.15.34", features = ["full", "extra-traits"] }
unicode-xid = "0.1.0"
xml-rs = "0.8.0"
difference = "2.0" #Used to compare a generated content with a file on disk
difference = "2.0.0"
gobject-class = { path = "./gobject-class" }
[patch.crates-io]
# Needed for now until https://github.com/dtolnay/syn/pull/538 is published
syn = { git = 'https://github.com/dtolnay/syn' }
[build-dependencies]
cc = "1.0"
cc = "1.0.36"
[dev-dependencies]
glib-sys = "0.7.0"
gobject-sys = "0.7.0"
glib-sys = "0.8.0"
gobject-sys = "0.8.0"
gobject-gen-test = { path = "./mixed_tests" }
#ctest-sys = { path = "./mixed_tests/auto" }
libc = "0.2"
libc = "0.2.54"
[workspace]
members=["mixed_tests","gobject-class" ]
......
[dependencies]
libc = "0.2"
glib-sys = "0.7.0"
gobject-sys = "0.7.0"
glib = "0.6.0"
gobject-subclass = "*"
libc = "0.2.54"
glib-sys = "0.8.0"
gobject-sys = "0.8.0"
glib = "0.7.1"
[dev-dependencies]
shell-words = "0.1.0"
tempdir = "0.3"
tempdir = "0.3.7"
[features]
......
[build-dependencies]
cc = "1.0"
pkg-config = "0.3.7"
cc = "1.0.36"
pkg-config = "0.3.14"
[build-dependencies.gir]
git = "https://github.com/gtk-rs/gir"
[dependencies]
libc = "0.2"
glib-sys = "0.7.0"
gobject-sys = "0.7.0"
glib = "0.6.0"
libc = "0.2.54"
glib-sys = "0.8.0"
gobject-sys = "0.8.0"
glib = "0.7.1"
[dev-dependencies]
shell-words = "0.1.0"
tempdir = "0.3"
tempdir = "0.3.7"
[features]
......
......@@ -152,7 +152,7 @@ impl GirCodegen {
.expect("Error reading gir file");
library.preprocessing(cfg.work_mode);
::libgir::update_version::apply_config(&mut library, &cfg);
library.postprocessing();
library.postprocessing(&cfg);
cfg.resolve_type_ids(&library);
::libgir::update_version::check_function_real_version(&mut library);
......
......@@ -20,12 +20,15 @@ and/or use gtk-doc annotations. -->
glib:type-name="CtestCounter"
glib:get-type="ctest_counter_get_type"
glib:type-struct="CounterClass">
<source-position filename="counter.h" line="34"/>
<constructor name="new" c:identifier="ctest_counter_new">
<source-position filename="counter.h" line="39"/>
<return-value transfer-ownership="full">
<type name="Counter" c:type="CtestCounter*"/>
</return-value>
</constructor>
<virtual-method name="get" invoker="get">
<source-position filename="counter.h" line="29"/>
<return-value transfer-ownership="none">
<type name="gint" c:type="gint"/>
</return-value>
......@@ -36,6 +39,7 @@ and/or use gtk-doc annotations. -->
</parameters>
</virtual-method>
<virtual-method name="increment" invoker="increment">
<source-position filename="counter.h" line="27"/>
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
......@@ -49,6 +53,7 @@ and/or use gtk-doc annotations. -->
</parameters>
</virtual-method>
<method name="get" c:identifier="ctest_counter_get">
<source-position filename="counter.h" line="41"/>
<return-value transfer-ownership="none">
<type name="gint" c:type="gint"/>
</return-value>
......@@ -59,6 +64,7 @@ and/or use gtk-doc annotations. -->
</parameters>
</method>
<method name="increment" c:identifier="ctest_counter_increment">
<source-position filename="counter.h" line="40"/>
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
......@@ -81,11 +87,13 @@ and/or use gtk-doc annotations. -->
<record name="CounterClass"
c:type="CtestCounterClass"
glib:is-gtype-struct-for="Counter">
<source-position filename="counter.h" line="34"/>
<field name="parent_class">
<type name="GObject.ObjectClass" c:type="GObjectClass"/>
</field>
<field name="increment">
<callback name="increment">
<source-position filename="counter.h" line="27"/>
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
......@@ -101,6 +109,7 @@ and/or use gtk-doc annotations. -->
</field>
<field name="get">
<callback name="get">
<source-position filename="counter.h" line="29"/>
<return-value transfer-ownership="none">
<type name="gint" c:type="gint"/>
</return-value>
......@@ -112,7 +121,7 @@ and/or use gtk-doc annotations. -->
</callback>
</field>
<field name="padding">
<array zero-terminated="0" c:type="gpointer" fixed-size="10">
<array zero-terminated="0" fixed-size="10">
<type name="gpointer" c:type="gpointer"/>
</array>
</field>
......@@ -124,13 +133,16 @@ and/or use gtk-doc annotations. -->
glib:type-name="CtestCounterImpl"
glib:get-type="ctest_counterimpl_get_type"
glib:type-struct="CounterImplClass">
<source-position filename="counter_impl.h" line="29"/>
<implements name="MutableCounter"/>
<constructor name="new" c:identifier="ctest_counterimpl_new">
<source-position filename="counter_impl.h" line="34"/>
<return-value transfer-ownership="full">
<type name="CounterImpl" c:type="CtestCounterImpl*"/>
</return-value>
</constructor>
<method name="get" c:identifier="ctest_counterimpl_get">
<source-position filename="counter_impl.h" line="35"/>
<return-value transfer-ownership="none">
<type name="gint" c:type="gint"/>
</return-value>
......@@ -147,11 +159,12 @@ and/or use gtk-doc annotations. -->
<record name="CounterImplClass"
c:type="CtestCounterImplClass"
glib:is-gtype-struct-for="CounterImpl">
<source-position filename="counter_impl.h" line="29"/>
<field name="parent_class">
<type name="GObject.ObjectClass" c:type="GObjectClass"/>
</field>
<field name="padding">
<array zero-terminated="0" c:type="gpointer" fixed-size="12">
<array zero-terminated="0" fixed-size="12">
<type name="gpointer" c:type="gpointer"/>
</array>
</field>
......@@ -162,7 +175,9 @@ and/or use gtk-doc annotations. -->
glib:type-name="CtestMutableCounter"
glib:get-type="ctest_mutable_counter_get_type"
glib:type-struct="MutableCounterInterface">
<source-position filename="interface_counter.h" line="17"/>
<virtual-method name="get" invoker="get">
<source-position filename="interface_counter.h" line="16"/>
<return-value transfer-ownership="none">
<type name="gint" c:type="gint"/>
</return-value>
......@@ -173,6 +188,7 @@ and/or use gtk-doc annotations. -->
</parameters>
</virtual-method>
<virtual-method name="increment" invoker="increment">
<source-position filename="interface_counter.h" line="15"/>
<return-value transfer-ownership="none">
<type name="gint" c:type="gint"/>
</return-value>
......@@ -186,6 +202,7 @@ and/or use gtk-doc annotations. -->
</parameters>
</virtual-method>
<method name="get" c:identifier="ctest_mutable_counter_get">
<source-position filename="interface_counter.h" line="20"/>
<return-value transfer-ownership="none">
<type name="gint" c:type="gint"/>
</return-value>
......@@ -196,6 +213,7 @@ and/or use gtk-doc annotations. -->
</parameters>
</method>
<method name="increment" c:identifier="ctest_mutable_counter_increment">
<source-position filename="interface_counter.h" line="19"/>
<return-value transfer-ownership="none">
<type name="gint" c:type="gint"/>
</return-value>
......@@ -215,11 +233,13 @@ and/or use gtk-doc annotations. -->
<record name="MutableCounterInterface"
c:type="CtestMutableCounterInterface"
glib:is-gtype-struct-for="MutableCounter">
<source-position filename="interface_counter.h" line="17"/>
<field name="parent_iface">
<type name="GObject.TypeInterface" c:type="GTypeInterface"/>
</field>
<field name="increment">
<callback name="increment">
<source-position filename="interface_counter.h" line="15"/>
<return-value transfer-ownership="none">
<type name="gint" c:type="gint"/>
</return-value>
......@@ -235,6 +255,7 @@ and/or use gtk-doc annotations. -->
</field>
<field name="get">
<callback name="get">
<source-position filename="interface_counter.h" line="16"/>
<return-value transfer-ownership="none">
<type name="gint" c:type="gint"/>
</return-value>
......