summaryrefslogtreecommitdiff
path: root/xmake/core/package/package.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2018-08-25 22:09:23 +0800
committerruki <[email protected]>2018-08-25 22:09:23 +0800
commit4ce0113475c5165303dedb594d1ac8cbc42a22f9 (patch)
tree7886c3a34b682a17320931afaab6395e063ffa26 /xmake/core/package/package.lua
parent3b88e27a78ac27480ce931023b47cfc40e754b46 (diff)
modify package tree
Diffstat (limited to 'xmake/core/package/package.lua')
-rw-r--r--xmake/core/package/package.lua24
1 files changed, 5 insertions, 19 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index a282c59d3..a7f6e92b9 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -47,13 +47,9 @@ function _instance.new(name, info, rootdir)
-- new an instance
local instance = table.inherit(_instance)
- -- parse name .e.g vendor.name
- local nameinfo = name:split("%.")
-
-- init instance
- instance._FULLNAME = name
- instance._NAME = nameinfo[2] or name
- instance._VENDOR = nameinfo[1]
+ instance._name = name
+ instance._NAME = name
instance._INFO = info
instance._ROOTDIR = rootdir
@@ -74,12 +70,7 @@ function _instance:get(name)
end
end
--- get the package full name with vendor
-function _instance:fullname()
- return self._FULLNAME
-end
-
--- get the package name without vendor
+-- get the package name
function _instance:name()
return self._NAME
end
@@ -97,11 +88,6 @@ function _instance:alias()
end
end
--- get the package vendor
-function _instance:vendor()
- return self._VENDOR
-end
-
-- get urls
function _instance:urls()
return self._URLS or table.wrap(self:get("urls"))
@@ -178,7 +164,7 @@ end
-- get the cached directory of this package
function _instance:cachedir()
- return path.join(package.cachedir(), self:fullname(), self:version_str())
+ return path.join(package.cachedir(), self:name(), self:version_str())
end
-- get the installed directory of this package
@@ -190,7 +176,7 @@ function _instance:installdir()
end
-- make install directory
- return path.join(package.installdir(self:from("global")), self:fullname(), self:version_str())
+ return path.join(package.installdir(self:from("global")), self:name(), self:version_str())
end
-- get versions