From ad24e41dd6142b82011d9783d20e12575aed5e93 Mon Sep 17 00:00:00 2001 From: Jason Perkins Date: Sat, 7 Mar 2015 13:12:11 -0500 Subject: [PATCH 1/4] Allow actions to load their module implementations on-demand. By only registering the action, we skip the processing that would been necessary to load and evaluate the module scripts. This will allow us to improve overall performance while also scaling up the number of supported actions. To force loading of the entire module (to override specific calls, for instance), call require(). --- .hgsubstate | 2 +- src/_manifest.lua | 4 ++++ src/base/action.lua | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.hgsubstate b/.hgsubstate index 83a0246f..6bcc4453 100644 --- a/.hgsubstate +++ b/.hgsubstate @@ -1 +1 @@ -3935627f6ef6f848afd1ac3b22cc1eaa7b34a582 modules/xcode +e68bbf571323ec91c409ee86f057c2b380aa35d9 modules/xcode diff --git a/src/_manifest.lua b/src/_manifest.lua index 4831f3f3..a4320fd5 100644 --- a/src/_manifest.lua +++ b/src/_manifest.lua @@ -85,4 +85,8 @@ "actions/clean/_clean.lua", "_premake_init.lua", + + -- Built-in action modules. The action is registered, but the actual + -- implementation is not loaded unless the action is used. + "modules/xcode/_action.lua", } diff --git a/src/base/action.lua b/src/base/action.lua index df5dec27..a6e45d65 100644 --- a/src/base/action.lua +++ b/src/base/action.lua @@ -197,6 +197,11 @@ if act then _OS = act.os or _OS end + + -- Some are implemented in standalone modules + if act and act.module then + require(act.module) + end end From 0f13c0470c9034d6d4303fb167ce4797386bdbbf Mon Sep 17 00:00:00 2001 From: Jason Perkins Date: Sat, 7 Mar 2015 14:09:32 -0500 Subject: [PATCH 2/4] Update to latest work-in-progress Xcode exporter --- .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.hgsubstate b/.hgsubstate index 6bcc4453..1fc3e40c 100644 --- a/.hgsubstate +++ b/.hgsubstate @@ -1 +1 @@ -e68bbf571323ec91c409ee86f057c2b380aa35d9 modules/xcode +d84289263f9f1a683b81edf200cdc349958e623a modules/xcode From 0b8d4c1544b0e057cc441f42086a0c3c1d68163b Mon Sep 17 00:00:00 2001 From: Jason Perkins Date: Mon, 9 Mar 2015 17:07:12 -0400 Subject: [PATCH 3/4] Fix embedding of Xcode action registration --- scripts/embed.lua | 1 + src/_manifest.lua | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/embed.lua b/scripts/embed.lua index 01de3580..23c61b65 100644 --- a/scripts/embed.lua +++ b/scripts/embed.lua @@ -7,6 +7,7 @@ local function loadScript(fname) + fname = path.getabsolute(fname) local f = io.open(fname) local s = assert(f:read("*a")) f:close() diff --git a/src/_manifest.lua b/src/_manifest.lua index a4320fd5..46c74f9a 100644 --- a/src/_manifest.lua +++ b/src/_manifest.lua @@ -88,5 +88,5 @@ -- Built-in action modules. The action is registered, but the actual -- implementation is not loaded unless the action is used. - "modules/xcode/_action.lua", + "../modules/xcode/_action.lua", } From b41045fbdd02321cc5e95072917db291c242d70e Mon Sep 17 00:00:00 2001 From: Jason Perkins Date: Tue, 10 Mar 2015 17:47:52 -0400 Subject: [PATCH 4/4] Integrate latest Xcode module with fixed unit tests --- .hgsubstate | 2 +- CONTRIBUTORS.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.hgsubstate b/.hgsubstate index 1fc3e40c..fd45a1d5 100644 --- a/.hgsubstate +++ b/.hgsubstate @@ -1 +1 @@ -d84289263f9f1a683b81edf200cdc349958e623a modules/xcode +44e7630091915c687ded94b1bce64d61573cf833 modules/xcode diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 1237033b..0b23793c 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -13,5 +13,7 @@ Builds and Infrastructure: * Nightly Jenkins builds and error reports Patch contributors: + Mihai Sebea + * Xcode exporter fixes and improvements noresources * add library search paths argument to os.findlib()