colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-22 10:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made objj point to Frameworks in lib.

Browse Source 
Reviewed by tom.
This commit is contained in:
Francisco Ryan Tolmasky I
2008-09-04 04:23:16 -07:00
parent a97bb72800
commit 3d1b2f9560
6 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/build.xml
+4
View File
@@ -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>
Foundation/build.xml
+5 -1
View File
@@ -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" />
Objective-J/build.xml
+4
View File
@@ -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" />
Tools/objj/objj
+4 -4
View File
@@ -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
Tools/objj/objj.js
+4 -4
View File
@@ -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)
{
common.xml
+3
View File
@@ -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 -->