GNOME.org
 

[libchamplain] Separate champalin and champlain-memphis. Make regeneration of bindings smarter.

commit 20aa032951f6ea4c516b94992f6ceba913607967
Author: Tomaž Vajngerl <quikee gmail com>
Date:   Mon May 31 20:31:23 2010 +0200

    Separate champalin and champlain-memphis.
    Make regeneration of bindings smarter.

 bindings/vala/.gitignore                           |    3 +
 bindings/vala/Makefile.am                          |    6 +-
 .../champlain-gtk-0.6/champlain-gtk-0.6.files      |    4 +-
 .../champlain-gtk-0.6/champlain-gtk-0.6.gi         |   21 -
 bindings/vala/champlain-gtk/create.sh              |    3 +
 bindings/vala/champlain-memphis/Makefile.am        |   13 +
 .../champlain-memphis/champlain-memphis-0.6.deps   |    2 +
 .../champlain-memphis/champlain-memphis-0.6.vapi   |   57 +
 .../champlain-memphis-0.6.defines                  |    1 +
 .../champlain-memphis-0.6.files                    |    8 +
 .../champlain-memphis-0.6.metadata                 |    4 +
 .../champlain-memphis-0.6.namespace                |    1 +
 bindings/vala/champlain-memphis/create.sh          |    4 +
 bindings/vala/champlain/champlain-0.6.deps         |    1 -
 bindings/vala/champlain/champlain-0.6.vapi         |   64 +-
 .../champlain/champlain-0.6/champlain-0.6.files    |   23 +-
 .../vala/champlain/champlain-0.6/champlain-0.6.gi  | 1826 --------------------
 bindings/vala/champlain/create.sh                  |    5 +-
 configure.ac                                       |    1 +
 19 files changed, 134 insertions(+), 1913 deletions(-)
---
diff --git a/bindings/vala/.gitignore b/bindings/vala/.gitignore
new file mode 100644
index 0000000..935fdb7
--- /dev/null
+++ b/bindings/vala/.gitignore
@@ -0,0 +1,3 @@
+champlain-gtk/champlain-gtk-0.6/champlain-gtk-0.6.gi
+champlain-memphis/champlain-memphis-0.6/champlain-memphis-0.6.gi
+champlain/champlain-0.6/champlain-0.6.gi
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index a505be3..38b0301 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -4,4 +4,8 @@ if ENABLE_GTK
   SUBDIRS += champlain-gtk
 endif
 
-DIST_SUBDIRS = champlain champlain-gtk demos
+if ENABLE_MEMPHIS
+  SUBDIRS += champlain-memphis
+endif
+
+DIST_SUBDIRS = champlain champlain-gtk champlain-memphis demos
diff --git a/bindings/vala/champlain-gtk/champlain-gtk-0.6/champlain-gtk-0.6.files b/bindings/vala/champlain-gtk/champlain-gtk-0.6/champlain-gtk-0.6.files
index a818940..2cf4917 100644
--- a/bindings/vala/champlain-gtk/champlain-gtk-0.6/champlain-gtk-0.6.files
+++ b/bindings/vala/champlain-gtk/champlain-gtk-0.6/champlain-gtk-0.6.files
@@ -1,2 +1,2 @@
-lib/libchamplain-gtk-0.6.so
-include/libchamplain-gtk-0.6/
+../../../champlain-gtk/.libs/libchamplain-gtk-0.6.so
+../../../champlain-gtk/
diff --git a/bindings/vala/champlain-gtk/create.sh b/bindings/vala/champlain-gtk/create.sh
index 020af5e..c2bda78 100644
--- a/bindings/vala/champlain-gtk/create.sh
+++ b/bindings/vala/champlain-gtk/create.sh
@@ -1 +1,4 @@
+export PKG_CONFIG_PATH=$(readlink -f ../../../)
+echo $PKG_CONFIG_PATH
+vala-gen-introspect champlain-gtk-0.6 champlain-gtk-0.6
 vapigen --library champlain-gtk-0.6 --pkg clutter-gtk-0.10 --pkg gtk+-2.0 --pkg champlain-0.6 --vapidir=../champlain champlain-gtk-0.6/champlain-gtk-0.6.gi --metadata champlain-gtk-0.6/champlain-gtk-0.6.metadata
diff --git a/bindings/vala/champlain-memphis/Makefile.am b/bindings/vala/champlain-memphis/Makefile.am
new file mode 100644
index 0000000..e3e4a32
--- /dev/null
+++ b/bindings/vala/champlain-memphis/Makefile.am
@@ -0,0 +1,13 @@
+
+#champlain-0.6.vapi: $(top_srcdir)/champlain/Champlain-0.6.gir
+#	$(VAPIGEN) --pkg atk --pkg gdk-2.0 --pkg clutter-1.0 --library champlain-0.6 $^
+#	touch $@
+
+vapidir = $(datadir)/vala/vapi
+
+dist_vapi_DATA = \
+	champlain-memphis-0.6.vapi \
+	champlain-memphis-0.6.deps \
+	$(NULL)
+
+EXTRA_DIST = champlain-memphis-0.6.vapi
diff --git a/bindings/vala/champlain-memphis/champlain-memphis-0.6.deps b/bindings/vala/champlain-memphis/champlain-memphis-0.6.deps
new file mode 100644
index 0000000..8dbd10e
--- /dev/null
+++ b/bindings/vala/champlain-memphis/champlain-memphis-0.6.deps
@@ -0,0 +1,2 @@
+champlain-0.6
+memphis-0.2
diff --git a/bindings/vala/champlain-memphis/champlain-memphis-0.6.vapi b/bindings/vala/champlain-memphis/champlain-memphis-0.6.vapi
new file mode 100644
index 0000000..7eea6bd
--- /dev/null
+++ b/bindings/vala/champlain-memphis/champlain-memphis-0.6.vapi
@@ -0,0 +1,57 @@
+/* champlain-memphis-0.6.vapi generated by vapigen, do not modify. */
+
+[CCode (cprefix = "Champlain", lower_case_cprefix = "champlain_")]
+namespace Champlain {
+	[Compact]
+	[CCode (copy_function = "champlain_bounding_box_copy", type_id = "CHAMPLAIN_TYPE_BOUNDING_BOX", cheader_filename = "champlain/champlain.h")]
+	public class BoundingBox {
+		public double bottom;
+		public double left;
+		public double right;
+		public double top;
+		[CCode (has_construct_function = false)]
+		public BoundingBox ();
+		public unowned Champlain.BoundingBox copy ();
+		public void get_center (out double lat, out double lon);
+	}
+	[CCode (cheader_filename = "champlain/champlain.h")]
+	public class LocalMapDataSource : Champlain.MapDataSource {
+		[CCode (has_construct_function = false)]
+		public LocalMapDataSource ();
+		public void load_map_data (string map_path);
+	}
+	[CCode (cheader_filename = "champlain/champlain.h")]
+	public class MapDataSource : GLib.InitiallyUnowned {
+		public virtual unowned Memphis.Map get_map_data ();
+		[NoAccessorMethod]
+		public Champlain.BoundingBox bounding_box { owned get; set; }
+		[NoAccessorMethod]
+		public Champlain.State state { get; set; }
+	}
+	[CCode (cheader_filename = "champlain/champlain.h")]
+	public class MemphisTileSource : Champlain.TileSource {
+		[CCode (has_construct_function = false)]
+		public MemphisTileSource.full (string id, string name, string license, string license_uri, uint min_zoom, uint max_zoom, uint tile_size, Champlain.MapProjection projection, Champlain.MapDataSource map_data_source);
+		public Clutter.Color get_background_color ();
+		public unowned Champlain.MapDataSource get_map_data_source ();
+		public unowned Memphis.Rule get_rule (string id);
+		public unowned GLib.List get_rule_ids ();
+		public void load_rules (string rules_path);
+		public void remove_rule (string id);
+		public void set_background_color (Clutter.Color color);
+		public void set_map_data_source (Champlain.MapDataSource map_data_source);
+		public void set_rule (Memphis.Rule rule);
+		public Champlain.MapDataSource map_data_source { get; set construct; }
+	}
+	[CCode (cheader_filename = "champlain/champlain.h")]
+	public class NetworkMapDataSource : Champlain.MapDataSource {
+		[CCode (has_construct_function = false)]
+		public NetworkMapDataSource ();
+		public unowned string get_api_uri ();
+		public void load_map_data (double bound_left, double bound_bottom, double bound_right, double bound_top);
+		public void set_api_uri (string api_uri);
+		public string api_uri { get; set; }
+		[NoAccessorMethod]
+		public string proxy_uri { owned get; set; }
+	}
+}
diff --git a/bindings/vala/champlain-memphis/champlain-memphis-0.6/champlain-memphis-0.6.defines b/bindings/vala/champlain-memphis/champlain-memphis-0.6/champlain-memphis-0.6.defines
new file mode 100644
index 0000000..76e2beb
--- /dev/null
+++ b/bindings/vala/champlain-memphis/champlain-memphis-0.6/champlain-memphis-0.6.defines
@@ -0,0 +1 @@
+-DCHAMPLAIN_COMPILATION
diff --git a/bindings/vala/champlain-memphis/champlain-memphis-0.6/champlain-memphis-0.6.files b/bindings/vala/champlain-memphis/champlain-memphis-0.6/champlain-memphis-0.6.files
new file mode 100644
index 0000000..8ba4fe5
--- /dev/null
+++ b/bindings/vala/champlain-memphis/champlain-memphis-0.6/champlain-memphis-0.6.files
@@ -0,0 +1,8 @@
+../../../champlain/.libs/libchamplain-0.6.so
+../../../champlain/champlain-memphis.h
+../../../champlain/champlain-memphis-tile-source.h
+../../../champlain/champlain-map-data-source.h
+../../../champlain/champlain-local-map-data-source.h
+../../../champlain/champlain-network-map-data-source.h
+../../../champlain/champlain-bounding-box.h
+
diff --git a/bindings/vala/champlain-memphis/champlain-memphis-0.6/champlain-memphis-0.6.metadata b/bindings/vala/champlain-memphis/champlain-memphis-0.6/champlain-memphis-0.6.metadata
new file mode 100644
index 0000000..80ce455
--- /dev/null
+++ b/bindings/vala/champlain-memphis/champlain-memphis-0.6/champlain-memphis-0.6.metadata
@@ -0,0 +1,4 @@
+Champlain cheader_filename="champlain/champlain.h"
+
+champlain_bounding_box_get_center.lat is_out="1"
+champlain_bounding_box_get_center.lon is_out="1"
diff --git a/bindings/vala/champlain-memphis/champlain-memphis-0.6/champlain-memphis-0.6.namespace b/bindings/vala/champlain-memphis/champlain-memphis-0.6/champlain-memphis-0.6.namespace
new file mode 100644
index 0000000..0b86a40
--- /dev/null
+++ b/bindings/vala/champlain-memphis/champlain-memphis-0.6/champlain-memphis-0.6.namespace
@@ -0,0 +1 @@
+Champlain
diff --git a/bindings/vala/champlain-memphis/create.sh b/bindings/vala/champlain-memphis/create.sh
new file mode 100644
index 0000000..eced563
--- /dev/null
+++ b/bindings/vala/champlain-memphis/create.sh
@@ -0,0 +1,4 @@
+export PKG_CONFIG_PATH=$(readlink -f ../../../)
+
+vala-gen-introspect champlain-memphis-0.6 champlain-memphis-0.6
+vapigen --library champlain-memphis-0.6 --pkg champlain-0.6 --vapidir=../champlain champlain-memphis-0.6/champlain-memphis-0.6.gi --metadata champlain-memphis-0.6/champlain-memphis-0.6.metadata
diff --git a/bindings/vala/champlain/champlain-0.6.deps b/bindings/vala/champlain/champlain-0.6.deps
index ad1aa40..87047e6 100644
--- a/bindings/vala/champlain/champlain-0.6.deps
+++ b/bindings/vala/champlain/champlain-0.6.deps
@@ -1,3 +1,2 @@
 clutter-1.0
-memphis-0.2
 
diff --git a/bindings/vala/champlain/champlain-0.6.vapi b/bindings/vala/champlain/champlain-0.6.vapi
index d702134..4aef894 100644
--- a/bindings/vala/champlain/champlain-0.6.vapi
+++ b/bindings/vala/champlain/champlain-0.6.vapi
@@ -21,18 +21,6 @@ namespace Champlain {
 		[NoAccessorMethod]
 		public double longitude { get; set; }
 	}
-	[Compact]
-	[CCode (copy_function = "champlain_bounding_box_copy", type_id = "CHAMPLAIN_TYPE_BOUNDING_BOX", cheader_filename = "champlain/champlain.h")]
-	public class BoundingBox {
-		public double bottom;
-		public double left;
-		public double right;
-		public double top;
-		[CCode (has_construct_function = false)]
-		public BoundingBox ();
-		public unowned Champlain.BoundingBox copy ();
-		public void get_center (double lat, double lon);
-	}
 	[CCode (cheader_filename = "champlain/champlain.h")]
 	public class ErrorTileSource : Champlain.TileSource {
 		[CCode (has_construct_function = false)]
@@ -66,20 +54,6 @@ namespace Champlain {
 		public void show_all_markers ();
 	}
 	[CCode (cheader_filename = "champlain/champlain.h")]
-	public class LocalMapDataSource : Champlain.MapDataSource {
-		[CCode (has_construct_function = false)]
-		public LocalMapDataSource ();
-		public void load_map_data (string map_path);
-	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
-	public class MapDataSource : GLib.InitiallyUnowned {
-		public virtual unowned Memphis.Map get_map_data ();
-		[NoAccessorMethod]
-		public Champlain.BoundingBox bounding_box { owned get; set; }
-		[NoAccessorMethod]
-		public Champlain.State state { get; set; }
-	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
 	public class MapSource : GLib.InitiallyUnowned {
 		public virtual void fill_tile (Champlain.Tile tile);
 		public uint get_column_count (uint zoom_level);
@@ -194,32 +168,6 @@ namespace Champlain {
 		public Pango.WrapMode wrap_mode { get; set; }
 	}
 	[CCode (cheader_filename = "champlain/champlain.h")]
-	public class MemphisTileSource : Champlain.TileSource {
-		[CCode (has_construct_function = false)]
-		public MemphisTileSource.full (string id, string name, string license, string license_uri, uint min_zoom, uint max_zoom, uint tile_size, Champlain.MapProjection projection, Champlain.MapDataSource map_data_source);
-		public Clutter.Color get_background_color ();
-		public unowned Champlain.MapDataSource get_map_data_source ();
-		public unowned Memphis.Rule get_rule (string id);
-		public unowned GLib.List get_rule_ids ();
-		public void load_rules (string rules_path);
-		public void remove_rule (string id);
-		public void set_background_color (Clutter.Color color);
-		public void set_map_data_source (Champlain.MapDataSource map_data_source);
-		public void set_rule (Memphis.Rule rule);
-		public Champlain.MapDataSource map_data_source { get; set construct; }
-	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
-	public class NetworkMapDataSource : Champlain.MapDataSource {
-		[CCode (has_construct_function = false)]
-		public NetworkMapDataSource ();
-		public unowned string get_api_uri ();
-		public void load_map_data (double bound_left, double bound_bottom, double bound_right, double bound_top);
-		public void set_api_uri (string api_uri);
-		public string api_uri { get; set; }
-		[NoAccessorMethod]
-		public string proxy_uri { owned get; set; }
-	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
 	public class NetworkTileSource : Champlain.TileSource {
 		[CCode (has_construct_function = false)]
 		public NetworkTileSource.full (string id, string name, string license, string license_uri, uint min_zoom, uint max_zoom, uint tile_size, Champlain.MapProjection projection, string uri_format);
@@ -432,28 +380,28 @@ namespace Champlain {
 		public bool zoom_on_double_click { get; set; }
 		public virtual signal void animation_completed ();
 	}
-	[CCode (cprefix = "CHAMPLAIN_MAP_PROJECTION_", cheader_filename = "champlain/champlain.h")]
+	[CCode (cprefix = "CHAMPLAIN_MAP_PROJECTION_", has_type_id = false, cheader_filename = "champlain/champlain.h")]
 	public enum MapProjection {
 		MERCATOR
 	}
-	[CCode (cprefix = "CHAMPLAIN_SCROLL_MODE_", cheader_filename = "champlain/champlain.h")]
+	[CCode (cprefix = "CHAMPLAIN_SCROLL_MODE_", has_type_id = false, cheader_filename = "champlain/champlain.h")]
 	public enum ScrollMode {
 		PUSH,
 		KINETIC
 	}
-	[CCode (cprefix = "CHAMPLAIN_SELECTION_", cheader_filename = "champlain/champlain.h")]
+	[CCode (cprefix = "CHAMPLAIN_SELECTION_", has_type_id = false, cheader_filename = "champlain/champlain.h")]
 	public enum SelectionMode {
 		NONE,
 		SINGLE,
 		MULTIPLE
 	}
-	[CCode (cprefix = "CHAMPLAIN_STATE_", cheader_filename = "champlain/champlain.h")]
+	[CCode (cprefix = "CHAMPLAIN_STATE_", has_type_id = false, cheader_filename = "champlain/champlain.h")]
 	public enum State {
 		NONE,
 		LOADING,
 		DONE
 	}
-	[CCode (cprefix = "CHAMPLAIN_UNIT_", cheader_filename = "champlain/champlain.h")]
+	[CCode (cprefix = "CHAMPLAIN_UNIT_", has_type_id = false, cheader_filename = "champlain/champlain.h")]
 	public enum Unit {
 		KM,
 		MILES
@@ -461,8 +409,6 @@ namespace Champlain {
 	[CCode (cheader_filename = "champlain/champlain.h")]
 	public delegate unowned Champlain.MapSource MapSourceConstructor (Champlain.MapSourceDesc desc);
 	[CCode (cheader_filename = "champlain/champlain.h")]
-	public const int HAS_MEMPHIS;
-	[CCode (cheader_filename = "champlain/champlain.h")]
 	public const int MAJOR_VERSION;
 	[CCode (cheader_filename = "champlain/champlain.h")]
 	public const string MAP_SOURCE_MEMPHIS_LOCAL;
diff --git a/bindings/vala/champlain/champlain-0.6/champlain-0.6.files b/bindings/vala/champlain/champlain-0.6/champlain-0.6.files
index e1934fc..602d04c 100644
--- a/bindings/vala/champlain/champlain-0.6/champlain-0.6.files
+++ b/bindings/vala/champlain/champlain-0.6/champlain-0.6.files
@@ -1,2 +1,21 @@
-lib/libchamplain-0.6.so
-include/libchamplain-0.6/
+../../../champlain/.libs/libchamplain-0.6.so
+../../../champlain/champlain.h
+../../../champlain/champlain-defines.h
+../../../champlain/champlain-point.h
+../../../champlain/champlain-view.h
+../../../champlain/champlain-layer.h
+../../../champlain/champlain-selection-layer.h
+../../../champlain/champlain-base-marker.h
+../../../champlain/champlain-marker.h
+../../../champlain/champlain-tile.h
+../../../champlain/champlain-map-source.h
+../../../champlain/champlain-map-source-chain.h
+../../../champlain/champlain-tile-source.h
+../../../champlain/champlain-tile-cache.h
+../../../champlain/champlain-network-tile-source.h
+../../../champlain/champlain-error-tile-source.h
+../../../champlain/champlain-file-cache.h
+../../../champlain/champlain-map-source-factory.h
+../../../champlain/champlain-map-source-desc.h
+../../../champlain/champlain-polygon.h
+../../../champlain/champlain-version.h
diff --git a/bindings/vala/champlain/create.sh b/bindings/vala/champlain/create.sh
index f9a8c3c..84f5dc9 100644
--- a/bindings/vala/champlain/create.sh
+++ b/bindings/vala/champlain/create.sh
@@ -1 +1,4 @@
-vapigen --library champlain-0.6 --pkg clutter-1.0 --pkg memphis-0.2 champlain-0.6/champlain-0.6.gi --metadata champlain-0.6/champlain-0.6.metadata
+export PKG_CONFIG_PATH=$(readlink -f ../../../)
+
+vala-gen-introspect champlain-0.6 champlain-0.6
+vapigen --library champlain-0.6 --pkg clutter-1.0 champlain-0.6/champlain-0.6.gi --metadata champlain-0.6/champlain-0.6.metadata
diff --git a/configure.ac b/configure.ac
index 99686c1..df7c3a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -271,6 +271,7 @@ AC_CONFIG_FILES([Makefile
                  bindings/python/demos/Makefile
                  bindings/vala/Makefile
                  bindings/vala/champlain/Makefile
+                 bindings/vala/champlain-memphis/Makefile
                  bindings/vala/champlain-gtk/Makefile
                  bindings/vala/demos/Makefile
                  champlain-memphis.pc
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]