diff options
| author | ruki <[email protected]> | 2016-02-06 13:38:03 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2016-02-15 19:10:27 +0800 |
| commit | 46ddc77c6cc909a994d8ccc73bdafaf9094585a5 (patch) | |
| tree | f26f2bd70f9257515f9fb57416cc04ff013fc268 | |
| parent | d4373c2a34711642990dfa8d7a51bee831702d46 (diff) | |
move platforms directory to core
| -rw-r--r-- | xmake/core/base/platform.lua | 5 | ||||
| -rw-r--r-- | xmake/core/platforms/android/android.lua (renamed from xmake/platforms/android/android.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/android/prober.lua (renamed from xmake/platforms/android/prober.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/iphoneos/iphoneos.lua (renamed from xmake/platforms/iphoneos/iphoneos.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/iphoneos/package.lua (renamed from xmake/platforms/iphoneos/package.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/iphoneos/prober.lua (renamed from xmake/platforms/iphoneos/prober.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/iphonesimulator/iphonesimulator.lua (renamed from xmake/platforms/iphonesimulator/iphonesimulator.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/iphonesimulator/prober.lua (renamed from xmake/platforms/iphonesimulator/prober.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/linux/install.lua (renamed from xmake/platforms/linux/install.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/linux/linux.lua (renamed from xmake/platforms/linux/linux.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/linux/prober.lua (renamed from xmake/platforms/linux/prober.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/linux/uninstall.lua (renamed from xmake/platforms/linux/uninstall.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/macosx/install.lua (renamed from xmake/platforms/macosx/install.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/macosx/macosx.lua (renamed from xmake/platforms/macosx/macosx.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/macosx/prober.lua (renamed from xmake/platforms/macosx/prober.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/macosx/uninstall.lua (renamed from xmake/platforms/macosx/uninstall.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/mingw/mingw.lua (renamed from xmake/platforms/mingw/mingw.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/mingw/prober.lua (renamed from xmake/platforms/mingw/prober.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/watchos/package.lua (renamed from xmake/platforms/watchos/package.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/watchos/prober.lua (renamed from xmake/platforms/watchos/prober.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/watchos/watchos.lua (renamed from xmake/platforms/watchos/watchos.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/watchsimulator/prober.lua (renamed from xmake/platforms/watchsimulator/prober.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/watchsimulator/watchsimulator.lua (renamed from xmake/platforms/watchsimulator/watchsimulator.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/windows/prober.lua (renamed from xmake/platforms/windows/prober.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/windows/tools/cl.lua (renamed from xmake/platforms/windows/tools/cl.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/windows/tools/lib.lua (renamed from xmake/platforms/windows/tools/lib.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/windows/tools/link.lua (renamed from xmake/platforms/windows/tools/link.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/windows/tools/ml.lua (renamed from xmake/platforms/windows/tools/ml.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/windows/tools/nmake.lua (renamed from xmake/platforms/windows/tools/nmake.lua) | 0 | ||||
| -rw-r--r-- | xmake/core/platforms/windows/windows.lua (renamed from xmake/platforms/windows/windows.lua) | 0 |
30 files changed, 2 insertions, 3 deletions
diff --git a/xmake/core/base/platform.lua b/xmake/core/base/platform.lua index 5ecfc33fc..d3dd92903 100644 --- a/xmake/core/base/platform.lua +++ b/xmake/core/base/platform.lua @@ -34,9 +34,8 @@ local global = require("base/global") function platform._load_directories() -- load platform directories - return { path.join(config.directory(), "platforms") - , path.join(global.directory(), "platforms") - , path.join(xmake._PROGRAM_DIR, "platforms") + return { path.join(global.directory(), "platforms") + , path.join(xmake._CORE_DIR, "platforms") } end diff --git a/xmake/platforms/android/android.lua b/xmake/core/platforms/android/android.lua index 15e3c33a2..15e3c33a2 100644 --- a/xmake/platforms/android/android.lua +++ b/xmake/core/platforms/android/android.lua diff --git a/xmake/platforms/android/prober.lua b/xmake/core/platforms/android/prober.lua index a6446e0e1..a6446e0e1 100644 --- a/xmake/platforms/android/prober.lua +++ b/xmake/core/platforms/android/prober.lua diff --git a/xmake/platforms/iphoneos/iphoneos.lua b/xmake/core/platforms/iphoneos/iphoneos.lua index f9147945c..f9147945c 100644 --- a/xmake/platforms/iphoneos/iphoneos.lua +++ b/xmake/core/platforms/iphoneos/iphoneos.lua diff --git a/xmake/platforms/iphoneos/package.lua b/xmake/core/platforms/iphoneos/package.lua index 654050ab7..654050ab7 100644 --- a/xmake/platforms/iphoneos/package.lua +++ b/xmake/core/platforms/iphoneos/package.lua diff --git a/xmake/platforms/iphoneos/prober.lua b/xmake/core/platforms/iphoneos/prober.lua index 0de95c783..0de95c783 100644 --- a/xmake/platforms/iphoneos/prober.lua +++ b/xmake/core/platforms/iphoneos/prober.lua diff --git a/xmake/platforms/iphonesimulator/iphonesimulator.lua b/xmake/core/platforms/iphonesimulator/iphonesimulator.lua index 4ceeb3eca..4ceeb3eca 100644 --- a/xmake/platforms/iphonesimulator/iphonesimulator.lua +++ b/xmake/core/platforms/iphonesimulator/iphonesimulator.lua diff --git a/xmake/platforms/iphonesimulator/prober.lua b/xmake/core/platforms/iphonesimulator/prober.lua index a4c69c72a..a4c69c72a 100644 --- a/xmake/platforms/iphonesimulator/prober.lua +++ b/xmake/core/platforms/iphonesimulator/prober.lua diff --git a/xmake/platforms/linux/install.lua b/xmake/core/platforms/linux/install.lua index 1505b0d97..1505b0d97 100644 --- a/xmake/platforms/linux/install.lua +++ b/xmake/core/platforms/linux/install.lua diff --git a/xmake/platforms/linux/linux.lua b/xmake/core/platforms/linux/linux.lua index 406dc5c58..406dc5c58 100644 --- a/xmake/platforms/linux/linux.lua +++ b/xmake/core/platforms/linux/linux.lua diff --git a/xmake/platforms/linux/prober.lua b/xmake/core/platforms/linux/prober.lua index 4e50b13cf..4e50b13cf 100644 --- a/xmake/platforms/linux/prober.lua +++ b/xmake/core/platforms/linux/prober.lua diff --git a/xmake/platforms/linux/uninstall.lua b/xmake/core/platforms/linux/uninstall.lua index 62f00a239..62f00a239 100644 --- a/xmake/platforms/linux/uninstall.lua +++ b/xmake/core/platforms/linux/uninstall.lua diff --git a/xmake/platforms/macosx/install.lua b/xmake/core/platforms/macosx/install.lua index 1505b0d97..1505b0d97 100644 --- a/xmake/platforms/macosx/install.lua +++ b/xmake/core/platforms/macosx/install.lua diff --git a/xmake/platforms/macosx/macosx.lua b/xmake/core/platforms/macosx/macosx.lua index 088a01c18..088a01c18 100644 --- a/xmake/platforms/macosx/macosx.lua +++ b/xmake/core/platforms/macosx/macosx.lua diff --git a/xmake/platforms/macosx/prober.lua b/xmake/core/platforms/macosx/prober.lua index e2571fdd9..e2571fdd9 100644 --- a/xmake/platforms/macosx/prober.lua +++ b/xmake/core/platforms/macosx/prober.lua diff --git a/xmake/platforms/macosx/uninstall.lua b/xmake/core/platforms/macosx/uninstall.lua index 62f00a239..62f00a239 100644 --- a/xmake/platforms/macosx/uninstall.lua +++ b/xmake/core/platforms/macosx/uninstall.lua diff --git a/xmake/platforms/mingw/mingw.lua b/xmake/core/platforms/mingw/mingw.lua index 7264489b2..7264489b2 100644 --- a/xmake/platforms/mingw/mingw.lua +++ b/xmake/core/platforms/mingw/mingw.lua diff --git a/xmake/platforms/mingw/prober.lua b/xmake/core/platforms/mingw/prober.lua index 575e3a7ba..575e3a7ba 100644 --- a/xmake/platforms/mingw/prober.lua +++ b/xmake/core/platforms/mingw/prober.lua diff --git a/xmake/platforms/watchos/package.lua b/xmake/core/platforms/watchos/package.lua index 654050ab7..654050ab7 100644 --- a/xmake/platforms/watchos/package.lua +++ b/xmake/core/platforms/watchos/package.lua diff --git a/xmake/platforms/watchos/prober.lua b/xmake/core/platforms/watchos/prober.lua index 1a818dfdf..1a818dfdf 100644 --- a/xmake/platforms/watchos/prober.lua +++ b/xmake/core/platforms/watchos/prober.lua diff --git a/xmake/platforms/watchos/watchos.lua b/xmake/core/platforms/watchos/watchos.lua index 9551084f8..9551084f8 100644 --- a/xmake/platforms/watchos/watchos.lua +++ b/xmake/core/platforms/watchos/watchos.lua diff --git a/xmake/platforms/watchsimulator/prober.lua b/xmake/core/platforms/watchsimulator/prober.lua index d33059c36..d33059c36 100644 --- a/xmake/platforms/watchsimulator/prober.lua +++ b/xmake/core/platforms/watchsimulator/prober.lua diff --git a/xmake/platforms/watchsimulator/watchsimulator.lua b/xmake/core/platforms/watchsimulator/watchsimulator.lua index a13bfde1e..a13bfde1e 100644 --- a/xmake/platforms/watchsimulator/watchsimulator.lua +++ b/xmake/core/platforms/watchsimulator/watchsimulator.lua diff --git a/xmake/platforms/windows/prober.lua b/xmake/core/platforms/windows/prober.lua index 1a64b320c..1a64b320c 100644 --- a/xmake/platforms/windows/prober.lua +++ b/xmake/core/platforms/windows/prober.lua diff --git a/xmake/platforms/windows/tools/cl.lua b/xmake/core/platforms/windows/tools/cl.lua index a3389fa5d..a3389fa5d 100644 --- a/xmake/platforms/windows/tools/cl.lua +++ b/xmake/core/platforms/windows/tools/cl.lua diff --git a/xmake/platforms/windows/tools/lib.lua b/xmake/core/platforms/windows/tools/lib.lua index 7f1cd79ee..7f1cd79ee 100644 --- a/xmake/platforms/windows/tools/lib.lua +++ b/xmake/core/platforms/windows/tools/lib.lua diff --git a/xmake/platforms/windows/tools/link.lua b/xmake/core/platforms/windows/tools/link.lua index 66cc4c0d6..66cc4c0d6 100644 --- a/xmake/platforms/windows/tools/link.lua +++ b/xmake/core/platforms/windows/tools/link.lua diff --git a/xmake/platforms/windows/tools/ml.lua b/xmake/core/platforms/windows/tools/ml.lua index 3736c8105..3736c8105 100644 --- a/xmake/platforms/windows/tools/ml.lua +++ b/xmake/core/platforms/windows/tools/ml.lua diff --git a/xmake/platforms/windows/tools/nmake.lua b/xmake/core/platforms/windows/tools/nmake.lua index 020872eeb..020872eeb 100644 --- a/xmake/platforms/windows/tools/nmake.lua +++ b/xmake/core/platforms/windows/tools/nmake.lua diff --git a/xmake/platforms/windows/windows.lua b/xmake/core/platforms/windows/windows.lua index 794358dc1..794358dc1 100644 --- a/xmake/platforms/windows/windows.lua +++ b/xmake/core/platforms/windows/windows.lua |
