remove default scheme

2 files changed, 2 insertions, 18 deletions

diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index df24de0f2..8c5fb3d8c 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -2482,7 +2482,6 @@ function _instance:schemes()
     local schemes = self._SCHEMES
     if not schemes then
         schemes = {}
-        schemes["__default__"] = scheme.new("__default__", {package = self})
         for _, name in ipairs(table.wrap(self:get("schemes"))) do
             schemes[name] = scheme.new(name, {package = self})
         end
@@ -2496,8 +2495,6 @@ function _instance:schemes_orderlist()
     local schemes_orderlist = self._SCHEMES_ORDERLIST
     if not schemes_orderlist then
         schemes_orderlist = {}
-        -- always add default scheme first
-        table.insert(schemes_orderlist, self:scheme("__default__"))
         for _, name in ipairs(table.wrap(self:get("schemes"))) do
             table.insert(schemes_orderlist, self:scheme(name))
         end
diff --git a/xmake/core/package/scheme.lua b/xmake/core/package/scheme.lua
index 18d3392a8..64159fd6d 100644
--- a/xmake/core/package/scheme.lua
+++ b/xmake/core/package/scheme.lua
@@ -60,11 +60,6 @@ function _instance:type()
     return "scheme"
 end
 
--- is default scheme?
-function _instance:is_default()
-    return self:name() == "__default__"
-end
-
 -- get the it's package
 function _instance:package()
     return self._PACKAGE
@@ -72,11 +67,7 @@ end
 
 -- get the scheme configuration
 function _instance:get(name)
-    local value = self._INFO:get(name)
-    if value == nil and self:is_default() then
-        value = self:package():get(name)
-    end
-    return value
+    return self._INFO:get(name)
 end
 
 -- set the value to scheme info
@@ -91,11 +82,7 @@ end
 
 -- get the extra configuration
 function _instance:extraconf(name, item, key)
-    local conf = self._INFO:extraconf(name, item, key)
-    if conf == nil and self:is_default() then
-        conf = self:package():extraconf(name, item, key)
-    end
-    return conf
+    return self._INFO:extraconf(name, item, key)
 end
 
 -- set the extra configuration