From 89e82f8a4c620dae78ebae08e00adbc6d17a3e18 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 18 Sep 2018 22:41:01 +0800 Subject: modify package directory --- xmake/core/package/package.lua | 6 +++--- xmake/core/sandbox/modules/import/core/package/package.lua | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 51fd8ab01..9a69ddc58 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -203,7 +203,7 @@ end -- get the directory of this package function _instance:directory() - return path.join(package.installdir(self:from("global")), self:name():sub(1, 1):lower(), self:name(), self:version_str(), self:debug() and "debug" or "release") + return path.join(package.directory(self:from("global")), self:name():sub(1, 1):lower(), self:name(), self:version_str(), self:debug() and "debug" or "release") end -- get versions @@ -524,8 +524,8 @@ function package.apis() } end --- get install directory -function package.installdir(is_global) +-- get package directory +function package.directory(is_global) -- get directory if is_global then diff --git a/xmake/core/sandbox/modules/import/core/package/package.lua b/xmake/core/sandbox/modules/import/core/package/package.lua index 4b292207e..5eed04499 100644 --- a/xmake/core/sandbox/modules/import/core/package/package.lua +++ b/xmake/core/sandbox/modules/import/core/package/package.lua @@ -35,9 +35,9 @@ function sandbox_core_package_package.cachedir() return package.cachedir() end --- get install directory -function sandbox_core_package_package.installdir(is_global) - return package.installdir(is_global) +-- get package directory +function sandbox_core_package_package.directory(is_global) + return package.directory(is_global) end -- load the package from the project file -- cgit v1.3.1