Allows installdir, bindir and libdir to be configured via opt arguments #5634
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
A2va
commented
Sep 18, 2024
A2va
commented
- Before adding new features and new modules, please go to issues to submit the relevant feature description first.
- Write good commit messages and use the same coding conventions as the rest of the project.
- Please commit code to dev branch and we will merge into master branch in feature
- Ensure your edited codes with four spaces instead of TAB.
- 增加新特性和新模块之前，请先到issues提交相关特性说明，经过讨论评估确认后，再进行相应的代码提交，避免做无用工作。
- 编写友好可读的提交信息，并使用与工程代码相同的代码规范，代码请用4个空格字符代替tab缩进。
- 请提交代码到dev分支，如果通过，我们会在特定时间合并到master分支上。
- 为了规范化提交日志的格式，commit消息，不要用中文，请用英文描述。
waruqi
reviewed
Sep 18, 2024
waruqi
reviewed
Sep 20, 2024
| @@ -123,7 +143,7 @@ end | |||
|
|
|||
| -- install shared libraries | |||
| function _install_shared_libraries(target, opt) | |||
| local bindir = target:is_plat("windows", "mingw") and target:bindir() or target:libdir() | |||
| local bindir = _get_target_bindir(target, opt) | |||
There was a problem hiding this comment.
Please do not mix libdir and bindir.
xmake/xmake/plugins/pack/batchcmds.lua
Line 247 in 9563841
waruqi
reviewed
Sep 20, 2024
| @@ -158,7 +178,7 @@ function _update_install_rpath(target, opt) | |||
| if target:is_plat("windows", "mingw") then | |||
| return | |||
| end | |||
| local bindir = target:bindir() | |||
| local bindir = _get_target_bindir(target, table.join(opt, {true_bindir = true})) | |||
There was a problem hiding this comment.
please remove true_bindir argument.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.