diff options
| author | ruki <[email protected]> | 2021-07-03 00:35:26 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-07-03 00:35:26 +0800 |
| commit | 60db2397f832af73b7cf72177c11ef57e9f80b6a (patch) | |
| tree | f7a515fddc28bd26d88d81d4a9aab07e4836a325 | |
| parent | 9068e48983a41c30a020c302913fbdb4e4c66f9e (diff) | |
update changelog
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | README_zh.md | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 45e91d0b6..10e3bcf4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## master (unreleased) +### New features + +* [#1483](https://github.com/xmake-io/xmake/issues/1483): Add `os.joinenvs()` and improve package tools envirnoments + ## v2.5.5 ### New features @@ -1021,6 +1025,10 @@ ## master (开发中) +### 新特性 + +* [#1483](https://github.com/xmake-io/xmake/issues/1483): 添加 `os.joinenvs()` 和改进包工具环境 + ## v2.5.5 ### 新特性 @@ -248,7 +248,9 @@ muslcc The musl-based cross-compilation toolchains * Multi-task parallel compilation support * C++20 Module-TS support * Support cross-platform C/C++ dependency packages -* Support self-built distributed and third-party package repositories +* Support self-built distributed package repositories +* Support the installation of cloud pre-compiled packages +* Support third-party package repositories, such as: vcpkg, conan, conda, etc. * Support multi-language mixed compilation * Flexible lua scripts, rich extension modules * Support for generating vsproj/cmake/makefile/compile_commands files diff --git a/README_zh.md b/README_zh.md index 25d4e807b..386c82714 100644 --- a/README_zh.md +++ b/README_zh.md @@ -255,7 +255,8 @@ muslcc The musl-based cross-compilation toolchains * 多任务并行编译支持 * C++20 Module-TS 支持 * 支持跨平台的 C/C++ 依赖包快速集成 -* 自建分布式包仓库，第三方包仓库支持 +* 自建分布式包仓库，支持安装云端预编译包 +* 第三方包仓库支持，例如：vcpkg, conan, conda 等等 * 多语言混合编译支持 * 灵活的 lua 脚本，丰富的扩展模块，可实现高度定制化 * 丰富的插件支持，内置 vs/cmake/makefile/compile_commands 等生成插件 |