sys: Merge pull request #1 from EPashkin/remove_targetpath_from_gir

Remove targetpath from gir
gtk-rs · Jul 26, 2015 · 085003b · 085003b
2 parents 940edd6 + dce178a
commit 085003b
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -5,8 +5,7 @@ LIBS = $(CONFIGS:conf/gir-%.toml=%-sys/src/lib.rs)
 libs : $(LIBS)
 
 %-sys/src/lib.rs : conf/gir-%.toml $(GIR)
-	mkdir -p $(@D)
-	$(GIR) -c $<
+	$(GIR) -c $< -o $(abspath $*-sys) -m sys
 
 $(GIR) : gir/Cargo.* gir/build.rs $(shell find gir/src -name '*.rs')
 	cd gir && cargo build --release

diff --git a/atk-sys/src/lib.rs b/atk-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (d627bd3) from gir-files (11e0e6d)
+// This file was generated by gir (5300bbb) from gir-files (11e0e6d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]

diff --git a/conf/gir-atk.toml b/conf/gir-atk.toml
@@ -1,10 +1,9 @@
 [options]
-work_mode = "sys"
+work_mode = "normal"
 girs_dir = "gir-files"
 library = "Atk"
 version = "1.0"
 min_cfg_version = "2.4"
-target_path = "atk-sys"
 external_libraries = [
    "GLib",
    "GObject",

diff --git a/conf/gir-gdk-pixbuf.toml b/conf/gir-gdk-pixbuf.toml
@@ -1,10 +1,9 @@
 [options]
-work_mode = "sys"
+work_mode = "normal"
 girs_dir = "gir-files"
 library = "GdkPixbuf"
 version = "2.0"
 min_cfg_version = "2.26"
-target_path = "gdk-pixbuf-sys"
 external_libraries = [
    "GLib",
    "GObject",

diff --git a/conf/gir-gdk.toml b/conf/gir-gdk.toml
@@ -1,10 +1,9 @@
 [options]
-work_mode = "sys"
+work_mode = "normal"
 girs_dir = "gir-files"
 library = "Gdk"
 version = "3.0"
 min_cfg_version = "3.4"
-target_path = "gdk-sys"
 external_libraries = [
    "GLib",
    "GObject",

diff --git a/conf/gir-gio.toml b/conf/gir-gio.toml
@@ -1,10 +1,9 @@
 [options]
-work_mode = "sys"
+work_mode = "normal"
 girs_dir = "gir-files"
 library = "Gio"
 version = "2.0"
 min_cfg_version = "2.32"
-target_path = "gio-sys"
 external_libraries = [
    "GLib",
    "GObject",

diff --git a/conf/gir-glib.toml b/conf/gir-glib.toml
@@ -1,10 +1,9 @@
 [options]
-work_mode = "sys"
+work_mode = "normal"
 girs_dir = "gir-files"
 library = "GLib"
 version = "2.0"
 min_cfg_version = "2.32"
-target_path = "glib-sys"
 ignore = [
 	"GLib.GINT64_FORMAT",
 	"GLib.GINT64_MODIFIER",

diff --git a/conf/gir-gobject.toml b/conf/gir-gobject.toml
@@ -1,10 +1,9 @@
 [options]
-work_mode = "sys"
+work_mode = "normal"
 girs_dir = "gir-files"
 library = "GObject"
 version = "2.0"
 min_cfg_version = "2.32"
-target_path = "gobject-sys"
 external_libraries = [
    "GLib",
 ]

diff --git a/conf/gir-gtk.toml b/conf/gir-gtk.toml
@@ -1,10 +1,9 @@
 [options]
-work_mode = "sys"
+work_mode = "normal"
 girs_dir = "gir-files"
 library = "Gtk"
 version = "3.0"
 min_cfg_version = "3.4"
-target_path = "gtk-sys"
 external_libraries = [
    "GLib",
    "GObject",

diff --git a/conf/gir-pango.toml b/conf/gir-pango.toml
@@ -1,10 +1,9 @@
 [options]
-work_mode = "sys"
+work_mode = "normal"
 girs_dir = "gir-files"
 library = "Pango"
 version = "1.0"
 min_cfg_version = "1.30"
-target_path = "pango-sys"
 external_libraries = [
    "GLib",
    "GObject",

diff --git a/gdk-pixbuf-sys/src/lib.rs b/gdk-pixbuf-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (d627bd3) from gir-files (11e0e6d)
+// This file was generated by gir (5300bbb) from gir-files (11e0e6d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]

diff --git a/gdk-sys/src/lib.rs b/gdk-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (d627bd3) from gir-files (11e0e6d)
+// This file was generated by gir (5300bbb) from gir-files (11e0e6d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]

diff --git a/gio-sys/src/lib.rs b/gio-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (d627bd3) from gir-files (11e0e6d)
+// This file was generated by gir (5300bbb) from gir-files (11e0e6d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]

diff --git a/gir b/gir
diff --git a/glib-sys/src/lib.rs b/glib-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (d627bd3) from gir-files (11e0e6d)
+// This file was generated by gir (5300bbb) from gir-files (11e0e6d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]

diff --git a/gobject-sys/src/lib.rs b/gobject-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (d627bd3) from gir-files (11e0e6d)
+// This file was generated by gir (5300bbb) from gir-files (11e0e6d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -15,6 +15,29 @@ use libc::{c_int, c_char, c_uchar, c_float, c_uint, c_double,
 #[allow(unused_imports)]
 use glib_ffi::{gboolean, gconstpointer, gpointer, GType, Volatile};
 
+pub const G_TYPE_INVALID: GType = 0 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_NONE: GType = 1 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_INTERFACE: GType = 2 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_CHAR: GType = 3 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_UCHAR: GType = 4 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_BOOLEAN: GType = 5 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_INT: GType = 6 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_UINT: GType = 7 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_LONG: GType = 8 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_ULONG: GType = 9 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_INT64: GType = 10 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_UINT64: GType = 11 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_ENUM: GType = 12 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_FLAGS: GType = 13 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_FLOAT: GType = 14 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_DOUBLE: GType = 15 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_STRING: GType = 16 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_POINTER: GType = 17 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_BOXED: GType = 18 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_PARAM: GType = 19 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_OBJECT: GType = 20 << G_TYPE_FUNDAMENTAL_SHIFT;
+pub const G_TYPE_VARIANT: GType = 21 << G_TYPE_FUNDAMENTAL_SHIFT;
+
 pub type GInitiallyUnowned_autoptr = gpointer;
 pub type GObject_autoptr = gpointer;
 pub type GSignalCMarshaller = GClosureMarshal;

diff --git a/gtk-sys/src/lib.rs b/gtk-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (d627bd3) from gir-files (11e0e6d)
+// This file was generated by gir (5300bbb) from gir-files (11e0e6d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]

diff --git a/pango-sys/src/lib.rs b/pango-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (d627bd3) from gir-files (11e0e6d)
+// This file was generated by gir (5300bbb) from gir-files (11e0e6d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]