remove load package from url

3 files changed, 12 insertions, 74 deletions

diff --git a/xmake/actions/require/package.lua b/xmake/actions/require/package.lua
index 6ac574ee4..be82e9460 100644
--- a/xmake/actions/require/package.lua
+++ b/xmake/actions/require/package.lua
@@ -77,7 +77,6 @@ function _parse_require(require_str, requires_extra, parentinfo)
 
     -- get repository name, package name and package url
     local reponame    = nil
-    local packageurl  = nil
     local packagename = nil
     local pos = packageinfo:find_last('@', true)
     if pos then
@@ -85,15 +84,8 @@ function _parse_require(require_str, requires_extra, parentinfo)
         -- get package name
         packagename = packageinfo:sub(pos + 1)
 
-        -- get reponame or packageurl
-        local repo_or_pkgurl = packageinfo:sub(1, pos - 1)
-
-        -- is package url?
-        if repo_or_pkgurl:find('[/\\]') then
-            packageurl = repo_or_pkgurl
-        else
-            reponame = repo_or_pkgurl
-        end
+        -- get reponame 
+        reponame = packageinfo:sub(1, pos - 1)
     else 
         packagename = packageinfo
     end
@@ -115,7 +107,6 @@ function _parse_require(require_str, requires_extra, parentinfo)
     {
         originstr        = require_str,
         reponame         = reponame,
-        packageurl       = packageurl,
         version          = version,
         alias            = require_extra.alias,     -- set package alias name
         system           = require_extra.system,    -- default: true, we can set it to disable system package manually
@@ -132,11 +123,6 @@ function _parse_require(require_str, requires_extra, parentinfo)
     return required.packagename, required.requireinfo
 end
 
--- load package package from the given package url
-function _load_package_from_url(packagename, packageurl)
-    return core_package.load_from_url(packagename, packageurl)
-end
-
 -- load package package from system
 function _load_package_from_system(packagename)
     return core_package.load_from_system(packagename)
@@ -176,24 +162,17 @@ function _load_package(packagename, requireinfo)
         return package
     end
 
-    -- load package package
-    package = nil
-    if requireinfo.packageurl then
-        -- load package from the given package url
-        package = _load_package_from_url(packagename, requireinfo.packageurl)
-    else
-        -- load package from project first
-        package = _load_package_from_project(packagename)
-            
-        -- load package from repositories
-        if not package then
-            package = _load_package_from_repository(packagename, requireinfo.reponame)
-        end
+    -- load package from project first
+    package = _load_package_from_project(packagename)
+        
+    -- load package from repositories
+    if not package then
+        package = _load_package_from_repository(packagename, requireinfo.reponame)
+    end
 
-        -- load package from system
-        if not package then
-            package = _load_package_from_system(packagename)
-        end
+    -- load package from system
+    if not package then
+        package = _load_package_from_system(packagename)
     end
 
     -- check
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index 4a7a3ea18..52b4e374f 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -443,34 +443,6 @@ function package.cachedir()
     return path.join(global.directory(), "cache", "packages")
 end
 
--- load the package from the package url
-function package.load_from_url(packagename, packageurl)
-
-    -- make a temporary package file
-    local packagefile = os.tmpfile() .. ".lua"
-
-    -- make package description
-    local packagedata = string.format([[
-    package("%s")
-        set_urls("%s")
-    ]], packagename, packageurl)
-
-    -- write a temporary package description to file
-    local ok, errors = io.writefile(packagefile, packagedata)
-    if not ok then
-        return nil, errors
-    end
-
-    -- load package instance
-    local instance, errors = package.load_from_repository(packagename, false, nil, packagefile)
-
-    -- remove the package file
-    os.rm(packagefile)
-
-    -- ok?
-    return instance, errors
-end
-
 -- load the package from the system directories
 function package.load_from_system(packagename)
 
diff --git a/xmake/core/sandbox/modules/import/core/package/package.lua b/xmake/core/sandbox/modules/import/core/package/package.lua
index 39da91a3f..4b292207e 100644
--- a/xmake/core/sandbox/modules/import/core/package/package.lua
+++ b/xmake/core/sandbox/modules/import/core/package/package.lua
@@ -79,18 +79,5 @@ function sandbox_core_package_package.load_from_repository(packagename, repo, pa
     return instance
 end
 
--- load the package from the package url 
-function sandbox_core_package_package.load_from_url(packagename, packageurl)
-
-    -- load package instance 
-    local instance, errors = package.load_from_url(packagename, packageurl) 
-    if not instance then
-        raise(errors)
-    end
-
-    -- ok
-    return instance
-end
-
 -- return module
 return sandbox_core_package_package