X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=gtkrun.js;h=1ec53ad80e05894f04d31db778ead4d2c57c1c87;hb=119290bc3234e9ece1c64dbd72ca486d9633b5b7;hp=f93951bbc1fb63af36872c932bdc06ae3de13d69;hpb=5169b584aa551349df05f2139d2ee5370c7a35af;p=app.Builder.js

diff --git a/gtkrun.js b/gtkrun.js
index f93951bbc..1ec53ad80 100644
--- a/gtkrun.js
+++ b/gtkrun.js
@@ -10,8 +10,8 @@
  * Might be the way to go for full runtime 
  * 
  * 
- * Usage
- * GI_TYPELIB_PATH=home/alan/.Builder/gir-1.1   seed gtkrun.js /path/to/myproject
+ * Usage: (call with wrapper to set up directories..)
+ *    sh builder.sh
  * 
  * Concepts.. 
  * a) load dependancies.. (eg. gi's..) - derived later?
@@ -26,34 +26,42 @@
  */
 // autogen?
 
-// sort out import path!!!
+// sort out import path - this is  a bit of a mess..
 GIRepository = imports.gi.GIRepository;
-//GIRepository.IRepository.prepend_search_path('/home/alan/.Builder/gir-1.1/girepository-1.0');
+GLib        = imports.gi.GLib;
 
-print(JSON.stringify(GIRepository.IRepository.get_search_path()));
+// we add this in, as it appears to get lost sometimes if we set it using the ENV. variable in builder.sh
+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;
 Gdk         = imports.gi.Gdk;
 Pango       = imports.gi.Pango;
-GLib        = imports.gi.GLib;
+
 Gio         = imports.gi.Gio;
 GObject     = imports.gi.GObject;
 GtkSource   = imports.gi.GtkSource;
 WebKit      = imports.gi.WebKit;
 Vte         = imports.gi.Vte;
+ 
+//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..
@@ -63,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);
@@ -85,7 +101,7 @@ files.forEach(function(f) {
         return;
     }
     olist.push(imports[fn]);
-    
+    */
     
 });
 
@@ -93,4 +109,4 @@ files.forEach(function(f) {
 
           
 Gtk.main();
- 
\ No newline at end of file
+