X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=gtkrun.js;h=f7619bf9f6b36a34f7d091760c745322261c5929;hb=254b72ddf3a3543f2fc5edb16cb09aecc8e2a423;hp=860bd8a61e8f739e2254254920d8b866ffb58a9c;hpb=1628fa12e755d059dc6382d3256cf0d3bb76e65a;p=app.Builder.js

diff --git a/gtkrun.js b/gtkrun.js
index 860bd8a61..f7619bf9f 100644
--- a/gtkrun.js
+++ b/gtkrun.js
@@ -1,4 +1,4 @@
-#!/usr/bin/seed
+#!/usr/bin/seed 
 //<Script type="text/javascript">
 /**
  * runtime file
@@ -10,8 +10,8 @@
  * Might be the way to go for full runtime 
  * 
  * 
- * Usage
- * 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?
@@ -25,38 +25,73 @@
  * 
  */
 // autogen?
- 
-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;
 
-File = imports.File.File;
+// sort out import path - this is  a bit of a mess..
+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
+if (GIRepository.IRepository) { 
+    GIRepository.IRepository.prepend_search_path(
+        GLib.get_home_dir() + '/.Builder/girepository-1.1');
+}
+//print(JSON.stringify(GIRepository.IRepository.get_search_path()));
+
+Gtk         = imports.gi.Gtk;
+Gdk         = imports.gi.Gdk;
+Pango       = imports.gi.Pango;
+
+Gio         = imports.gi.Gio;
+GObject     = imports.gi.GObject;
+GtkSource   = imports.gi.GtkSource;
+WebKit      = imports.gi.WebKit;
+Vte         = imports.gi.Vte;
+
+// we do not use these yet..
+//Gdl         = imports.gi.Gdl;
+GtkClutter  = imports.gi.GtkClutter;
 
+if (GtkClutter) {    
+    GtkClutter.init(Seed.argv);
+}
+
+File    = imports.File.File;
+
+XObject = imports.XObject.XObject;
+//XObject.debug = true;
 Gtk.init(Seed.argv);
 
+
+imports.searchPath.push('/'); // allow global paths..
 // error checking todo..
 var files = File.list(Seed.argv[2]);
 var olist = [];
 
 var gtkbuilder = false;
 files.forEach(function(f) {
-    if (!f.match(/\.bjs$/)) {
-        continue;
+    var fp = Seed.argv[2] + '/' + f;
+    if (!fp.match(/\.bjs$/)) {
+        return;
     }
-    if (File.isFile(f.replace(/\.bjs$/, '.js'))) {
-        olist.push(imports[f.replace(/\.bjs$/, '.js')]);
-        continue;
+    var js = fp.replace(/\.bjs$/, '.js');
+    if (File.isFile(js)) {
+        // check file time.. = bjs is less than compiled file..
+        if (File.mtime(fp) < File.mtime(js)) {
+            XObject.log("LOADING" + js);
+            olist.push(imports[js]);
+            return;
+        }
+        
+        
     }
-    var gtkbuilder =  new imports.Builder.Provider.File.Gtk.Gtk({ path : f });
-    gtkbuilder.loadItems();
-    gtkbuilder.saveJS();
-    olist.push(imports[f.replace(/\.bjs$/, '.js')]);
+    var gtkbuilder =  new imports.Builder.Provider.File.Gtk.Gtk({ path : fp });
+    gtkbuilder.loadItems(function() { });
+    XObject.log("COMPILING" + js);
+    var fn = gtkbuilder.saveJS();
+    if (fn === false) { // skip files that do not contain anythng!
+        return;
+    }
+    olist.push(imports[fn]);
     
     
 });
@@ -65,4 +100,4 @@ files.forEach(function(f) {
 
           
 Gtk.main();
- 
\ No newline at end of file
+