From 5541381afeee49e53e1797051e36f3c46e5c20ce Mon Sep 17 00:00:00 2001
From: Martin Carlberg <martin@carlberg.org>
Date: Mon, 26 Oct 2015 09:53:39 +0100
Subject: [PATCH] =?UTF-8?q?Fixed:=20Only=20have=20one=20=E2=80=99release?=
 =?UTF-8?q?=E2=80=99=20option=20for=20Jake.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removed the ’release-inline’ option when building as it is not practical to have two different options. The release build now always has inlined msgSend functions. If a release build is needed without inlined msgSend functions an edit of the ”-O2” option to ”-O” in the Jakefile is needed.
---
 AppKit/Jakefile                 |  2 +-
 AppKit/Themes/BlendKit/Jakefile |  2 +-
 Foundation/Jakefile             |  2 +-
 Jakefile                        | 14 +++-----------
 common.jake                     |  7 -------
 5 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/AppKit/Jakefile b/AppKit/Jakefile
index b08853fda..b5aeb5434 100644
--- a/AppKit/Jakefile
+++ b/AppKit/Jakefile
@@ -34,7 +34,7 @@ appKitTask = framework ("AppKit", function(appKitTask)
     }).join(" ");
 
     if ($CONFIGURATION === "Release") {
-        appKitTask.setCompilerFlags(($INLINE_MSG_SEND ? "-O2 " : "-O ") + INCLUDES);
+        appKitTask.setCompilerFlags("-O2 " + INCLUDES);
     }
     else
         appKitTask.setCompilerFlags("-DDEBUG -g " + INCLUDES);
diff --git a/AppKit/Themes/BlendKit/Jakefile b/AppKit/Themes/BlendKit/Jakefile
index f8797ec56..540297c1a 100644
--- a/AppKit/Themes/BlendKit/Jakefile
+++ b/AppKit/Themes/BlendKit/Jakefile
@@ -20,7 +20,7 @@ blendKitTask = framework ("BlendKit", function(blendKitTask)
     blendKitTask.setFlattensSources(true); // FIXME: how do we non flatten?
 
     if ($CONFIGURATION === "Release")
-        blendKitTask.setCompilerFlags($INLINE_MSG_SEND ? "-O2" : "-O");
+        blendKitTask.setCompilerFlags("-O2");
     else
         blendKitTask.setCompilerFlags("-DDEBUG -g");
 });
diff --git a/Foundation/Jakefile b/Foundation/Jakefile
index e180f19b0..066d1341b 100644
--- a/Foundation/Jakefile
+++ b/Foundation/Jakefile
@@ -51,7 +51,7 @@ foundationTask = framework ("Foundation", function(foundationTask)
     INCLUDES = "--include \"../AppKit/Platform/Platform.h\" " + INCLUDES;
 
     if ($CONFIGURATION === "Release")
-        foundationTask.setCompilerFlags(($INLINE_MSG_SEND ? "-O2 " : "-O ") + INCLUDES);
+        foundationTask.setCompilerFlags("-O2 " + INCLUDES);
     else
         foundationTask.setCompilerFlags("-DDEBUG -g " + INCLUDES);
 });
diff --git a/Jakefile b/Jakefile
index 107458477..9bbc5ff57 100644
--- a/Jakefile
+++ b/Jakefile
@@ -21,7 +21,7 @@ var subprojects = ["Objective-J", "CommonJS", "Foundation", "AppKit", "Tools"];
 $BUILD_CJS_OBJECTIVE_J_DEBUG_FRAMEWORKS = FILE.join($BUILD_CJS_OBJECTIVE_J, "Frameworks", "Debug");
 
 
-filedir ($BUILD_CJS_OBJECTIVE_J_DEBUG_FRAMEWORKS, [], function()
+filedir ($BUILD_CJS_OBJECTIVE_J_DEBUG_FRAMEWORKS, ["debug", "release"], function()
 {
     FILE.mkdirs($BUILD_CJS_OBJECTIVE_J_DEBUG_FRAMEWORKS);
 
@@ -30,7 +30,7 @@ filedir ($BUILD_CJS_OBJECTIVE_J_DEBUG_FRAMEWORKS, [], function()
 
 $BUILD_CJS_CAPPUCCINO_DEBUG_FRAMEWORKS = FILE.join($BUILD_CJS_CAPPUCCINO, "Frameworks", "Debug");
 
-filedir ($BUILD_CJS_CAPPUCCINO_DEBUG_FRAMEWORKS, [], function()
+filedir ($BUILD_CJS_CAPPUCCINO_DEBUG_FRAMEWORKS, ["debug", "release"], function()
 {
     FILE.mkdirs($BUILD_CJS_CAPPUCCINO_DEBUG_FRAMEWORKS);
 
@@ -39,9 +39,7 @@ filedir ($BUILD_CJS_CAPPUCCINO_DEBUG_FRAMEWORKS, [], function()
     cp_r(FILE.join($BUILD_DIR, "Debug", "BlendKit"), FILE.join($BUILD_CJS_CAPPUCCINO_DEBUG_FRAMEWORKS, "BlendKit"));
 });
 
-task ("CommonJS", ["debug", "release", $BUILD_CJS_OBJECTIVE_J_DEBUG_FRAMEWORKS, $BUILD_CJS_CAPPUCCINO_DEBUG_FRAMEWORKS, "debug", "release"]);
-
-task ("CommonJS-inline", ["debug", "release-inline", $BUILD_CJS_OBJECTIVE_J_DEBUG_FRAMEWORKS, $BUILD_CJS_CAPPUCCINO_DEBUG_FRAMEWORKS, "debug", "release-inline"]);
+task ("CommonJS", [$BUILD_CJS_OBJECTIVE_J_DEBUG_FRAMEWORKS, $BUILD_CJS_CAPPUCCINO_DEBUG_FRAMEWORKS, "debug", "release"]);
 
 task ("install", ["CommonJS"], function()
 {
@@ -49,12 +47,6 @@ task ("install", ["CommonJS"], function()
     installCopy($BUILD_CJS_CAPPUCCINO, false);
 });
 
-task ("install-inline", ["CommonJS-inline"], function()
-{
-    installCopy($BUILD_CJS_OBJECTIVE_J, false);
-    installCopy($BUILD_CJS_CAPPUCCINO, false);
-});
-
 task ("sudo-install", ["CommonJS"], function()
 {
     installCopy($BUILD_CJS_OBJECTIVE_J, true);
diff --git a/common.jake b/common.jake
index 4fae0fdea..00f65302f 100644
--- a/common.jake
+++ b/common.jake
@@ -598,13 +598,6 @@ task ("release", function()
     spawnJake("build");
 });
 
-task ("release-inline", function()
-{
-    SYSTEM.env["CONFIG"] = "Release";
-    SYSTEM.env['INLINE_MSG_SEND'] = true;
-    spawnJake("build");
-});
-
 task ("debug", function()
 {
     SYSTEM.env["CONFIG"] = "Debug";