summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2018-09-18 22:41:01 +0800
committerruki <[email protected]>2018-09-18 10:06:06 +0800
commit89e82f8a4c620dae78ebae08e00adbc6d17a3e18 (patch)
tree0a808e27d7671281045aa2b40257da9bc23f363a
parent0cf22f56641adcf796a12012498e4269343c1f2c (diff)
modify package directory
-rw-r--r--xmake/core/package/package.lua6
-rw-r--r--xmake/core/sandbox/modules/import/core/package/package.lua6
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