diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2019-12-13 19:24:22 +0100 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2019-12-13 19:24:22 +0100 |
commit | fd1cacded7523724e57a2bec2dfaf0a867dabdf7 (patch) | |
tree | 515b0f8ed3b93d1e31fec9a3ceb0d4162838b6fc | |
parent | b8e15051ff6a845b252a8f86f8a17ccad87b4336 (diff) | |
parent | b3dc95542b7a0aca38e9b196d30f25f7defecf1b (diff) |
Merge branch 'extract-libical'
98 files changed, 3207 insertions, 8926 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 782d19d..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,47 +0,0 @@ -version: 2 -jobs: - test: - docker: - - image: puzzlewolf/rust-libical3:0.7 - working_directory: /mnt/crate - steps: - - checkout - - restore_cache: - keys: - - cargo-v2-{{ checksum "Cargo.toml" }}- - - cargo-v2- - - run: cargo update - - run: cargo fetch - - persist_to_workspace: - root: "." - paths: - - Cargo.lock - - save_cache: - key: cargo-v2-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }} - paths: - - ~/.cargo/registry - - ~/.cargo/git - - run: - name: Print version information - command: rustc --version; cargo --version - - run: - name: Build and test - command: cargo test --verbose --frozen - environment: - # Need this for the coverage run - RUSTFLAGS: "-C link-dead-code" - - run: - name: Prune the output files - command: | - for file in target/debug/* target/debug/.??*; do - [ -d $file -o ! -x $file ] && rm -r $file - done - - persist_to_workspace: - root: "." - paths: - - target/debug/* -workflows: - version: 2 - test_all: - jobs: - - test diff --git a/.circleci/images/rust-libical3-kcov/Dockerfile b/.circleci/images/rust-libical3-kcov/Dockerfile deleted file mode 100644 index d9e9bb4..0000000 --- a/.circleci/images/rust-libical3-kcov/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#FROM debian:buster -FROM puzzlewolf/rust-libical3:0.7 - -ARG KCOV_GIT_REF - -RUN apt-get update -# install pkg-config deliberately separate since it sometimes fails :( If it eventually -# is installed we do not repeat the whole image build. -#RUN apt-get install -y --fix-missing pkg-config -RUN apt-get install -y wget libcurl4-openssl-dev libelf-dev libdw-dev cmake cmake-data g++ binutils-dev \ - libiberty-dev -#RUN apt-get install -y libical-dev - -ENV SRC_DIR=/home/kcov-src \ - URL_GIT_KCOV=https://github.com/SimonKagstrom/kcov.git - -RUN git clone $URL_GIT_KCOV $SRC_DIR; \ - cd $SRC_DIR; \ - # default to latest tagged version - DEFAULT_KCOV_GIT_REF=$(git tag --list | grep "^v[0-9]\+$" | sort -V | tail --lines 1); \ - KCOV_GIT_REF=${KCOV_GIT_REF:-$DEFAULT_KCOV_GIT_REF}; \ - git reset --hard $KCOV_GIT_REF; - -RUN cd $SRC_DIR && \ - mkdir build && \ - cd build && \ - cmake .. && \ - make && \ - make install - -ENTRYPOINT ["kcov"] -CMD ["--help"] diff --git a/.circleci/images/rust-libical3/Dockerfile b/.circleci/images/rust-libical3/Dockerfile deleted file mode 100644 index ff4e1d9..0000000 --- a/.circleci/images/rust-libical3/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM buildpack-deps:buster - -# Some of the dependencies I need to build a few libraries, -# personalize to your needs. You can use multi-stage builds -# to produce a lightweight image. -#RUN apt-get update && \ -# apt-get install -y curl file gcc g++ git make openssh-client \ -# autoconf automake cmake libtool libcurl4-openssl-dev libssl-dev \ -# libelf-dev libdw-dev binutils-dev zlib1g-dev libiberty-dev wget \ -# xz-utils pkg-config python - -RUN apt-get update && \ - apt-get install -y libical-dev clang - -#ENV KCOV_VERSION 33 -#RUN wget https://github.com/SimonKagstrom/kcov/archive/v$KCOV_VERSION.tar.gz && \ -# tar xzf v$KCOV_VERSION.tar.gz && \ -# rm v$KCOV_VERSION.tar.gz && \ -# cd kcov-$KCOV_VERSION && \ -# mkdir build && cd build && \ -# cmake .. && make && make install && \ -# cd ../.. && rm -rf kcov-$KCOV_VERSION - -#RUN curl https://sh.rustup.rs -sSf | sh -s -- -y -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - -ENV PATH "$PATH:/root/.cargo/bin" -#ENV RUSTFLAGS "-C link-dead-code" -#ENV CFG_RELEASE_CHANNEL "nightly" - -#RUN rustup update && \ -# rustup install nightly && \ -# rustup default nightly - -#ENV RUSTFMT_VERSION 0.3.1 -#RUN wget https://github.com/rust-lang-nursery/rustfmt/archive/${RUSTFMT_VERSION}.tar.gz && \ -# tar xzf ${RUSTFMT_VERSION}.tar.gz && rm ${RUSTFMT_VERSION}.tar.gz && \ -# cd rustfmt-${RUSTFMT_VERSION} && \ -# $HOME/.cargo/bin/cargo install --path . && \ -# cd .. && rm -rf rustfmt-${RUSTFMT_VERSION} - -#RUN bash -l -c 'echo $(rustc --print sysroot)/lib >> /etc/ld.so.conf' -#RUN bash -l -c 'echo /usr/local/lib >> /etc/ld.so.conf' -#RUN ldconfig -#EXEC bash @@ -1,16 +1,5 @@ -# Generated by Cargo -# will have compiled files and executables -/target/ - -# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries -# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html -# Cargo.lock +Cargo.lock +target # These are backup files generated by rustfmt **/*.rs.bk - -# Don't commit ics files in this repo (typically) -*.ics - -# Don't commit the Index folder -.khaleesi/ diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..53e3b66 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +matrix: + include: + - language: nix + script: + - nix-shell --pure --run "cargo build --all --all-features" + +jobs: + allow_failures: + - rust: nightly + fast_finish: true + +notifications: + email: + on_success: always + on_failure: always + diff --git a/Cargo.lock b/Cargo.lock deleted file mode 100644 index f539ac2..0000000 --- a/Cargo.lock +++ /dev/null @@ -1,1186 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "aho-corasick" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "argon2rs" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", - "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "arrayvec" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "assert_fs" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "globwalk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "predicates 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "atty" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", - "termion 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "autocfg" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "backtrace" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "backtrace-sys" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "bindgen" -version = "0.43.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "clang-sys 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)", - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "which 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "bitflags" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "blake2-rfc" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "bstr" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "cc" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "cexpr" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "cfg-if" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "chrono" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "clang-sys" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", - "libloading 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "clap" -version = "2.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "cloudabi" |