restore platform and project menu

36 files changed, 71 insertions, 71 deletions

diff --git a/xmake/core/platform/compiler.lua b/xmake/core/platform/compiler.lua
index 7196abd6a..04932dda2 100644
--- a/xmake/core/platform/compiler.lua
+++ b/xmake/core/platform/compiler.lua
@@ -26,14 +26,14 @@ local compiler = compiler or {}
 -- load modules
 local io        = require("base/io")
 local path      = require("base/path")
-local rule      = require("base/rule")
 local utils     = require("base/utils")
 local table     = require("base/table")
 local option    = require("base/option")
 local string    = require("base/string")
-local config    = require("base/config")
-local tools     = require("platform/tool")
-local platform  = require("base/platform")
+local rule      = require("project/rule")
+local config    = require("project/config")
+local tool      = require("platform/tool")
+local platform  = require("platform/platform")
 
 -- map gcc flag to the given compiler flag
 function compiler._mapflag(module, flag)
@@ -408,7 +408,7 @@ function compiler.get(srcfile)
     end
 
     -- get compiler from the source file type
-    local module = tools.get(kind)
+    local module = tool.get(kind)
     if module then 
         
         -- invalid compiler
diff --git a/xmake/core/platform/linker.lua b/xmake/core/platform/linker.lua
index b245ee767..0ecb3b5a3 100644
--- a/xmake/core/platform/linker.lua
+++ b/xmake/core/platform/linker.lua
@@ -28,10 +28,10 @@ local utils     = require("base/utils")
 local table     = require("base/table")
 local string    = require("base/string")
 local option    = require("base/option")
-local config    = require("base/config")
-local compiler  = require("base/compiler")
-local tools     = require("platform/tool")
-local platform  = require("base/platform")
+local config    = require("project/config")
+local compiler  = require("platform/compiler")
+local tool      = require("platform/tool")
+local platform  = require("platform/platform")
 
 -- map gcc flag to the given linker flag
 function linker._mapflag(module, flag)
@@ -289,7 +289,7 @@ function linker.get(kind)
     else return end
  
     -- get it
-    local module = tools.get(name)
+    local module = tool.get(name)
 
     -- invalid linker?
     if module and not module.command_link then
diff --git a/xmake/core/platform/platform.lua b/xmake/core/platform/platform.lua
index 6a4481a09..42e49f1d2 100644
--- a/xmake/core/platform/platform.lua
+++ b/xmake/core/platform/platform.lua
@@ -28,14 +28,14 @@ local os        = require("base/os")
 local path      = require("base/path")
 local utils     = require("base/utils")
 local option    = require("base/option")
-local config    = require("base/config")
-local global    = require("base/global")
+local config    = require("project/config")
+local global    = require("project/global")
 
 -- the directories of platforms
 function platform._directories()
 
     return  {   path.join(global.directory(), "platforms")
-            ,   path.join(xmake._CORE_DIR, "platforms")
+            ,   path.join(xmake._CORE_DIR, "platform/platforms")
             }
 end
 
diff --git a/xmake/core/platform/platforms/android/android.lua b/xmake/core/platform/platforms/android/android.lua
index 317105fe3..961d83dcc 100644
--- a/xmake/core/platform/platforms/android/android.lua
+++ b/xmake/core/platform/platforms/android/android.lua
@@ -24,7 +24,7 @@
 local android = android or {}
 
 -- load modules
-local config        = require("base/config")
+local config        = require("project/config")
 
 -- init host
 android._HOST       = xmake._HOST
diff --git a/xmake/core/platform/platforms/android/prober.lua b/xmake/core/platform/platforms/android/prober.lua
index ccfd58ba6..215a93bfe 100644
--- a/xmake/core/platform/platforms/android/prober.lua
+++ b/xmake/core/platform/platforms/android/prober.lua
@@ -26,8 +26,8 @@ local path      = require("base/path")
 local utils     = require("base/utils")
 local string    = require("base/string")
 local tool      = require("platform/tool")
-local config    = require("base/config")
-local global    = require("base/global")
+local config    = require("project/config")
+local global    = require("project/global")
 
 -- define module: prober
 local prober = prober or {}
diff --git a/xmake/core/platform/platforms/iphoneos/iphoneos.lua b/xmake/core/platform/platforms/iphoneos/iphoneos.lua
index 720ac90e2..0336cc0b2 100644
--- a/xmake/core/platform/platforms/iphoneos/iphoneos.lua
+++ b/xmake/core/platform/platforms/iphoneos/iphoneos.lua
@@ -24,7 +24,7 @@
 local iphoneos = iphoneos or {}
 
 -- load modules
-local config        = require("base/config")
+local config        = require("project/config")
 
 -- init host
 iphoneos._HOST      = "macosx"
diff --git a/xmake/core/platform/platforms/iphoneos/package.lua b/xmake/core/platform/platforms/iphoneos/package.lua
index c155b18f8..4a7a25fd8 100644
--- a/xmake/core/platform/platforms/iphoneos/package.lua
+++ b/xmake/core/platform/platforms/iphoneos/package.lua
@@ -26,10 +26,10 @@ local package = package or {}
 -- load modules
 local os        = require("base/os")
 local path      = require("base/path")
-local rule      = require("base/rule")
+local rule      = require("project/rule")
 local utils     = require("base/utils")
 local string    = require("base/string")
-local platform  = require("base/platform")
+local platform  = require("platform/platform")
 
 -- package target 
 function package.main(target)
diff --git a/xmake/core/platform/platforms/iphoneos/prober.lua b/xmake/core/platform/platforms/iphoneos/prober.lua
index 519d3abc1..46b923326 100644
--- a/xmake/core/platform/platforms/iphoneos/prober.lua
+++ b/xmake/core/platform/platforms/iphoneos/prober.lua
@@ -26,8 +26,8 @@ local path      = require("base/path")
 local utils     = require("base/utils")
 local string    = require("base/string")
 local tool      = require("platform/tool")
-local config    = require("base/config")
-local global    = require("base/global")
+local config    = require("project/config")
+local global    = require("project/global")
 
 -- define module: prober
 local prober = prober or {}
diff --git a/xmake/core/platform/platforms/iphonesimulator/iphonesimulator.lua b/xmake/core/platform/platforms/iphonesimulator/iphonesimulator.lua
index 1e8bb5eaa..3b2bd1ff8 100644
--- a/xmake/core/platform/platforms/iphonesimulator/iphonesimulator.lua
+++ b/xmake/core/platform/platforms/iphonesimulator/iphonesimulator.lua
@@ -24,7 +24,7 @@
 local iphonesimulator = iphonesimulator or {}
 
 -- load modules
-local config                = require("base/config")
+local config                = require("project/config")
 
 -- init host
 iphonesimulator._HOST       = "macosx"
diff --git a/xmake/core/platform/platforms/iphonesimulator/prober.lua b/xmake/core/platform/platforms/iphonesimulator/prober.lua
index 06ecd11f1..1dfef6ec3 100644
--- a/xmake/core/platform/platforms/iphonesimulator/prober.lua
+++ b/xmake/core/platform/platforms/iphonesimulator/prober.lua
@@ -26,8 +26,8 @@ local path      = require("base/path")
 local utils     = require("base/utils")
 local string    = require("base/string")
 local tool      = require("platform/tool")
-local config    = require("base/config")
-local global    = require("base/global")
+local config    = require("project/config")
+local global    = require("project/global")
 
 -- define module: prober
 local prober = prober or {}
diff --git a/xmake/core/platform/platforms/linux/install.lua b/xmake/core/platform/platforms/linux/install.lua
index 2aaa2d401..e8a74804f 100644
--- a/xmake/core/platform/platforms/linux/install.lua
+++ b/xmake/core/platform/platforms/linux/install.lua
@@ -26,10 +26,10 @@ local install = install or {}
 -- load modules
 local os        = require("base/os")
 local path      = require("base/path")
-local rule      = require("base/rule")
+local rule      = require("project/rule")
 local utils     = require("base/utils")
 local string    = require("base/string")
-local platform  = require("base/platform")
+local platform  = require("platform/platform")
 
 -- install target for the library file
 function install._done_library(target)
diff --git a/xmake/core/platform/platforms/linux/linux.lua b/xmake/core/platform/platforms/linux/linux.lua
index 92a61953d..d70224351 100644
--- a/xmake/core/platform/platforms/linux/linux.lua
+++ b/xmake/core/platform/platforms/linux/linux.lua
@@ -24,7 +24,7 @@
 local linux = linux or {}
 
 -- load modules
-local config    = require("base/config")
+local config    = require("project/config")
 
 -- init host
 linux._HOST    = "linux"
diff --git a/xmake/core/platform/platforms/linux/prober.lua b/xmake/core/platform/platforms/linux/prober.lua
index b7db919ef..9148185af 100644
--- a/xmake/core/platform/platforms/linux/prober.lua
+++ b/xmake/core/platform/platforms/linux/prober.lua
@@ -26,8 +26,8 @@ local path      = require("base/path")
 local utils     = require("base/utils")
 local string    = require("base/string")
 local tool      = require("platform/tool")
-local config    = require("base/config")
-local global    = require("base/global")
+local config    = require("project/config")
+local global    = require("project/global")
 
 -- define module: prober
 local prober = prober or {}
diff --git a/xmake/core/platform/platforms/linux/uninstall.lua b/xmake/core/platform/platforms/linux/uninstall.lua
index 2de89ac8e..f83913a4a 100644
--- a/xmake/core/platform/platforms/linux/uninstall.lua
+++ b/xmake/core/platform/platforms/linux/uninstall.lua
@@ -26,10 +26,10 @@ local uninstall = uninstall or {}
 -- load modules
 local os        = require("base/os")
 local path      = require("base/path")
-local rule      = require("base/rule")
+local rule      = require("project/rule")
 local utils     = require("base/utils")
 local string    = require("base/string")
-local platform  = require("base/platform")
+local platform  = require("platform/platform")
 
 -- uninstall target for the library file
 function uninstall._done_library(target)
diff --git a/xmake/core/platform/platforms/macosx/install.lua b/xmake/core/platform/platforms/macosx/install.lua
index 2aaa2d401..e8a74804f 100644
--- a/xmake/core/platform/platforms/macosx/install.lua
+++ b/xmake/core/platform/platforms/macosx/install.lua
@@ -26,10 +26,10 @@ local install = install or {}
 -- load modules
 local os        = require("base/os")
 local path      = require("base/path")
-local rule      = require("base/rule")
+local rule      = require("project/rule")
 local utils     = require("base/utils")
 local string    = require("base/string")
-local platform  = require("base/platform")
+local platform  = require("platform/platform")
 
 -- install target for the library file
 function install._done_library(target)
diff --git a/xmake/core/platform/platforms/macosx/macosx.lua b/xmake/core/platform/platforms/macosx/macosx.lua
index dfc011418..31a9f0296 100644
--- a/xmake/core/platform/platforms/macosx/macosx.lua
+++ b/xmake/core/platform/platforms/macosx/macosx.lua
@@ -24,7 +24,7 @@
 local macosx = macosx or {}
 
 -- load modules
-local config    = require("base/config")
+local config    = require("project/config")
 
 -- init host
 macosx._HOST   = "macosx"
diff --git a/xmake/core/platform/platforms/macosx/prober.lua b/xmake/core/platform/platforms/macosx/prober.lua
index a1f1e0a0c..64dd607b5 100644
--- a/xmake/core/platform/platforms/macosx/prober.lua
+++ b/xmake/core/platform/platforms/macosx/prober.lua
@@ -26,8 +26,8 @@ local path      = require("base/path")
 local utils     = require("base/utils")
 local string    = require("base/string")
 local tool      = require("platform/tool")
-local config    = require("base/config")
-local global    = require("base/global")
+local config    = require("project/config")
+local global    = require("project/global")
 
 -- define module: prober
 local prober = prober or {}
diff --git a/xmake/core/platform/platforms/macosx/uninstall.lua b/xmake/core/platform/platforms/macosx/uninstall.lua
index 2de89ac8e..f83913a4a 100644
--- a/xmake/core/platform/platforms/macosx/uninstall.lua
+++ b/xmake/core/platform/platforms/macosx/uninstall.lua
@@ -26,10 +26,10 @@ local uninstall = uninstall or {}
 -- load modules
 local os        = require("base/os")
 local path      = require("base/path")
-local rule      = require("base/rule")
+local rule      = require("project/rule")
 local utils     = require("base/utils")
 local string    = require("base/string")
-local platform  = require("base/platform")
+local platform  = require("platform/platform")
 
 -- uninstall target for the library file
 function uninstall._done_library(target)
diff --git a/xmake/core/platform/platforms/mingw/mingw.lua b/xmake/core/platform/platforms/mingw/mingw.lua
index adb771a1f..ce263bae6 100644
--- a/xmake/core/platform/platforms/mingw/mingw.lua
+++ b/xmake/core/platform/platforms/mingw/mingw.lua
@@ -24,7 +24,7 @@
 local mingw = mingw or {}
 
 -- load modules
-local config    = require("base/config")
+local config    = require("project/config")
 
 -- init host
 mingw._HOST    = xmake._HOST
diff --git a/xmake/core/platform/platforms/mingw/prober.lua b/xmake/core/platform/platforms/mingw/prober.lua
index e5ebf5945..098c27244 100644
--- a/xmake/core/platform/platforms/mingw/prober.lua
+++ b/xmake/core/platform/platforms/mingw/prober.lua
@@ -26,8 +26,8 @@ local path      = require("base/path")
 local utils     = require("base/utils")
 local string    = require("base/string")
 local tool      = require("platform/tool")
-local config    = require("base/config")
-local global    = require("base/global")
+local config    = require("project/config")
+local global    = require("project/global")
 
 -- define module: prober
 local prober = prober or {}
diff --git a/xmake/core/platform/platforms/watchos/package.lua b/xmake/core/platform/platforms/watchos/package.lua
index c155b18f8..4a7a25fd8 100644
--- a/xmake/core/platform/platforms/watchos/package.lua
+++ b/xmake/core/platform/platforms/watchos/package.lua
@@ -26,10 +26,10 @@ local package = package or {}
 -- load modules
 local os        = require("base/os")
 local path      = require("base/path")
-local rule      = require("base/rule")
+local rule      = require("project/rule")
 local utils     = require("base/utils")
 local string    = require("base/string")
-local platform  = require("base/platform")
+local platform  = require("platform/platform")
 
 -- package target 
 function package.main(target)
diff --git a/xmake/core/platform/platforms/watchos/prober.lua b/xmake/core/platform/platforms/watchos/prober.lua
index 5c6ea542d..0f893acc0 100644
--- a/xmake/core/platform/platforms/watchos/prober.lua
+++ b/xmake/core/platform/platforms/watchos/prober.lua
@@ -26,8 +26,8 @@ local path      = require("base/path")
 local utils     = require("base/utils")
 local string    = require("base/string")
 local tool      = require("platform/tool")
-local config    = require("base/config")
-local global    = require("base/global")
+local config    = require("project/config")
+local global    = require("project/global")
 
 -- define module: prober
 local prober = prober or {}
diff --git a/xmake/core/platform/platforms/watchos/watchos.lua b/xmake/core/platform/platforms/watchos/watchos.lua
index 600de3b69..3f04d6082 100644
--- a/xmake/core/platform/platforms/watchos/watchos.lua
+++ b/xmake/core/platform/platforms/watchos/watchos.lua
@@ -24,7 +24,7 @@
 local watchos = watchos or {}
 
 -- load modules
-local config        = require("base/config")
+local config        = require("project/config")
 
 -- init host
 watchos._HOST      = "macosx"
diff --git a/xmake/core/platform/platforms/watchsimulator/prober.lua b/xmake/core/platform/platforms/watchsimulator/prober.lua
index 81404150c..168845d03 100644
--- a/xmake/core/platform/platforms/watchsimulator/prober.lua
+++ b/xmake/core/platform/platforms/watchsimulator/prober.lua
@@ -26,8 +26,8 @@ local path      = require("base/path")
 local utils     = require("base/utils")
 local string    = require("base/string")
 local tool      = require("platform/tool")
-local config    = require("base/config")
-local global    = require("base/global")
+local config    = require("project/config")
+local global    = require("project/global")
 
 -- define module: prober
 local prober = prober or {}
diff --git a/xmake/core/platform/platforms/watchsimulator/watchsimulator.lua b/xmake/core/platform/platforms/watchsimulator/watchsimulator.lua
index 19f44d3b8..c0b29e120 100644
--- a/xmake/core/platform/platforms/watchsimulator/watchsimulator.lua
+++ b/xmake/core/platform/platforms/watchsimulator/watchsimulator.lua
@@ -24,7 +24,7 @@
 local watchsimulator = watchsimulator or {}
 
 -- load modules
-local config                = require("base/config")
+local config                = require("project/config")
 
 -- init host
 watchsimulator._HOST       = "macosx"
diff --git a/xmake/core/platform/platforms/windows/prober.lua b/xmake/core/platform/platforms/windows/prober.lua
index 7acc945f2..5ed3c9c50 100644
--- a/xmake/core/platform/platforms/windows/prober.lua
+++ b/xmake/core/platform/platforms/windows/prober.lua
@@ -26,10 +26,10 @@ local os        = require("base/os")
 local path      = require("base/path")
 local utils     = require("base/utils")
 local string    = require("base/string")
-local config    = require("base/config")
-local global    = require("base/global")
+local config    = require("project/config")
+local global    = require("project/global")
 local tool      = require("platform/tool")
-local platform  = require("base/platform")
+local platform  = require("platform/platform")
 
 -- define module: prober
 local prober = prober or {}
diff --git a/xmake/core/platform/platforms/windows/tools/cl.lua b/xmake/core/platform/platforms/windows/tools/cl.lua
index 51184dc1a..d03cbc056 100644
--- a/xmake/core/platform/platforms/windows/tools/cl.lua
+++ b/xmake/core/platform/platforms/windows/tools/cl.lua
@@ -26,8 +26,8 @@ local cl = cl or {}
 -- load modules
 local utils     = require("base/utils")
 local string    = require("base/string")
-local config    = require("base/config")
-local platform  = require("base/platform")
+local config    = require("project/config")
+local platform  = require("platform/platform")
 
 -- init the compiler
 function cl.init(self, name)
diff --git a/xmake/core/platform/platforms/windows/tools/lib.lua b/xmake/core/platform/platforms/windows/tools/lib.lua
index 3ff37829d..571d0ef3f 100644
--- a/xmake/core/platform/platforms/windows/tools/lib.lua
+++ b/xmake/core/platform/platforms/windows/tools/lib.lua
@@ -29,8 +29,8 @@ local os        = require("base/os")
 local path      = require("base/path")
 local utils     = require("base/utils")
 local string    = require("base/string")
-local config    = require("base/config")
-local platform  = require("base/platform")
+local config    = require("project/config")
+local platform  = require("platform/platform")
 
 -- init the compiler
 function lib.init(self, name)
diff --git a/xmake/core/platform/platforms/windows/tools/link.lua b/xmake/core/platform/platforms/windows/tools/link.lua
index b8913a42f..a536626d6 100644
--- a/xmake/core/platform/platforms/windows/tools/link.lua
+++ b/xmake/core/platform/platforms/windows/tools/link.lua
@@ -26,8 +26,8 @@ local link = link or {}
 -- load modules
 local utils     = require("base/utils")
 local string    = require("base/string")
-local config    = require("base/config")
-local platform  = require("base/platform")
+local config    = require("project/config")
+local platform  = require("platform/platform")
 
 -- init the compiler
 function link.init(self, name)
diff --git a/xmake/core/platform/platforms/windows/tools/ml.lua b/xmake/core/platform/platforms/windows/tools/ml.lua
index 75db5194b..5b91ab7b7 100644
--- a/xmake/core/platform/platforms/windows/tools/ml.lua
+++ b/xmake/core/platform/platforms/windows/tools/ml.lua
@@ -26,8 +26,8 @@ local ml = ml or {}
 -- load modules
 local utils     = require("base/utils")
 local string    = require("base/string")
-local config    = require("base/config")
-local platform  = require("base/platform")
+local config    = require("project/config")
+local platform  = require("platform/platform")
 
 -- init the compiler
 function ml.init(self, name)
diff --git a/xmake/core/platform/platforms/windows/tools/nmake.lua b/xmake/core/platform/platforms/windows/tools/nmake.lua
index 68f04a31a..d2e1505f6 100644
--- a/xmake/core/platform/platforms/windows/tools/nmake.lua
+++ b/xmake/core/platform/platforms/windows/tools/nmake.lua
@@ -25,9 +25,9 @@ local os        = require("base/os")
 local path      = require("base/path")
 local utils     = require("base/utils")
 local string    = require("base/string")
-local config    = require("base/config")
 local option    = require("base/option")
-local platform  = require("base/platform")
+local config    = require("project/config")
+local platform  = require("platform/platform")
 
 -- define module: nmake
 local nmake = nmake or {}
diff --git a/xmake/core/platform/platforms/windows/windows.lua b/xmake/core/platform/platforms/windows/windows.lua
index 4b168c835..20bfa3046 100644
--- a/xmake/core/platform/platforms/windows/windows.lua
+++ b/xmake/core/platform/platforms/windows/windows.lua
@@ -25,7 +25,7 @@ local windows = windows or {}
 
 -- load modules
 local os            = require("base/os")
-local config        = require("base/config")
+local config        = require("project/config")
 
 -- init host
 windows._HOST       = "windows"
diff --git a/xmake/core/platform/tool.lua b/xmake/core/platform/tool.lua
index 79c0d216d..36047f410 100644
--- a/xmake/core/platform/tool.lua
+++ b/xmake/core/platform/tool.lua
@@ -28,7 +28,7 @@ local os        = require("base/os")
 local path      = require("base/path")
 local utils     = require("base/utils")
 local string    = require("base/string")
-local platform  = require("base/platform")
+local platform  = require("platform/platform")
 
 -- match the tool name
 function tool._match(name, toolname)
@@ -124,10 +124,10 @@ function tool.find(name, root)
     if root then return tool._find_from(root, name) end
 
     -- attempt to find it from the current platform directory first
-    if not filepath then filepath = tool._find_from(platform.directory() .. "/tool", name) end
+    if not filepath then filepath = tool._find_from(path.join(platform.directory(), "tools"), name) end
 
     -- attempt to find it from the script directory 
-    if not filepath then filepath = tool._find_from(xmake._CORE_DIR .. "/tool", name) end
+    if not filepath then filepath = tool._find_from(path.join(xmake._CORE_DIR, "platform/tools"), name) end
 
     -- ok?
     return filepath
diff --git a/xmake/core/platform/tools/ar.lua b/xmake/core/platform/tools/ar.lua
index 7f019cd17..46b420e55 100644
--- a/xmake/core/platform/tools/ar.lua
+++ b/xmake/core/platform/tools/ar.lua
@@ -26,7 +26,7 @@ local ar = ar or {}
 -- load modules
 local utils     = require("base/utils")
 local string    = require("base/string")
-local config    = require("base/config")
+local config    = require("project/config")
 
 -- init the linker
 function ar.init(self, name)
diff --git a/xmake/core/platform/tools/gcc.lua b/xmake/core/platform/tools/gcc.lua
index a27e41341..637f9792b 100644
--- a/xmake/core/platform/tools/gcc.lua
+++ b/xmake/core/platform/tools/gcc.lua
@@ -24,8 +24,8 @@
 local utils     = require("base/utils")
 local table     = require("base/table")
 local string    = require("base/string")
-local config    = require("base/config")
-local platform  = require("base/platform")
+local config    = require("project/config")
+local platform  = require("platform/platform")
 
 -- define module: gcc
 local gcc = gcc or {}
diff --git a/xmake/core/platform/tools/swiftc.lua b/xmake/core/platform/tools/swiftc.lua
index 6317bde2d..fa09d566c 100644
--- a/xmake/core/platform/tools/swiftc.lua
+++ b/xmake/core/platform/tools/swiftc.lua
@@ -24,8 +24,8 @@
 local utils     = require("base/utils")
 local table     = require("base/table")
 local string    = require("base/string")
-local config    = require("base/config")
-local platform  = require("base/platform")
+local config    = require("project/config")
+local platform  = require("platform/platform")
 
 -- define module: swiftc
 local swiftc = swiftc or {}