diff --git a/AppKit/AppKit.steam b/AppKit/AppKit.steam
index 58d5240056..f430b53d7f 100644
--- a/AppKit/AppKit.steam
+++ b/AppKit/AppKit.steam
@@ -19,22 +19,6 @@
CoreGraphics/CGContextCanvas.j
CoreGraphics/CGContextVML.j
- Flags
- -DPLATFORM_DOM
-
-
- Name
- AppKit-Rhino
- Excluded
-
- CPOutlineView.j
- CPTableColumn.j
- CPTableView.j
- Themes
-
- CoreGraphics/CGContextCanvas.j
- CoreGraphics/CGContextVML.j
-
Configurations
@@ -43,12 +27,24 @@
Name
Debug
Flags
- -DDEBUG -g
+ -DDEBUG -DPLATFORM_DOM -g
Name
Release
Flags
+ -DPLATFORM_DOM -O
+
+
+ Name
+ Debug-Rhino
+ Flags
+ -DDEBUG -g
+
+
+ Name
+ Release-Rhino
+ Flags
-O
diff --git a/AppKit/build.xml b/AppKit/build.xml
index 327bc4b877..fd1cf5001b 100644
--- a/AppKit/build.xml
+++ b/AppKit/build.xml
@@ -2,7 +2,7 @@
-
+
@@ -25,7 +25,7 @@
-
+
diff --git a/Foundation/build.xml b/Foundation/build.xml
index b42c68463c..cccf52536d 100644
--- a/Foundation/build.xml
+++ b/Foundation/build.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/Objective-J/file.js b/Objective-J/file.js
index 8c2e2d6cbd..1ea8acf6b5 100644
--- a/Objective-J/file.js
+++ b/Objective-J/file.js
@@ -135,6 +135,14 @@ objj_search.prototype.attemptNextSearchPath = function()
if (file)
{
objj_alert("The file request at " + this.filePath + " has already been downloaded at " + searchPath);
+ // FIXME: Do we need this for everything?
+#if RHINO
+ var index = 0,
+ count = this.searchedPaths.length;
+
+ for (; index < count; ++index)
+ objj_files[this.searchedPaths[index]] = file;
+#end
if (this.didCompleteCallback)
this.didCompleteCallback(file);
diff --git a/Tools/Utilities/bundle.js b/Tools/Utilities/bundle.js
index 2e3a3d3ecf..73ea34928c 100644
--- a/Tools/Utilities/bundle.js
+++ b/Tools/Utilities/bundle.js
@@ -111,7 +111,7 @@ function loadFrameworks(frameworkPaths, aCallback)
java.lang.System.out.println("'" + frameworkPath + "' is not a framework or could not be found.");
java.lang.System.exit(1);
}
-
+
var infoDictionary = readPlist(new File(frameworkPath + "/Info.plist"));
if (dictionary_getValue(infoDictionary, "CPBundlePackageType") !== "FMWK")
@@ -119,13 +119,13 @@ function loadFrameworks(frameworkPaths, aCallback)
java.lang.System.out.println("'" + frameworkPath + "' is not a framework .");
java.lang.System.exit(1);
}
-
+
var files = dictionary_getValue(infoDictionary, "CPBundleReplacedFiles"),
index = 0,
count = files.length;
for (; index < count; ++index)
files[index] = String(frameworkPath + '/' + files[index]);
-
+
importFiles(files, function() { loadFrameworks(frameworkPaths, aCallback) });
}
diff --git a/Tools/nib2cib/build.xml b/Tools/nib2cib/build.xml
index c2bfbe50b2..4ab48491fa 100644
--- a/Tools/nib2cib/build.xml
+++ b/Tools/nib2cib/build.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/Tools/steam/Project.js b/Tools/steam/Project.js
index b4286dfc7a..1690140f2b 100644
--- a/Tools/steam/Project.js
+++ b/Tools/steam/Project.js
@@ -238,8 +238,24 @@ Project.prototype.activeFlags = function()
Project.prototype.buildTheme = function()
{
- var project = this;
+ var project = this/*,
+ frameworks = NULL;
+ // FIXME: OBJJ_INCLUDE_PATHS ENV VAR?
+ if (true)
+ {
+ OBJJ_INCLUDE_PATHS = [System.getenv("STEAM_BUILD") + "/Release-Rhino/", System.getenv("STEAM_BUILD") + "/Release/"];
+ frameworks = [System.getenv("STEAM_BUILD") + "/Release/Foundation", System.getenv("STEAM_BUILD") + "/Release-Rhino/AppKit"];
+ }
+ else
+ {
+ OBJJ_INCLUDE_PATHS = [OBJJ_HOME + "/lib/Frameworks-Rhino"];
+ frameworks = [OBJJ_HOME + "/lib/Frameworks-Rhino/Foundation", OBJJ_HOME + "/lib/Frameworks-Rhino/AppKit"];
+ }
+
+ // Load ALL of Foundation and AppKit, be nice to people.
+ loadFrameworks(frameworks, function()*/
+
// FIXME: This should be stubbed out. It is also in objj.js
var OBJJ_LIB = OBJJ_HOME + "/lib/";
@@ -255,13 +271,11 @@ Project.prototype.buildTheme = function()
OBJJ_INCLUDE_PATHS.push(defaultFrameworks);
}
+ OBJJ_INCLUDE_PATHS = [System.getenv("STEAM_BUILD") + "/Release-Rhino/", System.getenv("STEAM_BUILD") + "/Release/"];
+
// Load ALL of Foundation and AppKit, be nice to people.
- loadFrameworks([OBJJ_LIB + "/Frameworks-Rhino/Foundation", OBJJ_LIB + "/Frameworks-Rhino/AppKit"], function()
+ loadFrameworks([System.getenv("STEAM_BUILD") + "/Release/Foundation", System.getenv("STEAM_BUILD") + "/Release-Rhino/AppKit"], function()
{
- // FIXME!
- if (!objj_getClass("CPTheme"))
- return;
-
// Get .j files
var jFiles = getFiles(project._root, "j", project.activeTarget().exclusions().concat("Frameworks/"));
@@ -335,7 +349,7 @@ Project.prototype.buildTheme = function()
writer.close();
});
});
-
+
serviceTimeouts();
this.copyResources();
@@ -391,7 +405,7 @@ Project.prototype.build = function()
if (hasModifiedJFiles)
{
// concatenate sjheader.txt and individual .o
- exec(["sh", "-c", "cat '" + OBJJ_HOME + "/lib/sjheader.txt' '" + oFiles.join("' '") + "' > '" + sjFile.getCanonicalPath() + "'"], true);
+ exec(["sh", "-c", "cat '" + OBJJ_STEAM + "/sjheader.txt' '" + oFiles.join("' '") + "' > '" + sjFile.getCanonicalPath() + "'"], true);
}
if (shouldGzip)
diff --git a/Tools/steam/main.js b/Tools/steam/main.js
index 211989dc84..d007905f76 100644
--- a/Tools/steam/main.js
+++ b/Tools/steam/main.js
@@ -13,13 +13,15 @@ importClass(java.io.SequenceInputStream);
#include "Project.js"
+OBJJ_STEAM = OBJJ_HOME + "/lib/steam/";
+
function main()
{
if (arguments.length < 1)
printUsage();
var command = Array.prototype.shift.apply(arguments);
-
+
switch (command)
{
case "create": create.apply(create, arguments);
diff --git a/build.xml b/build.xml
index eb3fa2de8b..c4ccf76550 100644
--- a/build.xml
+++ b/build.xml
@@ -206,10 +206,9 @@
-
-
-
-
+
+
+
@@ -217,10 +216,9 @@
-
-
-
-
+
+
+