From 3d1b2f95602ab8d4cd8ae70f99cb13fff25e1a06 Mon Sep 17 00:00:00 2001
From: Francisco Ryan Tolmasky I <francisco@280north.com>
Date: Thu, 4 Sep 2008 04:23:16 -0700
Subject: [PATCH] Made objj point to Frameworks in lib.

Reviewed by tom.
---
 AppKit/build.xml      | 4 ++++
 Foundation/build.xml  | 6 +++++-
 Objective-J/build.xml | 4 ++++
 Tools/objj/objj       | 8 ++++----
 Tools/objj/objj.js    | 8 ++++----
 common.xml            | 3 +++
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/AppKit/build.xml b/AppKit/build.xml
index 86262c550..9802e7cf4 100644
--- a/AppKit/build.xml
+++ b/AppKit/build.xml
@@ -32,6 +32,10 @@
             <fileset dir = "${Build}/${Configuration}/AppKit" />
         </copy>        
 
+        <copy todir = "${Build.Cappuccino.Tools.Lib.Frameworks}/AppKit">
+            <fileset dir = "${Build}/${Configuration}/AppKit" />
+        </copy>
+
         <copy todir = "${Build.Cappuccino.Starter.Frameworks}/AppKit" >
             <fileset dir = "${Build}/${Configuration}/AppKit" />
         </copy>
diff --git a/Foundation/build.xml b/Foundation/build.xml
index d72125d16..4fbc75dcf 100644
--- a/Foundation/build.xml
+++ b/Foundation/build.xml
@@ -30,7 +30,11 @@
         
         <copy todir = "${Build.Cappuccino.Tools.Frameworks}/Foundation">
             <fileset dir = "${Build}/${Configuration}/Foundation" />
-        </copy>        
+        </copy>
+        
+        <copy todir = "${Build.Cappuccino.Tools.Lib.Frameworks}/Foundation">
+            <fileset dir = "${Build}/${Configuration}/Foundation" />
+        </copy>
 
         <copy todir = "${Build.Cappuccino.Starter.Frameworks}/Foundation" >
             <fileset dir = "${Build}/${Configuration}/Foundation" />
diff --git a/Objective-J/build.xml b/Objective-J/build.xml
index b4ec11492..b2da26425 100644
--- a/Objective-J/build.xml
+++ b/Objective-J/build.xml
@@ -68,6 +68,10 @@
             <fileset dir = "${Build.Objective-J}/Objective-J" />
         </copy>       
 
+        <mkdir dir = "${Build.Cappuccino.Tools.Lib.Frameworks}/Objective-J" />
+        <copy file = "${Build.Products}/Rhino/Objective-J.js" todir = "${Build.Cappuccino.Tools.Lib.Frameworks}/Objective-J" />
+        <copy file = "../LICENSE" todir = "${Build.Cappuccino.Tools.Lib.Frameworks}/Objective-J" />
+
         <mkdir dir = "${Build.Cappuccino.Starter.Frameworks}/Objective-J" />
         <copy todir = "${Build.Cappuccino.Starter.Frameworks}/Objective-J" >
             <fileset dir = "${Build.Objective-J}/Objective-J" />
diff --git a/Tools/objj/objj b/Tools/objj/objj
index ad415c0e7..db080166d 100644
--- a/Tools/objj/objj
+++ b/Tools/objj/objj
@@ -43,9 +43,9 @@ case "$UNAME" in
         ;;
 esac
 
-if [ -e $STEAM_BUILD/Objective-J.build/Release/Rhino ]; then
+#if [ -e $STEAM_BUILD/Objective-J.build/Release/Rhino ]; then
     $RLWRAP java -classpath $CLASSPATH objj $OBJJ_LIB $STEAM_BUILD $@
     #$RLWRAP java -classpath $CLASSPATH org.mozilla.javascript.tools.shell.Main $OBJJ $OBJJ_LIB $STEAM_BUILD $@
-else
-    echo "Missing frameworks at $STEAM_BUILD/Objective-J.build/Release/Rhino" 1>&2
-fi
+#else
+#    echo "Missing frameworks at $STEAM_BUILD/Objective-J.build/Release/Rhino" 1>&2
+#fi
diff --git a/Tools/objj/objj.js b/Tools/objj/objj.js
index 0c975b598..8896654c3 100644
--- a/Tools/objj/objj.js
+++ b/Tools/objj/objj.js
@@ -1,23 +1,23 @@
 debug = false;
 args = arguments;
 
-var helpersBase = arguments[0];
+var OBJJ_LIB = arguments[0];
 var STEAM_BUILD = arguments[1];
 arguments.splice(0, 2);
 
 if (typeof window == "undefined")
 {
     print("Loading Objective-J bridge.");
-    load(helpersBase+'/bridge.js');
+    load(OBJJ_LIB+'/bridge.js');
 }
 
 if (typeof objj_import == "undefined")
 {
     print("Loading Objective-J.");
-    load(STEAM_BUILD+'/Objective-J.build/Release/Rhino/Objective-J.js');
+    load(OBJJ_LIB+'/Frameworks/Objective-J/Objective-J.js');
 }
 
-OBJJ_INCLUDE_PATHS = [STEAM_BUILD+'/Release'];
+OBJJ_INCLUDE_PATHS = [OBJJ_LIB+'/Frameworks'];
 
 if (arguments.length > 0)
 {
diff --git a/common.xml b/common.xml
index 262ef1927..a6c340149 100644
--- a/common.xml
+++ b/common.xml
@@ -19,6 +19,7 @@
     
     <property name = "Build.Cappuccino.Tools.Bin" location = "${Build.Cappuccino.Tools.Objects}/objj/bin" />
     <property name = "Build.Cappuccino.Tools.Lib" location = "${Build.Cappuccino.Tools.Objects}/objj/lib" />
+    <property name = "Build.Cappuccino.Tools.Lib.Frameworks" location = "${Build.Cappuccino.Tools.Objects}/objj/lib/Frameworks" />
     
     <property environment = "environment" />
     <property name = "environment.OBJJ_HOME" value = "/usr/local/share/objj" />
@@ -40,6 +41,8 @@
         <mkdir dir = "${Build.Cappuccino.Tools.Bin}" />
         <mkdir dir = "${Build.Cappuccino.Tools.Lib}" />
         
+        <mkdir dir = "${Build.Cappuccino.Tools.Lib.Frameworks}" />
+        
     </target>
 
     <!-- Iterate -->