Merge branch 'master' of http://private.akbkhome.com/app.Builder.js

diff --git a/.gitmodules b/.gitmodules
index 957e402..14b997f 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "roojs1"]
        path = roojs1
        url = http://public.akbkhome.com/roojs1
+[submodule "gir-1.1"]
+       path = gir-1.1
+       url = http://private.akbkhome.com/gir-1.1

diff --git a/builder.sh b/builder.sh
new file mode 100755 (executable)
index 0000000..ff739f0
--- /dev/null
+++ b/builder.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# use our overridden typelibs.
+export GI_TYPELIB_PATH=~/.Builder/girepository-1.1
+
+# run theapplication.
+seed gtkrun.js Sample
\ No newline at end of file

diff --git a/gir-1.1 b/gir-1.1
new file mode 160000 (submodule)
index 0000000..41e741c
--- /dev/null
+++ b/gir-1.1
@@ -0,0 +1 @@
+Subproject commit 41e741c79921d77fe46fc2778899d6553b8b6a11

diff --git a/gtkrun.js b/gtkrun.js
index 622e113..94c96cb 100644 (file)
--- a/gtkrun.js
+++ b/gtkrun.js
@@ -25,6 +25,9 @@
  * 
  */
 // autogen?
+
+// sort out import path!!!
+ 
  
 Gtk = imports.gi.Gtk;
 Gdk = imports.gi.Gdk;

diff --git a/install.sh b/install.sh
new file mode 100755 (executable)
index 0000000..2aa929a
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+ 
+#// compile GIR's
+mkdir ~/.Builder/girepository-1.1/ || false
+ 
+ls gir-1.1 | sed s/.gir// | awk \
+    '{ print "g-ir-compiler  gir-1.1/" $1 ".gir -o  ~/.Builder/girepository-1.1/" $1 ".typelib" }' \
+    | sh -x

diff --git a/install_gir.sh b/install_gir.sh
deleted file mode 100644 (file)
index 0c743aa..0000000
--- a/install_gir.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-cd /tmp
-wget http://devel.akbkhome.com/seed/Gtk-2.0.gir
-cp Gtk-2.0.gir /usr/share/gir-1.0/
-g-ir-compiler /usr/share/gir-1.0/Gtk-2.0.gir -o /usr/lib/girepository-1.0/Gtk-2.0.typelib 

diff --git a/roojs1 b/roojs1
index e6f019d..9f5cd7b 160000 (submodule)
--- a/roojs1
+++ b/roojs1
@@ -1 +1 @@
-Subproject commit e6f019d1535671672e34eb6a46fa31b9a98fedb2
+Subproject commit 9f5cd7b8819fcbf8a81a376001e841245ca07ac5