summaryrefslogtreecommitdiff
path: root/xmake/scripts/platform/linux
diff options
context:
space:
mode:
authorruki <[email protected]>2015-06-04 15:46:43 +0800
committerruki <[email protected]>2015-06-04 15:46:43 +0800
commit6c5fbedfe26db54b0bbb95fa9154ed759c7ad98f (patch)
treec7a1d2ba8ee4076e7576df79a53c1dfaadf7f14b /xmake/scripts/platform/linux
parent83295bd3a1b27f844759aeadbbdc23f51e2f2d89 (diff)
rebuild compiler and linker
Diffstat (limited to 'xmake/scripts/platform/linux')
-rw-r--r--xmake/scripts/platform/linux/linux.lua36
-rw-r--r--xmake/scripts/platform/linux/prober.lua16
2 files changed, 26 insertions, 26 deletions
diff --git a/xmake/scripts/platform/linux/linux.lua b/xmake/scripts/platform/linux/linux.lua
index 57d436eb5..3cc436d39 100644
--- a/xmake/scripts/platform/linux/linux.lua
+++ b/xmake/scripts/platform/linux/linux.lua
@@ -17,51 +17,51 @@
-- Copyright (C) 2009 - 2015, ruki All rights reserved.
--
-- @author ruki
--- @file _linux.lua
+-- @file linux.lua
--
--- define module: _linux
-local _linux = _linux or {}
+-- define module: linux
+local linux = linux or {}
-- load modules
local config = require("base/config")
-- init host
-_linux._HOST = "linux"
+linux._HOST = "linux"
-- init architectures
-_linux._ARCHS = {"x86", "x64"}
+linux._ARCHS = {"x86", "x64"}
-- make configure
-function _linux.make(configs)
+function linux.make(configs)
- -- init the file name format
- configs.format = {}
- configs.format.static = {"lib", ".a"}
- configs.format.object = {"", ".o"}
- configs.format.shared = {"lib", ".so"}
+ -- init the file formats
+ configs.formats = {}
+ configs.formats.static = {"lib", ".a"}
+ configs.formats.object = {"", ".o"}
+ configs.formats.shared = {"lib", ".so"}
end
-- get the option menu for action: xmake config or global
-function _linux.menu(action)
+function linux.menu(action)
-- init config option menu
- _linux._MENU_CONFIG = _linux._MENU_CONFIG or
+ linux._MENU_CONFIG = linux._MENU_CONFIG or
{ {}
, {nil, "ar", "kv", nil, "The Library Creator" }
, {nil, "arflags", "kv", nil, "The Library Creator Flags" }
}
-- init global option menu
- _linux._MENU_GLOBAL = _linux._MENU_GLOBAL or {}
+ linux._MENU_GLOBAL = linux._MENU_GLOBAL or {}
-- get the option menu
if action == "config" then
- return _linux._MENU_CONFIG
+ return linux._MENU_CONFIG
elseif action == "global" then
- return _linux._MENU_GLOBAL
+ return linux._MENU_GLOBAL
end
end
--- return module: _linux
-return _linux
+-- return module: linux
+return linux
diff --git a/xmake/scripts/platform/linux/prober.lua b/xmake/scripts/platform/linux/prober.lua
index 717bd71fe..f8418ff12 100644
--- a/xmake/scripts/platform/linux/prober.lua
+++ b/xmake/scripts/platform/linux/prober.lua
@@ -17,7 +17,7 @@
-- Copyright (C) 2009 - 2015, ruki All rights reserved.
--
-- @author ruki
--- @file _prober.lua
+-- @file prober.lua
--
-- load modules
@@ -26,11 +26,11 @@ local path = require("base/path")
local utils = require("base/utils")
local string = require("base/string")
--- define module: _prober
-local _prober = _prober or {}
+-- define module: prober
+local prober = prober or {}
-- probe the architecture
-function _prober._probe_arch(configs)
+function prober._probe_arch(configs)
-- get the architecture
local arch = configs.arch
@@ -46,12 +46,12 @@ function _prober._probe_arch(configs)
end
-- probe the configure
-function _prober.done(configs, is_global)
+function prober.done(configs, is_global)
-- probe the architecture
- if not _prober._probe_arch(configs) then return end
+ if not prober._probe_arch(configs) then return end
end
--- return module: _prober
-return _prober
+-- return module: prober
+return prober