From aed6f296cf07d981a1d71a8e921433d285d82392 Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Sun, 8 Nov 2020 19:57:28 -0600 Subject: [PATCH] change ~ prepare 'uucore' for grafting/re-merge into 'coreutils' --- src/uucore/.appveyor.yml | 162 --------------------------------- src/uucore/.cirrus.yml | 14 --- src/uucore/.codecov.yml | 1 - src/uucore/.gitignore | 14 --- src/uucore/.travis.yml | 47 ---------- src/uucore/.vscode/cSpell.json | 152 ------------------------------- src/uucore/LICENSE | 18 ---- src/uucore/README.md | 33 ------- 8 files changed, 441 deletions(-) delete mode 100644 src/uucore/.appveyor.yml delete mode 100644 src/uucore/.cirrus.yml delete mode 100644 src/uucore/.codecov.yml delete mode 100644 src/uucore/.gitignore delete mode 100644 src/uucore/.travis.yml delete mode 100644 src/uucore/.vscode/cSpell.json delete mode 100644 src/uucore/LICENSE delete mode 100644 src/uucore/README.md diff --git a/src/uucore/.appveyor.yml b/src/uucore/.appveyor.yml deleted file mode 100644 index ed0ec9b0c..000000000 --- a/src/uucore/.appveyor.yml +++ /dev/null @@ -1,162 +0,0 @@ -# spell-checker:words POSIX repo SDK SDKs toolchain toolchains -# spell-checker:ignore uutils ARCH ABI BACKTRACE BINDIR cl COMNTOOLS dllcrt findstr maint MINGW MINGWDIR mkdir MSVC MSYS rustc rustlib rustup USERPROFILE vcvarsall - -version: "{build} ~ {branch}" - -branches: - except: - - gh-pages - -os: Visual Studio 2015 - -artifacts: - - path: target\%TARGET%\debug\libuucore.rlib - name: libuucore.rlib - -matrix: - allow_failures: - - CHANNEL: nightly -# - ABI: gnu - -environment: - global: - FEATURES: "" - BUILD_OPTIONS: "--all-features" - TEST_OPTIONS: "--all-features --no-fail-fast" - - matrix: - # minimum version - - CHANNEL: 1.31.0 - ARCH: i686 - ABI: msvc - # "msvc" ABI - - CHANNEL: stable - ARCH: i686 - ABI: msvc - - CHANNEL: stable - ARCH: x86_64 - ABI: msvc -# - CHANNEL: beta -# ARCH: i686 -# ABI: msvc -# - CHANNEL: beta -# ARCH: x86_64 -# ABI: msvc - - CHANNEL: nightly - ARCH: i686 - ABI: msvc - - CHANNEL: nightly - ARCH: x86_64 - ABI: msvc - # "gnu" ABI - - CHANNEL: stable - ARCH: i686 - ABI: gnu - - CHANNEL: stable - ARCH: x86_64 - ABI: gnu -# - CHANNEL: beta -# ARCH: i686 -# ABI: gnu -# - CHANNEL: beta -# ARCH: x86_64 -# ABI: gnu -# - CHANNEL: nightly -# ARCH: i686 -# ABI: gnu -# - CHANNEL: nightly -# ARCH: x86_64 -# ABI: gnu - # * specific gnu compilers - - CHANNEL: stable - ARCH: i686 - ABI: 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 - - CHANNEL: stable - ARCH: x86_64 - ABI: gnu - MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/7.3.0/threads-posix/seh/x86_64-7.3.0-release-posix-seh-rt_v5-rev0.7z/download#mingw-w64-x86_64-7.3.0-posix-seh.7z - -install: - # force branch checkout (if knowable), then reset to the specific commit ## (can be needed for accurate code coverage info) - # * this allows later apps to see the branch name using standard `git branch` operations, yet always builds the correct specific commit - # * ref: [`@`](https://archive.is/RVpnF) - - if DEFINED APPVEYOR_REPO_BRANCH if /I "%APPVEYOR_REPO_SCM%"=="git" ( git checkout "%APPVEYOR_REPO_BRANCH%" 2>NUL & git reset --hard "%APPVEYOR_REPO_COMMIT%" ) - # ensure CWD is project main directory - - cd "%APPVEYOR_BUILD_FOLDER%" - # create a working area - - ps: if ( ! $env:CI_TEMP_DIR ) { $env:CI_TEMP_DIR = "${env:TEMP}\${env:APPVEYOR_JOB_ID}" ; mkdir -force $env:CI_TEMP_DIR | out-null } - - # define the TARGET host - - set "TARGET=%ARCH%-pc-windows-%ABI%" - - # show relevant environment settings - - ps: ('CHANNEL', 'ARCH', 'ABI', 'FEATURES', 'BUILD_OPTIONS', 'TEST_OPTIONS', 'TARGET') |% { write-host -f yellow "$_=$(get-content -ea silent env:/$_)" } - - # rust installation - # * install `rust` via `rustup` - - appveyor DownloadFile "https://win.rustup.rs/" -FileName "%CI_TEMP_DIR%\rustup-init.exe" - - call "%CI_TEMP_DIR%\rustup-init.exe" -y --default-toolchain %CHANNEL% --default-host %TARGET% --no-modify-path >NUL - - set "PATH=%PATH%;%USERPROFILE%\.cargo\bin" - - ps: $env:TOOLCHAIN = $("$(rustup show active-toolchain)" -split '\s+')[0] - # * set RUST_BACKTRACE for enhanced error messages - - set RUST_BACKTRACE=1 - # * show rust versions - - rustc -vV - - cargo -vV - - # "gnu" ABI setup - # * use the system MinGW/MSYS if we can - - if /i "%ABI%"=="gnu" set MSYS_BINDIR=C:\msys64\usr\bin - - if /i "%ABI%"=="gnu" if /i "%ARCH%"=="i686" set "MSYS_BITS=32" - - if /i "%ABI%"=="gnu" if /i "%ARCH%"=="x86_64" set "MSYS_BITS=64" - - if defined MSYS_BITS set "MSYS_MINGWDIR=C:\msys64\mingw%MSYS_BITS%" - - if defined MSYS_MINGWDIR set "MSYS_BINDIR=C:\msys64\usr\bin" - ## * workaround for rust-lang/rust#47048 / rust-lang/rust#53454 ## !maint: remove when resolved - - if /i "%ABI%"=="gnu" if /i "%ARCH%"=="i686" if not DEFINED MINGW_URL set "MINGW_URL=https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win32/Personal Builds/mingw-builds/8.1.0/threads-posix/dwarf/i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z" - - if /i "%ABI%"=="gnu" if /i "%ARCH%"=="x86_64" if not DEFINED MINGW_URL set "MINGW_URL=https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win64/Personal Builds/mingw-builds/8.1.0/threads-posix/seh/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z" - ## (end workaround) - # * specific MinGW, if specified - - ps: if ( ! $env:MINGW_ARCHIVE -and $env:MINGW_URL ) { $env:MINGW_ARCHIVE = $($([URI]$env:MINGW_URL).fragment).TrimStart('#') } - - ps: if ( ! $env:MINGW_ARCHIVE -and $env:MINGW_URL ) { $env:MINGW_ARCHIVE = $([URI]$env:MINGW_URL).segments[-1] } - - if defined MINGW_ARCHIVE curl --insecure -fsSL "%MINGW_URL%" -o "%CI_TEMP_DIR%\%MINGW_ARCHIVE%" - - if defined MINGW_ARCHIVE mkdir "%CI_TEMP_DIR%\MinGW" >NUL - - if defined MINGW_ARCHIVE 7z x -y "%CI_TEMP_DIR%\%MINGW_ARCHIVE%" -o"%CI_TEMP_DIR%\MinGW" >NUL - - if defined MINGW_ARCHIVE set "MSYS_MINGWDIR=%CI_TEMP_DIR%\MinGW\mingw%MSYS_BITS%" - - if defined MINGW_ARCHIVE set "MSYS_BINDIR=%MSYS_MINGWDIR%\bin" - # * MinGW/MSYS PATH setup - - if defined MSYS_MINGWDIR set PATH=%MSYS_MINGWDIR%\%ARCH%-w64-mingw32\bin;%MSYS_BINDIR%;%PATH% - ## * workaround for rust-lang/rust#47048 / rust-lang/rust#53454 ## !maint: remove when resolved - # ** ref: , - # ** egs: , - - if /i "%ABI%"=="gnu" rustup install %CHANNEL%-%ARCH%-pc-windows-msvc - - if /i "%ABI%"=="gnu" rustup default %CHANNEL%-%ARCH%-pc-windows-msvc - - if /i "%ABI%"=="gnu" rustup target add %TARGET% - - ps: $env:TOOLCHAIN = $("$(rustup show active-toolchain)" -split '\s+')[0] - - if /i "%ABI%"=="gnu" rustup show - - if /i "%ABI%"=="gnu" rustc -vV - # ** copy libs from gcc toolchain to rust toolchain (more specifically, "crt2.o" and "dllcrt2.o" are needed) - - if defined MSYS_MINGWDIR copy /y "%MSYS_MINGWDIR%\%ARCH%-w64-mingw32\lib\*.o" "%USERPROFILE%\.rustup\toolchains\%TOOLCHAIN%\lib\rustlib\%TARGET%\lib" >NUL - ## (end workaround) - # * show `gcc` info - - if /i "%ABI%"=="gnu" ( where gcc && gcc --version ) - - # "msvc" ABI setup - - if /i "%ABI%" == "msvc" if /i "%ARCH%" == "i686" call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" - - if /i "%ABI%" == "msvc" if /i "%ARCH%" == "x86_64" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 - - if /i "%ABI%" == "msvc" if /i "%ARCH%" == "x86_64" call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 - # * show `cl` info - - if /i "%ABI%"=="msvc" ( where cl && cl 2>&1 | findstr /i /c:"version" ) - - # finalize options - - ps: if ("$env:FEATURES".length) { $env:BUILD_OPTIONS = $(($env:BUILD_OPTIONS, "--features `"${env:FEATURES}`"")|?{$_}) -join ' ' } - - ps: if ("$env:FEATURES".length) { $env:TEST_OPTIONS = $(($env:TEST_OPTIONS, "--features `"${env:FEATURES}`"")|?{$_}) -join ' ' } - -build_script: - - ps: $env:BUILD_CMD = $(("cargo +${env:TOOLCHAIN} build --target=${env:TARGET}", $env:BUILD_OPTIONS)|?{$_}) -join ' ' - - echo [ `%BUILD_CMD%` ] & %BUILD_CMD% - -test_script: - - ps: $env:TEST_CMD = $(("cargo +${env:TOOLCHAIN} test --target=${env:TARGET}", $env:TEST_OPTIONS)|?{$_}) -join ' ' - - echo [ `%TEST_CMD%` ] & %TEST_CMD% diff --git a/src/uucore/.cirrus.yml b/src/uucore/.cirrus.yml deleted file mode 100644 index 390f07e3a..000000000 --- a/src/uucore/.cirrus.yml +++ /dev/null @@ -1,14 +0,0 @@ -task: - name: stable x86_64-unknown-freebsd-12 - freebsd_instance: - image: freebsd-12-1-release-amd64 - setup_script: - - pkg install -y curl - - curl https://sh.rustup.rs -sSf --output rustup.sh - - sh rustup.sh -y --profile=minimal - build_script: - - . $HOME/.cargo/env - - cargo build --all-features - test_script: - - . $HOME/.cargo/env - - cargo test --all-features diff --git a/src/uucore/.codecov.yml b/src/uucore/.codecov.yml deleted file mode 100644 index 69cb76019..000000000 --- a/src/uucore/.codecov.yml +++ /dev/null @@ -1 +0,0 @@ -comment: false diff --git a/src/uucore/.gitignore b/src/uucore/.gitignore deleted file mode 100644 index b1ac52506..000000000 --- a/src/uucore/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -target/ -/src/*/gen_table -/build/ -/tmp/ -/busybox/ -/.vscode/ -/.vs/ -*~ -.*.swp -.*.swo -.idea -Cargo.lock -lib*.a -/docs/_build diff --git a/src/uucore/.travis.yml b/src/uucore/.travis.yml deleted file mode 100644 index 21a7345af..000000000 --- a/src/uucore/.travis.yml +++ /dev/null @@ -1,47 +0,0 @@ -language: rust - -rust: - - stable - - beta - -os: - - linux - - osx - -env: - global: FEATURES='' CARGO_ARGS='--all-features' - -matrix: - allow_failures: - - rust: nightly - fast_finish: true - include: - - rust: 1.31.0 - - rust: stable - os: linux - - rust: stable - os: osx - - rust: nightly - os: linux - - rust: nightly - os: osx - -cache: - directories: - - $HOME/.cargo - -script: - - cargo build $CARGO_ARGS --features "$FEATURES" - - cargo test $CARGO_ARGS --features "$FEATURES" --no-fail-fast - -addons: - apt: - packages: - - libssl-dev - -after_success: | - if [ "$TRAVIS_OS_NAME" = linux -a "$TRAVIS_RUST_VERSION" = stable ]; then - bash <(curl https://raw.githubusercontent.com/xd009642/tarpaulin/master/travis-install.sh) - cargo tarpaulin --out Xml - bash <(curl -s https://codecov.io/bash) - fi diff --git a/src/uucore/.vscode/cSpell.json b/src/uucore/.vscode/cSpell.json deleted file mode 100644 index 80a966e9a..000000000 --- a/src/uucore/.vscode/cSpell.json +++ /dev/null @@ -1,152 +0,0 @@ -// cSpell Settings -{ - "version": "0.1", // Version of the setting file. Always 0.1 - "language": "en", // language - current active spelling language - // ignoreWords - "ignoreWords": [ - // abbrev/acronyms - "FreeBSD", - "Gmail", - "MacOS", - "MinGW", - "POSIX", - "tcsh", - // crates - "getopts", - "libc", - "termion", - "walkdir", - "winapi", - // jargon - "POSIXLY", - "canonicalization", - "canonicalize", - "precompiled", - "readonly", - "symlink", - "symlinks", - // names - "Alex Lyon", "Alex", "Lyon", - "Derek Chiang", "Derek", "Chiang", - "Evgeniy Klyuchikov", "Evgeniy", "Klyuchikov", - "Fangxu Hu", "Fangxu", "Hu", - "Jian Zeng", "Jian", "Zeng", - "Jimmy Lu", "Jimmy", "Lu", - "Jordi Boggiano", "Jordi", "Boggiano", - "Jordy Dickinson", "Jordy", "Dickinson", - "Joseph Crail", "Joseph", "Crail", - "Joshua S Miller", "Joshua", "Miller", - "Maciej Dziardziel", "Maciej", "Dziardziel", - "Michael Gehring", "Michael", "Gehring", - "Peter Atashian", "Peter", "Atashian", - "Rolf Morel", "Rolf", "Morel", - "Roy Ivy III", "Roy", "Ivy", "III", - "Smigle00", "Smigle", - "Sylvestre Ledru", "Sylvestre", "Ledru", - "Vsevolod Velichko", "Vsevolod", "Velichko", - "anonymousknight", - "kwantam", - // rust - "concat", - "fract", - "rfind", - "trunc", - // rust utils - "clippy", - // tags - "Maint", - // vars/libc - "FILENO", - "HOSTSIZE", - "IDSIZE", - "IFIFO", - "IFREG", - "IRGRP", - "IROTH", - "IRUSR", - "ISGID", - "ISUID", - "ISVTX", - "IWGRP", - "IWOTH", - "IWUSR", - "IXGRP", - "IXOTH", - "IXUSR", - "LINESIZE", - "NAMESIZE", - "USERSIZE", - "addrinfo", - "addrlen", - "canonname", - "chroot", - "freeaddrinfo", - "getaddrinfo", - "getegid", - "geteuid", - "getgid", - "getgrgid", - "getgrnam", - "getgrouplist", - "getgroups", - "getpwnam", - "getpwuid", - "getuid", - "isatty", - "lchown", - "setgid", - "setgroups", - "setuid", - "socktype", - "umask", - "waitpid", - // vars/nix - "EOPNOTSUPP", - "GETFL", - "IoVec", - "errno", - "fcntl", - "fstat", - "unistd", - "vmsplice", - // vars/platform-info - "uname", - // vars/signals - "SIGPIPE", - // vars/sync - "Condvar", - // vars/time - "Timespec", - "nsec", - "nsecs", - "strftime", - "usec", - "usecs", - // vars/utmpx - "endutxent", - "getutxent", - "getutxid", - "getutxline", - "pututxline", - "setutxent", - "utmp", - "utmpx", - "utmpxname", - // uucore - "optflag", - "optflagmulti", - "optflagopt", - "optmulti", - "optopt", - // uutils - "coreopts", - "coreutils", - "musl", - "utmpx", - "uucore", - "uumain", - "uutils" - ], - // words - list of words to be always considered correct - "words": [] -} diff --git a/src/uucore/LICENSE b/src/uucore/LICENSE deleted file mode 100644 index 0177c4ab7..000000000 --- a/src/uucore/LICENSE +++ /dev/null @@ -1,18 +0,0 @@ -Copyright (c) Jordi Boggiano - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/uucore/README.md b/src/uucore/README.md deleted file mode 100644 index 191d41ab7..000000000 --- a/src/uucore/README.md +++ /dev/null @@ -1,33 +0,0 @@ -uutils uucore -============= - -[![Discord](https://img.shields.io/badge/discord-join-7289DA.svg?logo=discord&longCache=true&style=flat)](https://discord.gg/wQVJbvJ) -[![License](http://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/uutils/uucore/blob/master/LICENSE) -[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fuutils%2Fuucore.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fuutils%2Fuucore?ref=badge_shield) -[![LOC](https://tokei.rs/b1/github/uutils/uucore?category=code)](https://github.com/Aaronepower/tokei) -[![dependency status](https://deps.rs/repo/github/uutils/uucore/status.svg)](https://deps.rs/repo/github/uutils/uucore) - -[![Build Status](https://api.travis-ci.org/uutils/coreutils.svg?branch=master)](https://travis-ci.org/uutils/uucore) -[![Build Status (Windows)](https://ci.appveyor.com/api/projects/status/787ltcxgy86r20le?svg=true)](https://ci.appveyor.com/project/Arcterus/uucore) -[![Build Status (FreeBSD)](https://api.cirrus-ci.com/github/uutils/coreutils.svg)](https://cirrus-ci.com/github/uutils/uucore/master) - ------------------------------------------------ - -uucore is a collection of code used by various uutils projects. Currently, -almost all of the code is used by [uutils/coreutils](https://github.com/uutils/coreutils). -In the future, much of this repository may be supplanted by smaller, more -focused repositories/crates. - -### Rust Version ### - -uucore follows Rust's release channels and is tested against stable, beta and nightly. -The current oldest supported version of the Rust compiler is `1.31.0`. - -On Windows, only the nightly version is tested currently. - -License -------- - -uucore is licensed under the MIT License - see the `LICENSE` file for details - -[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fuutils%2Fuucore.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fuutils%2Fuucore?ref=badge_large)