diff options
| author | Chen Yufei <[email protected]> | 2022-03-29 01:00:16 +0800 |
|---|---|---|
| committer | Chen Yufei <[email protected]> | 2022-03-29 01:04:22 +0800 |
| commit | f21e4769f320e7b6405c6144df4646097b57d84b (patch) | |
| tree | 58e857830404b4edf0e7409c41ee03c34cbd0996 | |
| parent | 69a9d7c9d887d5f7bd0deff7329910d9951261c8 (diff) | |
Revert package pattern, update comments.
| -rw-r--r-- | xmake/modules/private/action/require/impl/actions/install.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xmake/modules/private/action/require/impl/actions/install.lua b/xmake/modules/private/action/require/impl/actions/install.lua index 31610278e..0013b002b 100644 --- a/xmake/modules/private/action/require/impl/actions/install.lua +++ b/xmake/modules/private/action/require/impl/actions/install.lua @@ -98,8 +98,8 @@ function _patch_pkgconfig(package) end -- Match to path like (string insides brackets is matched): --- /home/user/.xmake/packages[/f/foo/9adc96bd69124211aad7dd58a36f02ce]/v1.0 -local _PACKAGE_BUILDHASH_VERSION_PATTERN = "[\\/]%w[\\/][^\\/]+[\\/]" .. string.rep('%x', 32) +-- /home/user/.xmake/packages[/f/foo/v0.1.0/9adc96bd69124211aad7dd58a36f02ce]/lib +local _PACKAGE_VERSION_BUILDHASH_PATTERN = "[\\/]%w[\\/][^\\/]+[\\/][^\\/]+[\\/]" .. string.rep('%x', 32) function _fix_path_for_file(file, search_pattern) -- Replace path string before package pattern with local package install @@ -114,7 +114,7 @@ function _fix_path_for_file(file, search_pattern) local prefix = core_package.installdir() io.gsub(file, search_pattern, function(whole_value, value) - local mat = value:match(_PACKAGE_BUILDHASH_VERSION_PATTERN) + local mat = value:match(_PACKAGE_VERSION_BUILDHASH_PATTERN) if not mat then return nil end @@ -184,7 +184,7 @@ function _fix_paths_for_precompiled_package(package) local remote_prefix local local_prefix if remotedir then - local idx = remotedir:find(_PACKAGE_BUILDHASH_VERSION_PATTERN) + local idx = remotedir:find(_PACKAGE_VERSION_BUILDHASH_PATTERN) if idx then remote_prefix = remotedir:sub(1, idx) local_prefix = core_package.installdir() |