projects
/
gnome.introspection-doc-generator
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jhbuild.js
[gnome.introspection-doc-generator]
/
jhbuild.js
diff --git
a/jhbuild.js
b/jhbuild.js
index
5ae4d60
..
b088626
100755
(executable)
--- a/
jhbuild.js
+++ b/
jhbuild.js
@@
-7,12
+7,14
@@
GLib= imports.gi.GLib;
Gio = imports.gi.Gio;
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
// 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);
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) {
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");
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");
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');
}
readstr(out_ch, outfile, 'output');
readstr(err_ch, errfile, 'error');