mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-29 20:17:45 +00:00
Fix windows build
This commit is contained in:
parent
6b7254fc63
commit
68631e555f
3 changed files with 29 additions and 9 deletions
16
.travis.yml
16
.travis.yml
|
@ -1,8 +1,12 @@
|
||||||
language: rust
|
language: rust
|
||||||
rust:
|
matrix:
|
||||||
- stable
|
include:
|
||||||
- beta
|
- rust: stable
|
||||||
- nightly
|
env: FEATURES=''
|
||||||
|
- rust: beta
|
||||||
|
env: FEATURES=''
|
||||||
|
- rust: nightly
|
||||||
|
env: FEATURES=nightly
|
||||||
os:
|
os:
|
||||||
- linux
|
- linux
|
||||||
- osx
|
- osx
|
||||||
|
@ -11,5 +15,5 @@ cache:
|
||||||
- $HOME/.cargo
|
- $HOME/.cargo
|
||||||
sudo: false
|
sudo: false
|
||||||
script:
|
script:
|
||||||
- cargo build
|
- cargo build --features "$FEATURES"
|
||||||
- cargo test --no-fail-fast
|
- cargo test --features "$FEATURES" --no-fail-fast
|
||||||
|
|
|
@ -95,8 +95,9 @@ generic = [
|
||||||
"whoami",
|
"whoami",
|
||||||
"yes",
|
"yes",
|
||||||
]
|
]
|
||||||
default = ["generic", "unix"]
|
|
||||||
test_unimplemented = []
|
test_unimplemented = []
|
||||||
|
nightly = []
|
||||||
|
default = ["generic", "unix"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
uucore = { path="src/uucore" }
|
uucore = { path="src/uucore" }
|
||||||
|
|
19
appveyor.yml
19
appveyor.yml
|
@ -3,11 +3,26 @@ environment:
|
||||||
- TARGET: x86_64-pc-windows-msvc
|
- TARGET: x86_64-pc-windows-msvc
|
||||||
- TARGET: i686-pc-windows-msvc
|
- TARGET: i686-pc-windows-msvc
|
||||||
- TARGET: i686-pc-windows-gnu
|
- TARGET: i686-pc-windows-gnu
|
||||||
|
MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.2/threads-win32/dwarf/i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z/download
|
||||||
|
MINGW_ARCHIVE: i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z
|
||||||
|
MINGW_DIR: mingw32
|
||||||
|
- TARGET: x86_64-pc-windows-gnu
|
||||||
|
MSYS_BITS: 64
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
|
- ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
|
||||||
|
- SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin;C:\MinGW\bin
|
||||||
|
|
||||||
|
# Use the system msys if we can
|
||||||
|
- if defined MSYS_BITS set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
|
||||||
|
|
||||||
|
# download a custom compiler otherwise
|
||||||
|
- if defined MINGW_ARCHIVE appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_ARCHIVE%"
|
||||||
|
- if defined MINGW_ARCHIVE 7z x -y "%MINGW_ARCHIVE%" > nul
|
||||||
|
- if defined MINGW_ARCHIVE set PATH=%CD%\%MINGW_DIR%\bin;C:\msys64\usr\bin;%PATH%
|
||||||
|
|
||||||
- rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
|
- rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
|
||||||
- SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
|
|
||||||
- SET PATH=%PATH%;C:\MinGW\bin
|
|
||||||
- rustc -V
|
- rustc -V
|
||||||
- cargo -V
|
- cargo -V
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue