Commit 3fdfe56f authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge branch 'release-v0.7.4' into release

parents 6195bd4f 926c8167

build_docs.sh

0 → 100755
+10 −0
Original line number Diff line number Diff line 
#!/bin/bash

set -e



export CARGO_TARGET_DIR=target



for toml in $(find . -maxdepth 2 -name "Cargo.toml"); do

    cargo update --manifest-path $toml || true

    features=$(cargo read-manifest --manifest-path $toml | jq -r '.features|keys|join(" ")')

    cargo doc --no-deps --manifest-path $toml --features "$features"

done

openssl-sys-extras/Cargo.toml

+3 −3
Original line number Diff line number Diff line 
[package]

name = "openssl-sys-extras"

version = "0.7.3"

version = "0.7.4"

authors = ["Steven Fackler <sfackler@gmail.com>"]

license = "MIT"

description = "Extra FFI bindings to OpenSSL that require a C shim"

repository = "https://github.com/sfackler/rust-openssl"

documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.3/openssl_sys_extras"

documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.4/openssl_sys_extras"

build = "build.rs"



[features]
@@ -13,7 +13,7 @@ ecdh_auto = [] 


[dependencies]

libc = "0.2"

openssl-sys = { version = "0.7.3", path = "../openssl-sys" }

openssl-sys = { version = "0.7.4", path = "../openssl-sys" }



[build-dependencies]

gcc = "0.3"

openssl-sys-extras/src/lib.rs

+1 −1
Original line number Diff line number Diff line 
#![allow(non_upper_case_globals, non_snake_case)]

#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.3")]

#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.4")]



extern crate openssl_sys;

extern crate libc;

openssl-sys/Cargo.toml

+6 −6
Original line number Diff line number Diff line 
[package]

name = "openssl-sys"

version = "0.7.3"

version = "0.7.4"

authors = ["Alex Crichton <alex@alexcrichton.com>",

           "Steven Fackler <sfackler@gmail.com>"]

license = "MIT"

description = "FFI bindings to OpenSSL"

repository = "https://github.com/sfackler/rust-openssl"

documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.3/openssl_sys"

documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.4/openssl_sys"

links = "openssl"

build = "build.rs"
@@ -40,15 +40,15 @@ libressl-pnacl-sys = "2.1.0" 
libressl-pnacl-sys = "2.1.0"



# Only here to make sure we link to these in a static build on Windows

[target.i686-pc-windows-gnu]

[target.i686-pc-windows-gnu.dependencies]

user32-sys = "0.1"

gdi32-sys = "0.1"

[target.x86_64-pc-windows-gnu]

[target.x86_64-pc-windows-gnu.dependencies]

user32-sys = "0.1"

gdi32-sys = "0.1"

[target.i686-pc-windows-msvc]

[target.i686-pc-windows-msvc.dependencies]

user32-sys = "0.1"

gdi32-sys = "0.1"

[target.x86_64-pc-windows-msvc]

[target.x86_64-pc-windows-msvc.dependencies]

user32-sys = "0.1"

gdi32-sys = "0.1"

openssl-sys/src/lib.rs

+1 −1
Original line number Diff line number Diff line 
#![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]

#![allow(dead_code)]

#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.3")]

#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.4")]



extern crate libc;