diff options
| author | ruki <[email protected]> | 2022-05-21 00:53:39 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-05-21 00:53:39 +0800 |
| commit | adb495c2069ad4663360ab7230f8dd6a8895de14 (patch) | |
| tree | c54b7aa3f0463adfd03846d6a755d02e56896602 | |
| parent | 6cf488d207c3009aba6319759a2cc2fb6aa7a405 (diff) | |
remove jsdelivr
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | README_zh.md | 2 | ||||
| -rwxr-xr-x | scripts/get.sh | 10 | ||||
| -rw-r--r-- | xmake/actions/update/main.lua | 1 |
4 files changed, 4 insertions, 11 deletions
@@ -77,7 +77,7 @@ It uses xmake.lua to maintain project builds with a very simple and readable syn We can use it to build projects directly like Make/Ninja or generate project files like CMake/Meson. It also has a built-in package management system to help users integrate C/C++ dependencies. ``` -Xmake = Build backend + Project Generator + Package Manager + [Remote|Distributed] Compilation +Xmake = Build backend + Project Generator + Package Manager + [Remote|Distributed] Build + Cache ``` If you want to know more, please refer to: [Documents](https://xmake.io/#/getting_started), [Github](https://github.com/xmake-io/xmake) and [Gitee](https://gitee.com/tboox/xmake). You are also welcome to join our [community](https://xmake.io/#/about/contact). diff --git a/README_zh.md b/README_zh.md index 377bd6703..e0e9cbd60 100644 --- a/README_zh.md +++ b/README_zh.md @@ -78,7 +78,7 @@ Xmake 是一个基于 Lua 的轻量级跨平台构建工具。 目前,Xmake 主要用于 C/C++ 项目的构建,但是同时也支持其他 native 语言的构建,可以实现跟 C/C++ 进行混合编译,同时编译速度也是非常的快,可以跟 Ninja 持平。 ``` -Xmake = Build backend + Project Generator + Package Manager + [Remote|Distributed] Compilation +Xmake = Build backend + Project Generator + Package Manager + [Remote|Distributed] Build + Cache ``` 如果你想要了解更多,请参考:[在线文档](https://xmake.io/#/zh-cn/getting_started), [Github](https://github.com/xmake-io/xmake)以及[Gitee](https://gitee.com/tboox/xmake),同时也欢迎加入我们的 [社区](https://xmake.io/#/zh-ch/about/contact). diff --git a/scripts/get.sh b/scripts/get.sh index ca009407d..e2924a322 100755 --- a/scripts/get.sh +++ b/scripts/get.sh @@ -83,8 +83,7 @@ if [ 'x__local__' != "x$branch" ]; then gitrepo_raw="https://gitee.com/tboox/xmake/raw/master" else gitrepo="https://github.com/xmake-io/xmake.git" - #gitrepo_raw="https://github.com/xmake-io/xmake/raw/master" - gitrepo_raw="https://cdn.jsdelivr.net/gh/xmake-io/xmake@master" + gitrepo_raw="https://github.com/xmake-io/xmake/raw/master" fi fi @@ -178,14 +177,9 @@ elif [ 'x__run__' = "x$branch" ]; then pack=gz fi mkdir -p $projectdir - runfile_url="https://cdn.jsdelivr.net/gh/xmake-mirror/xmake-releases@$version/xmake-$version.$pack.run" + runfile_url="https://github.com/xmake-io/xmake/releases/download/$version/xmake-$version.$pack.run" echo "downloading $runfile_url .." remote_get_content "$runfile_url" > $projectdir/xmake.run - if [[ $? != 0 ]]; then - runfile_url="https://github.com/xmake-io/xmake/releases/download/$version/xmake-$version.$pack.run" - echo "downloading $runfile_url .." - remote_get_content "$runfile_url" > $projectdir/xmake.run - fi sh $projectdir/xmake.run --noexec --target $projectdir else echo "cloning $gitrepo $branch .." diff --git a/xmake/actions/update/main.lua b/xmake/actions/update/main.lua index a49697058..077d4a982 100644 --- a/xmake/actions/update/main.lua +++ b/xmake/actions/update/main.lua @@ -414,7 +414,6 @@ function main() local winarch = os.arch() == "x64" and "win64" or "win32" if version:find('.', 1, true) then mainurls = {format("https://github.com/xmake-io/xmake/releases/download/%s/xmake-%s.%s.exe", version, version, winarch), - format("https://cdn.jsdelivr.net/gh/xmake-mirror/xmake-releases@%s/xmake-%s.%s.exe.zip", version, version, winarch), format("https://gitlab.com/xmake-mirror/xmake-releases/raw/%s/xmake-%s.%s.exe.zip", version, version, winarch)} else -- regard as a git branch, fetch from ci |
