X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=jhbuild.js;h=b088626b0e23f6aac3bb197e1a39995ca86937de;hb=ea5a086bc07ad5bae1d61131680c0e8249dfcc6f;hp=5ae4d60c897e8d70ae3a0275cd2ef079d9b0f46e;hpb=a08358414206432175d30ea8d5e41ca642e630bf;p=gnome.introspection-doc-generator diff --git a/jhbuild.js b/jhbuild.js index 5ae4d60..b088626 100755 --- a/jhbuild.js +++ b/jhbuild.js @@ -7,12 +7,14 @@ GLib= imports.gi.GLib; Gio = imports.gi.Gio; -//Roo = imports['Roo.js'].Roo; -File = imports.file.File; -console = imports.console; +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 @@ -231,7 +233,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.MailLoop.c_new (null, false); var started = false; GLib.child_watch_add(GLib.PRIORITY_DEFAULT, ret.child_pid, function(pid, status) { @@ -240,7 +242,7 @@ function spawnlog (cwd, s, outfile, errfile) { retval.done = true; if (started) { console.log("Ending LOOP"); - GLib.main_loop_quit(ctx); + ctx.quit(); } }); @@ -315,7 +317,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');