X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=jhbuild.js;h=4331ce2fd632d3313c556c89b20b8a8dfe06015a;hp=f4cc76844906cbb205563f09f55887e0b31c11a5;hb=e5ffdec730738f1cf9dacb62516f1ad85682e1b4;hpb=048a29d25768cda5321b6b2c7613967e998b6608 diff --git a/jhbuild.js b/jhbuild.js index f4cc768..4331ce2 100755 --- a/jhbuild.js +++ b/jhbuild.js @@ -11,8 +11,10 @@ Gio = imports.gi.Gio; File = imports.File.File; console = imports.console.console; +Seed.include('Date.js'); -Date = imports.Date.Date; +//DateExtra = imports.DateExtra.DateExtra; + // these should come from args @@ -23,7 +25,7 @@ var UPDATE_SOURCES = false; -var LOGFILE = "jhbuild-" + (new imports.Date.Date()).format("Y-m-d-H") + '.log'; +var LOGFILE = "jhbuild-" + (new Date()).format("Y-m-d-H") + '.log'; // change src & deleteGirs when you add / remove girs.. @@ -152,6 +154,13 @@ var all = { 'vte' : 'vte', 'WebKit' :'WebKit', 'gconf' : 'gconf', + + //'gtop', + //'panelapplet', + //'epiphany' + + + //'gupnp', -- needs patch // 'gnome-keyring' -- ndeds patch // gnome-vfs -- needs patch @@ -231,7 +240,7 @@ function spawnlog (cwd, s, outfile, errfile) { GLib.SpawnFlags.DO_NOT_REAP_CHILD + GLib.SpawnFlags.SEARCH_PATH , null, null, ret); - var ctx = GLib.main_loop_new (null, false); + var ctx = new GLib.MainLoop.c_new (null, false); var started = false; GLib.child_watch_add(GLib.PRIORITY_DEFAULT, ret.child_pid, function(pid, status) { @@ -240,7 +249,7 @@ function spawnlog (cwd, s, outfile, errfile) { retval.done = true; if (started) { console.log("Ending LOOP"); - GLib.main_loop_quit(ctx); + ctx.quit(); } }); @@ -257,15 +266,15 @@ function spawnlog (cwd, s, outfile, errfile) { var x = new GLib.String(); - var cstatus = GLib.io_channel_get_buffer_condition(ch); - cstatus = GLib.io_channel_get_flags (ch) + var cstatus = ch.get_buffer_condition(); + cstatus = ch.get_flags (ch) //Seed.print("WAITING INPUT?" + prop+':'+cstatus); //var status = GLib.io_channel_read_line_string (ch, x, null); - var status = GLib.io_channel_read_line_string (ch, x); + var status = ch.read_line_string (x); //Seed.print(prop + ":INPUT:" + status); @@ -315,7 +324,7 @@ function spawnlog (cwd, s, outfile, errfile) { if (!retval.done) { started = true; console.log("STARTING LOOP"); - GLib.main_loop_run(ctx, false); // wait fore exit? + ctx.run(); // wait fore exit? } readstr(out_ch, outfile, 'output'); readstr(err_ch, errfile, 'error');