X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=gtkrun.js;h=1ec53ad80e05894f04d31db778ead4d2c57c1c87;hb=119290bc3234e9ece1c64dbd72ca486d9633b5b7;hp=86c1036ddf39fd51797f14424da87edd824129cd;hpb=3771b20c176c68c3b6e670733a743002f140c829;p=app.Builder.js diff --git a/gtkrun.js b/gtkrun.js index 86c1036dd..1ec53ad80 100644 --- a/gtkrun.js +++ b/gtkrun.js @@ -31,7 +31,7 @@ GIRepository = imports.gi.GIRepository; GLib = imports.gi.GLib; // we add this in, as it appears to get lost sometimes if we set it using the ENV. variable in builder.sh -GIRepository.IRepository.prepend_search_path(GLib.get_home_dir() + '/.Builder/girepository-1.1'); +GIRepository.Repository.prepend_search_path(GLib.get_home_dir() + '/.Builder/girepository-1.2'); //print(JSON.stringify(GIRepository.IRepository.get_search_path())); Gtk = imports.gi.Gtk; @@ -43,21 +43,25 @@ GObject = imports.gi.GObject; GtkSource = imports.gi.GtkSource; WebKit = imports.gi.WebKit; Vte = imports.gi.Vte; + +//Gdl = imports.gi.Gdl; -Gdl = imports.gi.Gdl; +//GtkClutter = imports.gi.GtkClutter; -GtkClutter = imports.gi.GtkClutter; -if (GtkClutter) { +if (typeof(GtkClutter) != 'undefined') { GtkClutter.init(Seed.argv); } + File = imports.File.File; XObject = imports.XObject.XObject; //XObject.debug = true; Gtk.init(Seed.argv); +Globals = imports.Globals; + imports.searchPath.push('/'); // allow global paths.. // error checking todo.. @@ -67,20 +71,28 @@ var olist = []; var gtkbuilder = false; files.forEach(function(f) { var fp = Seed.argv[2] + '/' + f; - if (!fp.match(/\.bjs$/)) { + + + + if (!fp.match(/\.js$/)) { return; } - var js = fp.replace(/\.bjs$/, '.js'); + var js = fp; //.replace(/\.js$/, '.js'); if (File.isFile(js)) { // check file time.. = bjs is less than compiled file.. - if (File.mtime(fp) < File.mtime(js)) { + //if (File.mtime(fp) < File.mtime(js)) { XObject.log("LOADING" + js); olist.push(imports[js]); return; - } - + //} + // Compiling BJS is depreciated.. + //olist.push(imports[js]); + //return; } + + return; + /* var gtkbuilder = new imports.Builder.Provider.File.Gtk.Gtk({ path : fp }); gtkbuilder.loadItems(function() { }); XObject.log("COMPILING" + js); @@ -89,7 +101,7 @@ files.forEach(function(f) { return; } olist.push(imports[fn]); - + */ });