[ease/serialize: 52/52] Merge branch 'text' into serialize
- From: Nate Stedman <natesm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ease/serialize: 52/52] Merge branch 'text' into serialize
- Date: Tue, 22 Feb 2011 22:57:31 +0000 (UTC)
commit a7ffdfb670211925277c8054d8b9b45b3a8d459d
Merge: 010bc37 8750c9f
Author: Nate Stedman <natesm gmail com>
Date: Tue Feb 22 17:52:10 2011 -0500
Merge branch 'text' into serialize
Conflicts:
configure.ac
ease-core/Makefile.am
ease-core/ease-color.vala
.gitignore | 8 +
AUTHORS | 1 +
Makefile.am | 68 --
autogen.sh | 21 -
configure.ac | 99 --
data/Makefile.am | 82 --
...elcome-window.ui => new-presentation-window.ui} | 10 +-
data/wscript | 76 ++
ease-core/Makefile.am | 125 ---
ease-core/ease-actor.vala | 64 ++-
ease-core/ease-animated-zoom-slider.vala | 2 +-
ease-core/ease-archiver.vala | 7 +-
ease-core/ease-background-widget.vala | 4 +-
ease-core/ease-background.vala | 11 +-
ease-core/ease-cairo-actor.vala | 20 +-
ease-core/ease-cairo-element.vala | 2 +-
ease-core/ease-color.vala | 100 ++-
ease-core/ease-dialog-progress.vala | 2 +-
ease-core/ease-dialogs.vala | 14 +-
ease-core/ease-document.vala | 4 +-
ease-core/ease-element.vala | 41 +-
ease-core/ease-enums.vala | 2 +-
ease-core/ease-gradient.vala | 2 +-
ease-core/ease-html-exporter.vala | 2 +-
ease-core/ease-icon-view.vala | 203 ++++-
ease-core/ease-image-actor.vala | 2 +-
ease-core/ease-image-element.vala | 53 +-
ease-core/ease-image.vala | 137 +++-
ease-core/ease-iterable-models.vala | 2 +-
ease-core/ease-layout.vala | 175 ++++
ease-core/ease-media-element.vala | 2 +-
ease-core/ease-pdf-actor.vala | 16 +-
ease-core/ease-pdf-element.vala | 68 ++-
ease-core/ease-plugin-import-media.vala | 2 +-
ease-core/ease-plugin-import-service.vala | 13 +-
ease-core/ease-scrolled-embed-window.vala | 2 +-
ease-core/ease-scrolled-embed.vala | 2 +-
ease-core/ease-shape-element.vala | 26 +-
ease-core/ease-slide.vala | 53 +-
ABOUT-NLS => ease-core/ease-string.vala | 0
ease-core/ease-temp.vala | 2 +-
ease-core/ease-text-actor.vala | 460 +++++++--
ease-core/ease-text-element.vala | 332 +-------
ease-core/ease-text.vala | 493 ++++++++++
ease-core/ease-theme.vala | 41 +-
ease-core/ease-transformations.vala | 52 -
ease-core/ease-transitions.vala | 98 ++-
ease-core/ease-undo-action.vala | 2 +-
ease-core/ease-undo-actions-element.vala | 2 +-
ease-core/ease-undo-actions-slide.vala | 2 +-
ease-core/ease-undo-controller.vala | 2 +-
ease-core/ease-undo-item.vala | 2 +-
ease-core/ease-undo-source.vala | 2 +-
ease-core/ease-utilities.vala | 4 +-
ease-core/ease-video-actor.vala | 6 +-
ease-core/ease-video-element.vala | 5 +-
ease-core/ease-zoom-slider.vala | 2 +-
ease-core/sourcelist/source-item.vala | 16 +-
ease-core/sourcelist/source-number-item.vala | 14 +-
ease-core/sourcelist/source-spinner-item.vala | 4 +-
ease-core/wscript | 98 ++
ease/Makefile.am | 58 --
ease/ease-about-dialog.vala | 2 +-
ease/ease-close-confirm-dialog.vala | 2 +-
ease/ease-editor-embed.vala | 50 +-
ease/ease-editor-window.vala | 17 +-
ease/ease-handle.vala | 2 +-
ease/ease-import-dialog.vala | 8 +-
ease/ease-import-flickr-media.vala | 2 +-
ease/ease-import-oca-media.vala | 2 +-
ease/ease-import-oca-service.vala | 2 +-
ease/ease-import-picasa-media.vala | 4 +
ease/ease-import-picasa-service.vala | 71 ++
ease/ease-import-widget.vala | 2 +-
ease/ease-inspector-element-pane.vala | 2 +-
ease/ease-inspector-pane.vala | 2 +-
ease/ease-inspector-slide-pane.vala | 2 +-
ease/ease-inspector-transition-pane.vala | 2 +-
ease/ease-inspector.vala | 2 +-
ease/ease-main.vala | 58 +-
ease/ease-new-presentation-window.vala | 398 ++++++++
ease/ease-player.vala | 2 +-
ease/ease-selection-rectangle.vala | 2 +-
ease/ease-slide-actor.vala | 6 +-
ease/ease-slide-button-panel.vala | 19 +-
ease/ease-slide-sorter.vala | 7 +-
ease/ease-welcome-actor.vala | 245 -----
ease/ease-welcome-window.vala | 437 ---------
ease/wscript | 62 ++
flutter/Makefile.am | 52 -
flutter/flutter.vala | 2 +-
flutter/wscript | 17 +
m4/introspection.m4 | 94 --
po/LINGUAS | 3 +
po/cs.po | 402 +++++----
po/gl.po | 677 ++++++++++++++
po/ro.po | 708 ++++++++++++++
po/sk.po | 721 +++++++++++++++
po/sv.po | 639 +++++++++++++-
po/wscript | 1 +
vapi/clutter-1.0.deps | 3 +
vapi/clutter-gst-1.0.deps | 3 +
vapi/clutter-gtk-0.10.deps | 8 +
vapi/gdk-2.0.deps | 5 +
vapi/gdk-pixbuf-2.0.deps | 1 +
vapi/gtk+-2.0.deps | 6 +
vapi/json-glib-1.0.deps | 1 +
vapi/libarchive.deps | 1 +
vapi/pango.deps | 1 +
vapi/pango.vapi | 974 ++++++++++++++++++++
vapi/pangocairo.deps | 2 +
vapi/poppler-glib.deps | 5 +
vapi/rest-0.6.deps | 3 +
vapi/rest-extras-0.6.deps | 1 +
vapi/seed.vapi | 4 +-
vapi/unique-1.0.deps | 8 +
waf | Bin 0 -> 77417 bytes
wscript | 113 +++
118 files changed, 6756 insertions(+), 2329 deletions(-)
---
diff --cc ease-core/ease-color.vala
index c6b0cf3,d1ab67c..99214fc
--- a/ease-core/ease-color.vala
+++ b/ease-core/ease-color.vala
@@@ -356,15 -356,25 +356,35 @@@ public class Ease.Color : GLib.Object,
}
/**
+ * Properties that should be excluded from serialization.
+ */
+ public string[] serialize_exclude()
+ {
+ return { "red8", "green8", "blue8", "alpha8",
+ "red16", "green16", "blue16", "alpha16",
+ "clutter", "gdk" };
+ }
+
++ /*
+ * A Pango.Color representation of this color. Changes made to the returned
+ * color are not reflected in this color. Note that Pango colors do not
+ * support an alpha value. When being set, the alpha will be set to full,
+ * when retrieved, the alpha value will be ignored.
+ */
+ public Pango.Color pango
+ {
+ get
+ {
+ return { red16, green16, blue16 };
+ }
+ set
+ {
+ red16 = value.red;
+ green16 = value.green;
+ blue16 = value.blue;
+ }
+ }
+
/**
* Creates an opaque color.
*/
diff --cc ease-core/wscript
index 0000000,3484cda..711761a
mode 000000,100644..100644
--- a/ease-core/wscript
+++ b/ease-core/wscript
@@@ -1,0 -1,93 +1,98 @@@
+ #!/usr/bin/env python
+
+ ease_core_files = ["ease-actor.vala",
+ "ease-animated-zoom-slider.vala",
+ "ease-archiver.vala",
+ "ease-background.vala",
+ "ease-background-widget.vala",
+ "ease-cairo-actor.vala",
+ "ease-cairo-element.vala",
+ "ease-color.vala",
+ "ease-dialog-progress.vala",
+ "ease-dialogs.vala",
+ "ease-document.vala",
+ "ease-element.vala",
+ "ease-enums.vala",
+ "ease-gradient.vala",
+ "ease-html-exporter.vala",
+ "ease-icon-view.vala",
+ "ease-image-actor.vala",
+ "ease-image-element.vala",
+ "ease-image.vala",
++ "ease-init.vala",
+ "ease-iterable-models.vala",
+ "ease-layout.vala",
+ "ease-media-element.vala",
+ "ease-plugin-import-media.vala",
+ "ease-plugin-import-service.vala",
++ "ease-plugins.vala",
+ "ease-pdf-actor.vala",
+ "ease-pdf-element.vala",
+ "ease-scrolled-embed.vala",
+ "ease-scrolled-embed-window.vala",
++ "ease-serializable.vala",
++ "ease-serializer.vala",
+ "ease-shape-element.vala",
+ "ease-slide.vala",
+ "ease-temp.vala",
+ "ease-text.vala",
+ "ease-text-actor.vala",
+ "ease-text-element.vala",
+ "ease-theme.vala",
+ "ease-transitions.vala",
+ "ease-undo-actions-element.vala",
+ "ease-undo-actions-slide.vala",
+ "ease-undo-action.vala",
+ "ease-undo-controller.vala",
+ "ease-undo-item.vala",
+ "ease-undo-source.vala",
+ "ease-utilities.vala",
+ "ease-video-actor.vala",
+ "ease-video-element.vala",
+ "ease-zoom-slider.vala",
+ "sourcelist/source-base-group.vala",
+ "sourcelist/source-base-view.vala",
+ "sourcelist/source-expandable-group.vala",
+ "sourcelist/source-group.vala",
+ "sourcelist/source-item.vala",
+ "sourcelist/source-list.vala",
+ "sourcelist/source-number-item.vala",
+ "sourcelist/source-pane-view.vala",
+ "sourcelist/source-spinner-item.vala",
+ "sourcelist/source-view.vala"]
+
+ def build(bld):
+ ease_core_packages = ["clutter-gst-1.0",
+ "clutter-gtk-0.10",
+ "gee-1.0",
+ "gmodule-2.0",
+ "json-glib-1.0",
+ "libarchive",
+ "poppler-glib",
+ "rest-extras-0.6",
++ "seed",
+ "unique-1.0",
+ 'flutter-' + bld.env["FLUTTER_VERSION"][0]]
+
+ version = bld.env["EASE_CORE_VERSION"][0]
+ library_name = 'ease-core-' + version
+
+ lib = bld(features='c cshlib', after='flutter')
+
+ lib.name = "ease-core"
+ lib.target = library_name
+
+ lib.source = " ".join(ease_core_files)
+
+ lib.cflags = ['-include', 'config.h', '-w', '-g']
- lib.uselib = 'GOBJECT CLUTTER GEE CLUTTERGST GMODULE LIBARCHIVE POPPLERGLIB RESTEXTRAS CLUTTERGTK JSONGLIB'
++ lib.uselib = 'GOBJECT CLUTTER GEE CLUTTERGST GMODULE LIBARCHIVE POPPLERGLIB RESTEXTRAS CLUTTERGTK JSONGLIB SEED'
+ lib.packages = " ".join(ease_core_packages)
+
+ lib.vapi_dirs = "../build/flutter ../vapi"
+
+ lib.gir = "EaseCore-" + version
+
+
+
+
+
diff --cc ease/wscript
index 0000000,ca50733..b3663d0
mode 000000,100644..100644
--- a/ease/wscript
+++ b/ease/wscript
@@@ -1,0 -1,61 +1,62 @@@
+ #!/usr/bin/env python
+
+ ease_files = ["ease-about-dialog.vala",
+ "ease-close-confirm-dialog.vala",
+ "ease-editor-embed.vala",
+ "ease-editor-window.vala",
+ "ease-handle.vala",
+ "ease-import-dialog.vala",
+ "ease-import-flickr-media.vala",
+ "ease-import-flickr-service.vala",
+ "ease-import-picasa-media.vala",
+ "ease-import-picasa-service.vala",
+ "ease-import-oca-media.vala",
+ "ease-import-oca-service.vala",
+ "ease-import-widget.vala",
+ "ease-inspector-element-pane.vala",
+ "ease-inspector-pane.vala",
+ "ease-inspector-slide-pane.vala",
+ "ease-inspector-transition-pane.vala",
+ "ease-inspector.vala",
+ "ease-main.vala",
+ "ease-new-presentation-window.vala",
+ "ease-player.vala",
+ "ease-selection-rectangle.vala",
+ "ease-slide-actor.vala",
+ "ease-slide-button-panel.vala",
+ "ease-slide-sorter.vala"]
+
+ def build(bld):
+ ease_packages = ["flutter-" + bld.env["FLUTTER_VERSION"][0],
+ "ease-core-" + bld.env["EASE_CORE_VERSION"][0],
+ "clutter-gst-1.0",
+ "clutter-gtk-0.10",
+ "gee-1.0",
+ "gmodule-2.0",
+ "json-glib-1.0",
+ "libarchive",
+ "poppler-glib",
+ "rest-0.6",
+ "rest-extras-0.6",
++ "seed",
+ "unique-1.0"]
+
+ prog = bld(features='c cprogram')
+
+ prog.name = 'ease'
+ prog.target = 'ease'
+
+ prog.source = " ".join(ease_files)
+
+ prog.includes = "../build/ease-core ../build/flutter"
+
+ prog.cflags = ['-include', 'config.h', '-w', '-g']
+ prog.uselib = 'GTK+ GOBJECT CLUTTER GEE CLUTTERGST GMODULE LIBARCHIVE POPPLERGLIB RESTEXTRAS CLUTTERGTK JSONGLIB UNIQUE'
+ prog.packages = " ".join(ease_packages)
+
- prog.vapi_dirs = '../build/ease-core ../build/flutter'
++ prog.vapi_dirs = '../build/ease-core ../build/flutter ../vapi'
+
+ prog.use = 'ease-core flutter'
+
+ # Enable threading
+ prog.threading = True
diff --cc vapi/seed.vapi
index 8f8785d,0000000..aa2007a
mode 100644,000000..100644
--- a/vapi/seed.vapi
+++ b/vapi/seed.vapi
@@@ -1,258 -1,0 +1,256 @@@
+/* seed.vapi generated by vapigen, do not modify. */
+
+[CCode (cprefix = "Seed", lower_case_cprefix = "seed_")]
+namespace Seed {
+ [Compact]
+ [CCode (cheader_filename = "seed.h")]
+ public class Class {
+ }
+ [Compact]
+ [CCode (ref_function = "seed_context_ref", unref_function = "seed_context_unref", cheader_filename = "seed.h")]
+ public class Context {
+ public static void collect (Seed.GlobalContext ctx);
+ public static unowned Seed.GlobalContext create (Seed.ContextGroup? group, Seed.Class? global_class);
+ public unowned Seed.Object get_global_object ();
+ public static unowned Seed.GlobalContext @ref (Seed.GlobalContext ctx);
+ public static void unref (Seed.GlobalContext ctx);
+ }
+ [Compact]
+ [CCode (cheader_filename = "seed.h")]
+ public class ContextGroup {
+ }
+ [Compact]
+ [CCode (free_function = "seed_engine_destroy", cheader_filename = "seed.h")]
+ public class Engine {
+ public weak Seed.GlobalContext context;
+ public weak Seed.Value global;
+ public weak Seed.ContextGroup group;
+ public weak string search_path;
+ public unowned string get_search_path ();
+ public void set_search_path (string path);
+ }
+ [Compact]
+ [CCode (cheader_filename = "seed.h")]
+ public class GlobalContext : Seed.Context {
+ }
+ [Compact]
+ [CCode (free_function = "seed_value_free", cheader_filename = "seed.h")]
+ public class Object : Seed.Value {
+ public static unowned Seed.Value call (Seed.Context ctx, Seed.Object object, Seed.Object @this, size_t argument_count, Seed.Value[] arguments, Seed.Exception exception);
+ public static unowned string copy_property_names (Seed.Context ctx, Seed.Object object);
+ public void* get_private ();
+ public static unowned Seed.Value get_property (Seed.Context ctx, Seed.Object object, string name);
+ public static unowned Seed.Value get_property_at_index (Seed.Context ctx, Seed.Object object, int index, Seed.Exception exception);
+ public static unowned Seed.Object get_prototype (Seed.Context ctx, Seed.Object obj);
+ public static bool is_of_class (Seed.Context ctx, Seed.Object obj, Seed.Class @class);
+ public void set_private (void* value);
+ public static bool set_property (Seed.Context ctx, Seed.Object object, string name, Seed.Value value);
+ public static void set_property_at_index (Seed.Context ctx, Seed.Object object, int index, Seed.Value value, Seed.Exception exception);
+ }
-
+ [Compact]
+ [CCode (free_function = "seed_script_destroy", cheader_filename = "seed.h")]
+ public class Script {
++ public Seed.Exception exception ();
+ [CCode (has_construct_function = false)]
- public Seed.Exception exception();
+ public Script.from_file (Seed.Context ctx, string file);
+ }
+ [Compact]
+ [CCode (ref_function = "seed_string_ref", unref_function = "seed_string_unref", cheader_filename = "seed.h")]
+ public class String {
+ public size_t get_maximum_size ();
+ public bool is_equal (Seed.String b);
+ public bool is_equal_utf8 (string b);
+ public size_t to_utf8_buffer (string buffer, size_t buffer_size);
+ }
+ [Compact]
+ [CCode (cheader_filename = "seed.h")]
+ public class Value {
+ public static unowned Seed.Value from_boolean (Seed.Context ctx, bool val, out Seed.Exception? exception);
+ public static unowned Seed.Value from_char (Seed.Context ctx, char val, out Seed.Exception? exception);
+ public static unowned Seed.Value from_double (Seed.Context ctx, double val, out Seed.Exception? exception);
+ public static unowned Seed.Value from_filename (Seed.Context ctx, Seed.Value val, out Seed.Value? exception);
+ public static unowned Seed.Value from_float (Seed.Context ctx, float val, out Seed.Exception? exception);
+ public static unowned Seed.Value from_int (Seed.Context ctx, int val, out Seed.Exception? exception);
+ public static unowned Seed.Value from_int64 (Seed.Context ctx, int64 val, out Seed.Exception? exception);
+ public static unowned Seed.Value from_long (Seed.Context ctx, long val, out Seed.Exception? exception);
+ public static unowned Seed.Value from_object (Seed.Context ctx, GLib.Object val, out Seed.Exception? exception);
+ public static unowned Seed.Value from_string (Seed.Context ctx, string val, out Seed.Exception? exception);
+ public static unowned Seed.Value from_uchar (Seed.Context ctx, uchar val, out Seed.Exception? exception);
+ public static unowned Seed.Value from_uint (Seed.Context ctx, uint val, out Seed.Exception? exception);
+ public static unowned Seed.Value from_uint64 (Seed.Context ctx, uint64 val, out Seed.Exception? exception);
+ public static unowned Seed.Value from_ulong (Seed.Context ctx, ulong val, out Seed.Exception? exception);
+ public static bool is_function (Seed.Context ctx, Seed.Object value);
+ public static bool is_null (Seed.Context ctx, Seed.Value value);
+ public static bool is_number (Seed.Context ctx, Seed.Value value);
+ public static bool is_object (Seed.Context ctx, Seed.Value value);
+ public static bool is_object_of_class (Seed.Context ctx, Seed.Value value, Seed.Class klass);
+ public static bool is_string (Seed.Context ctx, Seed.Value value);
+ public static bool is_undefined (Seed.Context ctx, Seed.Value value);
+ public static void protect (Seed.Context ctx, Seed.Value value);
+ public static bool to_boolean (Seed.Context ctx, Seed.Value val, out Seed.Exception? exception);
+ public static char to_char (Seed.Context ctx, Seed.Value val, out Seed.Exception? exception);
+ public static double to_double (Seed.Context ctx, Seed.Value val, out Seed.Exception? exception);
+ public static unowned string to_filename (Seed.Context ctx, Seed.Value val, out Seed.Value? exception);
+ public static float to_float (Seed.Context ctx, Seed.Value val, out Seed.Exception? exception);
+ public static bool to_format (Seed.Context ctx, string format, Seed.Value values, out Seed.Value? exception);
+ public static int to_int (Seed.Context ctx, Seed.Value val, out Seed.Exception? exception);
+ public static int64 to_int64 (Seed.Context ctx, Seed.Value val, out Seed.Exception? exception);
+ public static long to_long (Seed.Context ctx, Seed.Value val, out Seed.Exception? exception);
+ public static unowned GLib.Object to_object (Seed.Context ctx, Seed.Value val, out Seed.Exception? exception);
+ public static unowned string to_string (Seed.Context ctx, Seed.Value val, out Seed.Exception? exception);
+ public static uchar to_uchar (Seed.Context ctx, Seed.Value val, out Seed.Exception? exception);
+ public static uint to_uint (Seed.Context ctx, Seed.Value val, out Seed.Exception? exception);
+ public static uint64 to_uint64 (Seed.Context ctx, Seed.Value val, out Seed.Exception? exception);
+ public static ulong to_ulong (Seed.Context ctx, Seed.Value val, out Seed.Exception? exception);
+ public static void unprotect (Seed.Context ctx, Seed.Value value);
+ }
+ [Compact]
+ [CCode (cheader_filename = "seed.h")]
+ public class seed_class_definition {
+ public Seed.ClassAttributes attributes;
+ public weak Seed.ObjectCallAsConstructorCallback call_as_constructor;
+ public weak Seed.ObjectCallAsFunctionCallback call_as_function;
+ public weak string class_name;
+ public weak Seed.ObjectConvertToTypeCallback convert_to_type;
+ public weak Seed.ObjectDeletePropertyCallback delete_property;
+ public weak Seed.ObjectFinalizeCallback finalize;
+ public weak Seed.ObjectGetPropertyCallback get_property;
+ public weak Seed.ObjectGetPropertyNamesCallback get_property_names;
+ public weak Seed.ObjectHasInstanceCallback has_instance;
+ public weak Seed.ObjectHasPropertyCallback has_property;
+ public weak Seed.ObjectInitializeCallback initialize;
+ public weak Seed.Class parent_class;
+ public weak Seed.ObjectSetPropertyCallback set_property;
+ public weak Seed.seed_static_function static_functions;
+ public weak Seed.seed_static_value static_values;
+ public int version;
+ }
+ [Compact]
+ [CCode (cheader_filename = "seed.h")]
+ public class seed_static_function {
+ public Seed.PropertyAttributes attributes;
+ public weak Seed.ObjectCallAsFunctionCallback callback;
+ public weak string name;
+ }
+ [Compact]
+ [CCode (cheader_filename = "seed.h")]
+ public class seed_static_value {
+ public Seed.PropertyAttributes attributes;
+ public weak Seed.ObjectGetPropertyCallback get_property;
+ public weak string name;
+ public weak Seed.ObjectSetPropertyCallback set_property;
+ }
+ [CCode (type_id = "SEED_TYPE_EXCEPTION", cheader_filename = "seed.h")]
- [SimpleType]
+ public struct Exception {
+ public static unowned string get_file (Seed.Context ctx, Seed.Exception exception);
+ public static uint get_line (Seed.Context ctx, Seed.Exception exception);
+ public static unowned string get_message (Seed.Context ctx, Seed.Exception exception);
+ public static unowned string get_name (Seed.Context ctx, Seed.Exception exception);
+ public static unowned string to_string (Seed.Context ctx, Seed.Exception exception);
+ }
+ [CCode (cprefix = "SEED_CLASS_ATTRIBUTE_", has_type_id = false, cheader_filename = "seed.h")]
+ public enum ClassAttributes {
+ NONE,
+ NO_SHARED_PROTOTYPE
+ }
+ [CCode (cprefix = "SEED_PROPERTY_ATTRIBUTE_", has_type_id = false, cheader_filename = "seed.h")]
+ public enum PropertyAttributes {
+ NONE,
+ READ_ONLY,
+ DONT_ENUM,
+ DONT_DELETE
+ }
+ [CCode (cprefix = "SEED_TYPE_", has_type_id = false, cheader_filename = "seed.h")]
+ public enum Type {
+ UNDEFINED,
+ NULL,
+ BOOLEAN,
+ NUMBER,
+ STRING,
+ OBJECT
+ }
+ [CCode (cheader_filename = "seed.h", has_target = false)]
+ public delegate unowned Seed.Value FunctionCallback (Seed.Context ctx, Seed.Object function, Seed.Object this_object, size_t argument_count, Seed.Value[] arguments, Seed.Exception exception);
+ [CCode (cheader_filename = "seed.h", has_target = false)]
+ public delegate unowned Seed.Object ModuleInitCallback (Seed.Engine eng);
+ [CCode (cheader_filename = "seed.h", has_target = false)]
+ public delegate unowned Seed.Value ObjectCallAsConstructorCallback (Seed.Context ctx, Seed.Object constructor, size_t argument_count, Seed.Value[] arguments, Seed.Exception exception);
+ [CCode (cheader_filename = "seed.h", has_target = false)]
+ public delegate unowned Seed.Value ObjectCallAsFunctionCallback (Seed.Context ctx, Seed.Object function, Seed.Object this_object, size_t argument_count, Seed.Value[] arguments, Seed.Exception exception);
+ [CCode (cheader_filename = "seed.h", has_target = false)]
+ public delegate unowned Seed.Value ObjectConvertToTypeCallback (Seed.Context ctx, Seed.Object object, Seed.Type type, Seed.Exception exception);
+ [CCode (cheader_filename = "seed.h", has_target = false)]
+ public delegate bool ObjectDeletePropertyCallback (Seed.Context ctx, Seed.Object object, Seed.String property_name, Seed.Value value, Seed.Exception e);
+ [CCode (cheader_filename = "seed.h", has_target = false)]
+ public delegate void ObjectFinalizeCallback (Seed.Object object);
+ [CCode (cheader_filename = "seed.h", has_target = false)]
+ public delegate unowned Seed.Value ObjectGetPropertyCallback (Seed.Context ctx, Seed.Object object, Seed.String property_name, Seed.Exception e);
+ [CCode (cheader_filename = "seed.h", has_target = false)]
+ public delegate void ObjectGetPropertyNamesCallback ();
+ [CCode (cheader_filename = "seed.h", has_target = false)]
+ public delegate bool ObjectHasInstanceCallback (Seed.Context ctx, Seed.Object constructor, Seed.Object instance_p, Seed.Exception exception);
+ [CCode (cheader_filename = "seed.h", has_target = false)]
+ public delegate bool ObjectHasPropertyCallback (Seed.Context ctx, Seed.Object object, Seed.String str);
+ [CCode (cheader_filename = "seed.h", has_target = false)]
+ public delegate void ObjectInitializeCallback (Seed.Context ctx, Seed.Object object);
+ [CCode (cheader_filename = "seed.h", has_target = false)]
+ public delegate bool ObjectSetPropertyCallback (Seed.Context ctx, Seed.Object object, Seed.String property_name, Seed.Value value, Seed.Exception e);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Object closure_get_callable (GLib.Closure c);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Value closure_invoke (GLib.Closure closure, Seed.Value args, uint argc, Seed.Exception exception);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Value closure_invoke_with_context (Seed.Context ctx, GLib.Closure closure, Seed.Value args, uint argc, Seed.Exception exception);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned GLib.Closure closure_new (Seed.Context ctx, Seed.Object function, string description);
+ [CCode (cheader_filename = "seed.h")]
+ public static void closure_warn_exception (GLib.Closure c, Seed.Context ctx, Seed.Exception exception);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Class create_class (Seed.seed_class_definition def);
+ [CCode (cheader_filename = "seed.h")]
+ public static void create_function (Seed.Context ctx, string name, Seed.FunctionCallback func, Seed.Object obj);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Value evaluate (Seed.Context ctx, Seed.Script s, Seed.Object @this);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned GLib.OptionGroup get_option_group ();
+ [CCode (cheader_filename = "seed.h")]
+ public static void importer_add_global (Seed.Context ctx, string name);
+ [CCode (cheader_filename = "seed.h")]
+ public static void importer_set_search_path (Seed.Context ctx, string search_path);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Engine init ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Engine init_with_context ([CCode (array_length_pos = 0.9)] ref unowned string[] argv, Seed.GlobalContext context);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Engine init_with_context_and_group ([CCode (array_length_pos = 0.9)] ref unowned string[] argv, Seed.GlobalContext context, Seed.ContextGroup group);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Engine init_with_context_group ([CCode (array_length_pos = 0.9)] ref unowned string[] argv, Seed.ContextGroup group);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Object make_array (Seed.Context ctx, Seed.Value elements, size_t num_elements, Seed.Exception exception);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Object make_constructor (Seed.Context ctx, Seed.Class @class, Seed.ObjectCallAsConstructorCallback constructor);
+ [CCode (cheader_filename = "seed.h")]
+ public static void make_exception (Seed.Context ctx, Seed.Exception exception, string name, string message);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Object make_function (Seed.Context ctx, Seed.FunctionCallback func, string name);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Value make_null (Seed.Context ctx);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Object make_object (Seed.Context ctx, Seed.Class @class, void* @private);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Value make_pointer (Seed.Context ctx, void* pointer);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Script make_script (Seed.Context ctx, string js, string source_url, int line_number);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Value make_undefined (Seed.Context ctx);
+ [CCode (cheader_filename = "seed.h")]
+ public static void* pointer_get_pointer (Seed.Context ctx, Seed.Value pointer);
+ [CCode (cheader_filename = "seed.h")]
+ public static void prepare_global_context (Seed.Context ctx);
+ [CCode (cheader_filename = "seed.h")]
+ public static void signal_connect (Seed.Context ctx, GLib.Object object, string @signal, string script);
+ [CCode (cheader_filename = "seed.h")]
+ public static void signal_connect_value (Seed.Context ctx, GLib.Object object, string @signal, Seed.Value function);
+ [CCode (cheader_filename = "seed.h")]
+ public static unowned Seed.Value simple_evaluate (Seed.Context ctx, string source, out unowned Seed.Exception? exception);
+}
diff --cc wscript
index 0000000,352dfbd..fa1b2cf
mode 000000,100644..100644
--- a/wscript
+++ b/wscript
@@@ -1,0 -1,112 +1,113 @@@
+ #!/usr/bin/env python
+
+ from waflib import TaskGen
+ from os import system
+
+ PACKAGE_VERSION = "ease-0.5"
+ VERSION = "0.5"
+ EASE_VERSION = "0.5"
+ EASE_CORE_VERSION = "0.5"
+ FLUTTER_VERSION = "0.5"
+ APPNAME = "ease"
+
+ top = '.'
+ out = ''
+
+ def options(opt):
+ opt.tool_options('compiler_c')
+ opt.tool_options('gnu_dirs')
+
+ def library_check(conf):
+ libraries = (
+ ("clutter-1.0", "CLUTTER", None),
+ ("clutter-gst-1.0", "CLUTTERGST", None),
+ ("gee-1.0", "GEE", None),
+ ("gmodule-2.0", "GMODULE", None),
+ ("libarchive", "LIBARCHIVE", None),
+ ("poppler-glib", "POPPLERGLIB", None),
+ ("rest-0.6", "REST", None),
+ ("rest-extras-0.6", "RESTEXTRAS",None),
+ ("unique-1.0", "UNIQUE", None),
+ ("clutter-gtk-0.10", "CLUTTERGTK", "0.10"),
- ("json-glib-1.0", "JSONGLIB", "0.7.6")
++ ("json-glib-1.0", "JSONGLIB", "0.7.6"),
++ ("seed", "SEED", "0.25")
+ )
+ for (package, uselib, version) in libraries:
+ conf.check_cfg(package=package, uselib_store=uselib,
+ mandatory=True, version=version,
+ args='--cflags --libs')
+
+ def write_config_header(conf):
+ conf.define('PACKAGE', APPNAME)
+ conf.define('PACKAGE_NAME', APPNAME)
+ conf.define('PACKAGE_STRING', APPNAME + '-' + VERSION)
+ conf.define('PACKAGE_VERSION', APPNAME + '-' + VERSION)
+
+ conf.define('EASE_VERSION', EASE_VERSION)
+ conf.define('FLUTTER_VERSION', FLUTTER_VERSION)
+ conf.define('EASE_CORE_VERSION', EASE_CORE_VERSION)
+
+ conf.define('EASE_DATA_DIR', '%{DATADIR}')
+
+ conf.define('GETTEXT_PACKAGE', 'ease')
+
+ conf.write_config_header('config.h')
+
+ def configure(conf):
+ conf.load('intltool')
+ conf.check_tool('compiler_c vala gnu_dirs')
+
+ # For pkgconfig substitution.
+ conf.env.append_value('FLUTTER_VERSION', FLUTTER_VERSION)
+ conf.env.append_value('EASE_CORE_VERSION', EASE_CORE_VERSION)
+ conf.env.append_value('EASE_VERSION', EASE_VERSION)
+ conf.env.append_value('PACKAGE_VERSION', PACKAGE_VERSION)
+
+ # disable vala warnings because the unused function ones are really annoying
+ conf.env.append_value('VALAFLAGS', '--disable-warnings')
+ conf.env.append_value('VALAFLAGS', '-g')
+
+ write_config_header(conf)
+
+ library_check(conf)
+
+ def build_pkgconfig_file(bld, name):
+ obj = bld(features = "subst_pc",
+ source = name,
+ install_path = "${LIBDIR}/pkgconfig")
+
+ def build_po(bld):
+ bld(features='intltool_po',
+ appname=APPNAME,
+ podir='po', install_path="${LOCALEDIR}")
+
+
+ def build(bld):
+ bld.EASE_VERSION = EASE_VERSION
+ bld.EASE_CORE_VERSION = EASE_CORE_VERSION
+ bld.FLUTTER_VERSION = FLUTTER_VERSION
+ bld.srcdir = top
+ bld.builddir = out
+
+ bld.add_subdirs('flutter')
+ bld.add_group()
+
+ bld.add_subdirs('ease-core')
+ bld.add_subdirs('data')
+ bld.add_group()
+
+ bld.add_subdirs('ease')
+ bld.add_group()
+
+ build_pkgconfig_file(bld, "pkgconfig/ease-core-0.5.pc.in")
+ build_pkgconfig_file(bld, "pkgconfig/flutter-0.5.pc.in")
+
+ build_po(bld)
+
+ def run(ctx):
+ if system("./waf build") is 0:
+ system("LD_LIBRARY_PATH=./build/ease-core:./build/flutter ./build/ease/ease")
+
+ def db(ctx):
+ if system("./waf build") is 0:
+ system("LD_LIBRARY_PATH=./build/ease-core:./build/flutter gdb ./build/ease/ease")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
