diff options
| author | Ângelo Andrade Cirino <[email protected]> | 2021-08-05 17:06:44 -0300 |
|---|---|---|
| committer | Ângelo Andrade Cirino <[email protected]> | 2021-08-05 17:06:44 -0300 |
| commit | 286ba62b6189953f8a0c255053ca3c3f7f1e5693 (patch) | |
| tree | 7d0671f7a57ea8ae102be3454d956848eb8b0b5c /scripts | |
| parent | 81ad292ea67f82d88d785a37d23b1f1603996da1 (diff) | |
| parent | a959af20d2a34038efb13053c112ef1d55084081 (diff) | |
Merge branch 'master' of https://github.com/xmake-io/xmake
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/get.ps1 | 7 | ||||
| -rw-r--r-- | scripts/rpmbuild/SPECS/xmake.spec | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/scripts/get.ps1 b/scripts/get.ps1 index a189b2ba2..8cb27a888 100755 --- a/scripts/get.ps1 +++ b/scripts/get.ps1 @@ -86,12 +86,9 @@ param ( $outfile = Join-Path $temppath "$pid-xmake-installer.exe" $x64arch = @('AMD64', 'IA64', 'ARM64') $arch = if ($env:PROCESSOR_ARCHITECTURE -in $x64arch -or $env:PROCESSOR_ARCHITEW6432 -in $x64arch) { 'x64' } else { 'x86' } + $winarch = if ($env:PROCESSOR_ARCHITECTURE -in $x64arch -or $env:PROCESSOR_ARCHITEW6432 -in $x64arch) { 'win64' } else { 'win32' } $url = if ($v -is [version]) { - if ($v -gt "2.2.6") { - "https://ci.appveyor.com/api/projects/waruqi/xmake/artifacts/xmake-installer.exe?tag=v$v&pr=false&job=Image%3A+Visual+Studio+2017%3B+Platform%3A+$arch" - } else { - "https://github.com/xmake-io/xmake/releases/download/v$v/xmake-v$v.exe" - } + "https://github.com/xmake-io/xmake/releases/download/v$v/xmake-v$v.$winarch.exe" } else { "https://ci.appveyor.com/api/projects/waruqi/xmake/artifacts/xmake-installer.exe?branch=$v&pr=false&job=Image%3A+Visual+Studio+2017%3B+Platform%3A+$arch" } diff --git a/scripts/rpmbuild/SPECS/xmake.spec b/scripts/rpmbuild/SPECS/xmake.spec index 9887176bc..7c7d5ed38 100644 --- a/scripts/rpmbuild/SPECS/xmake.spec +++ b/scripts/rpmbuild/SPECS/xmake.spec @@ -1,4 +1,4 @@ -%define xmake_revision c44aea875ce6bde152a1bd2d92fec3fd9ca6b223 +%define xmake_revision fd248b8b97f62762ce6ea6e0008b4367bef29d4d %define tbox_revision 5ef932750ede0b90867fd4afdcf1deed2464c82b %define sv_revision 9a3cf7c8e589de4f70378824329882c4a047fffc %define lua_cjson_revision 515bab6d6d80b164b94db73af69609ea02f3a798 @@ -7,7 +7,7 @@ %undefine _disable_source_fetch Name: xmake -Version: 2.5.5 +Version: 2.5.6 Release: 1%{?dist} Summary: A cross-platform build utility based on Lua BuildArch: noarch |