diff --git a/CHANGELOG.md b/CHANGELOG.md index 6768b12..93f1dd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ChangeLog for Chrono ==================== -This documents all notable changes to [Chrono](https://github.com/lifthrasiir/rust-chrono). +This documents all notable changes to [Chrono](https://github.com/chronotope/chrono). Chrono obeys the principle of [Semantic Versioning](http://semver.org/). diff --git a/Makefile b/Makefile index 8930e15..e39ffcf 100644 --- a/Makefile +++ b/Makefile @@ -17,27 +17,31 @@ readme: README.md README.md: src/lib.rs # really, really sorry for this mess. - awk '/^\/\/! # Chrono /{print "[Chrono][doc]",$$4}' $< > $@ - awk '/^\/\/! # Chrono /{print "[Chrono][doc]",$$4}' $< | sed 's/./=/g' >> $@ - echo >> $@ - echo '[![Chrono on Travis CI][travis-image]][travis]' >> $@ - echo '[![Chrono on Appveyor][appveyor-image]][appveyor]' >> $@ - echo '[![Chrono on crates.io][cratesio-image]][cratesio]' >> $@ - echo >> $@ - echo '[travis-image]: https://travis-ci.org/chronotope/chrono.svg?branch=master' >> $@ - echo '[travis]: https://travis-ci.org/chronotope/chrono' >> $@ - echo '[appveyor-image]: https://ci.appveyor.com/api/projects/status/2ia91ofww4w31m2w/branch/master?svg=true' >> $@ - echo '[appveyor]: https://ci.appveyor.com/project/chronotope/chrono' >> $@ - echo '[cratesio-image]: https://img.shields.io/crates/v/chrono.svg' >> $@ - echo '[cratesio]: https://crates.io/crates/chrono' >> $@ - awk '/^\/\/! # Chrono /,/^\/\/! ## /' $< | cut -b 5- | grep -v '^#' | \ - sed 's/](\.\//](https:\/\/docs.rs\/chrono\/'"$$(cargo pkgid | cut -d: -f3)"'\/chrono\//g' >> $@ - echo '***[Complete Documentation][doc]***' >> $@ - echo >> $@ - echo '[doc]: https://docs.rs/chrono/'"$$(cargo pkgid | cut -d: -f3)"'/' >> $@ - echo >> $@ - awk '/^\/\/! ## /,!/^\/\/!/' $< | cut -b 5- | grep -v '^# ' | \ - sed 's/](\.\//](https:\/\/docs.rs\/chrono\/'"$$(cargo pkgid | cut -d: -f3)"'\/chrono\//g' >> $@ + ( \ + VERSION="$$(cargo pkgid | cut -d: -f3)"; \ + awk '/^\/\/! # Chrono /{print "[Chrono][docsrs]",$$4}' $<; \ + awk '/^\/\/! # Chrono /{print "[Chrono][docsrs]",$$4}' $< | sed 's/./=/g'; \ + echo; \ + echo '[![Chrono on Travis CI][travis-image]][travis]'; \ + echo '[![Chrono on Appveyor][appveyor-image]][appveyor]'; \ + echo '[![Chrono on crates.io][cratesio-image]][cratesio]'; \ + echo '[![Chrono on docs.rs][docsrs-image]][docsrs]'; \ + echo; \ + echo '[travis-image]: https://travis-ci.org/chronotope/chrono.svg?branch=master'; \ + echo '[travis]: https://travis-ci.org/chronotope/chrono'; \ + echo '[appveyor-image]: https://ci.appveyor.com/api/projects/status/2ia91ofww4w31m2w/branch/master?svg=true'; \ + echo '[appveyor]: https://ci.appveyor.com/project/chronotope/chrono'; \ + echo '[cratesio-image]: https://img.shields.io/crates/v/chrono.svg'; \ + echo '[cratesio]: https://crates.io/crates/chrono'; \ + echo '[docsrs-image]: https://docs.rs/chrono/badge.svg?version='$$VERSION; \ + echo '[docsrs]: https://docs.rs/chrono/'$$VERSION'/'; \ + echo; \ + awk '/^\/\/! # Chrono /,/^\/\/! ## /' $< | cut -b 5- | grep -v '^#' | \ + sed 's/](\.\//](https:\/\/docs.rs\/chrono\/'$$VERSION'\/chrono\//g'; \ + echo; \ + awk '/^\/\/! ## /,!/^\/\/!/' $< | cut -b 5- | grep -v '^# ' | \ + sed 's/](\.\//](https:\/\/docs.rs\/chrono\/'$$VERSION'\/chrono\//g' \ + ) > $@ .PHONY: test test: @@ -47,20 +51,3 @@ test: doc: authors readme cargo doc --features 'serde rustc-serialize bincode' -.PHONY: doc-publish -doc-publish: doc - ( \ - PKGID="$$(cargo pkgid)"; \ - PKGNAMEVER="$${PKGID#*#}"; \ - PKGNAME="$${PKGNAMEVER%:*}"; \ - REMOTE="$$(git config --get remote.origin.url)"; \ - cd target/doc && \ - rm -rf .git && \ - git init && \ - git checkout --orphan gh-pages && \ - echo '' > index.html && \ - git add . && \ - git commit -m 'updated docs.' && \ - git push "$$REMOTE" gh-pages -f; \ - ) - diff --git a/README.md b/README.md index 753bbf2..f7e28d9 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,10 @@ -[Chrono][doc] 0.2.25 -==================== +[Chrono][docsrs] 0.2.25 +======================= [![Chrono on Travis CI][travis-image]][travis] [![Chrono on Appveyor][appveyor-image]][appveyor] [![Chrono on crates.io][cratesio-image]][cratesio] +[![Chrono on docs.rs][docsrs-image]][docsrs] [travis-image]: https://travis-ci.org/chronotope/chrono.svg?branch=master [travis]: https://travis-ci.org/chronotope/chrono @@ -11,8 +12,11 @@ [appveyor]: https://ci.appveyor.com/project/chronotope/chrono [cratesio-image]: https://img.shields.io/crates/v/chrono.svg [cratesio]: https://crates.io/crates/chrono +[docsrs-image]: https://docs.rs/chrono/badge.svg?version=0.2.25 +[docsrs]: https://docs.rs/chrono/0.2.25/ -Date and time handling for Rust. (also known as `rust-chrono`) + +Date and time handling for Rust. It aims to be a feature-complete superset of the [time](https://github.com/rust-lang-deprecated/time) library. In particular, @@ -29,9 +33,6 @@ which Chrono builts upon and should acknowledge: * Dietrich Epp's [datetime-rs](https://github.com/depp/datetime-rs) * Luis de Bethencourt's [rust-datetime](https://github.com/luisbg/rust-datetime) -***[Complete Documentation][doc]*** - -[doc]: https://docs.rs/chrono/0.2.25/ ## Usage diff --git a/src/date.rs b/src/date.rs index 364ee95..3e76a51 100644 --- a/src/date.rs +++ b/src/date.rs @@ -1,5 +1,4 @@ -// This is a part of rust-chrono. -// Copyright (c) 2014-2015, Kang Seonghoon. +// This is a part of Chrono. // See README.md and LICENSE.txt for details. /*! diff --git a/src/datetime.rs b/src/datetime.rs index 15170ec..f865118 100644 --- a/src/datetime.rs +++ b/src/datetime.rs @@ -1,5 +1,4 @@ -// This is a part of rust-chrono. -// Copyright (c) 2014-2015, Kang Seonghoon. +// This is a part of Chrono. // See README.md and LICENSE.txt for details. /*! diff --git a/src/div.rs b/src/div.rs index 718c3a1..f21cd66 100644 --- a/src/div.rs +++ b/src/div.rs @@ -1,6 +1,5 @@ -// This is a part of rust-chrono. -// Copyright (c) 2014, Kang Seonghoon. -// Copyright 2013-2014 The Rust Project Developers. +// This is a part of Chrono. +// Portions Copyright 2013-2014 The Rust Project Developers. // See README.md and LICENSE.txt for details. //! Integer division utilities. (Shamelessly copied from [num](https://github.com/rust-lang/num/)) diff --git a/src/format/mod.rs b/src/format/mod.rs index cf10831..c37f84a 100644 --- a/src/format/mod.rs +++ b/src/format/mod.rs @@ -1,5 +1,4 @@ -// This is a part of rust-chrono. -// Copyright (c) 2014-2015, Kang Seonghoon. +// This is a part of Chrono. // See README.md and LICENSE.txt for details. //! Formatting utilities for date and time. diff --git a/src/format/parse.rs b/src/format/parse.rs index ab1e3d6..5256829 100644 --- a/src/format/parse.rs +++ b/src/format/parse.rs @@ -1,5 +1,4 @@ -// This is a part of rust-chrono. -// Copyright (c) 2015, Kang Seonghoon. +// This is a part of Chrono. // Portions copyright (c) 2015, John Nagle. // See README.md and LICENSE.txt for details. diff --git a/src/format/parsed.rs b/src/format/parsed.rs index 3d40191..42fe939 100644 --- a/src/format/parsed.rs +++ b/src/format/parsed.rs @@ -1,5 +1,4 @@ -// This is a part of rust-chrono. -// Copyright (c) 2015, Kang Seonghoon. +// This is a part of Chrono. // See README.md and LICENSE.txt for details. //! A collection of parsed date and time items. diff --git a/src/format/scan.rs b/src/format/scan.rs index 4b6bbb0..345b842 100644 --- a/src/format/scan.rs +++ b/src/format/scan.rs @@ -1,5 +1,4 @@ -// This is a part of rust-chrono. -// Copyright (c) 2015, Kang Seonghoon. +// This is a part of Chrono. // See README.md and LICENSE.txt for details. /*! diff --git a/src/format/strftime.rs b/src/format/strftime.rs index a4acfdb..1553aad 100644 --- a/src/format/strftime.rs +++ b/src/format/strftime.rs @@ -1,5 +1,4 @@ -// This is a part of rust-chrono. -// Copyright (c) 2015, Kang Seonghoon. +// This is a part of Chrono. // See README.md and LICENSE.txt for details. /*! diff --git a/src/lib.rs b/src/lib.rs index 5b86bb0..236d0a1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,10 +1,9 @@ -// This is a part of rust-chrono. -// Copyright (c) 2014-2015, Kang Seonghoon. +// This is a part of Chrono. // See README.md and LICENSE.txt for details. //! # Chrono 0.2.25 //! -//! Date and time handling for Rust. (also known as `rust-chrono`) +//! Date and time handling for Rust. //! It aims to be a feature-complete superset of //! the [time](https://github.com/rust-lang-deprecated/time) library. //! In particular, @@ -360,7 +359,7 @@ pub mod duration { //! (years, months, weeks, and days) in the ISO 8601 duration format //! because arithmetic with nominal components is not defined in ISO 8601. //! - //! This used to be a part of rust-chrono, + //! This used to be a part of Chrono, //! but has been subsequently merged into Rust's standard library. pub use stdtime::Duration; } diff --git a/src/naive/date.rs b/src/naive/date.rs index 591c249..1b3b96b 100644 --- a/src/naive/date.rs +++ b/src/naive/date.rs @@ -1,5 +1,4 @@ -// This is a part of rust-chrono. -// Copyright (c) 2014-2015, Kang Seonghoon. +// This is a part of Chrono. // See README.md and LICENSE.txt for details. //! ISO 8601 calendar date without timezone. diff --git a/src/naive/datetime.rs b/src/naive/datetime.rs index 3a33ea3..296f5d8 100644 --- a/src/naive/datetime.rs +++ b/src/naive/datetime.rs @@ -1,5 +1,4 @@ -// This is a part of rust-chrono. -// Copyright (c) 2014-2015, Kang Seonghoon. +// This is a part of Chrono. // See README.md and LICENSE.txt for details. //! ISO 8601 date and time without timezone. diff --git a/src/naive/time.rs b/src/naive/time.rs index 1790c8d..3899ec1 100644 --- a/src/naive/time.rs +++ b/src/naive/time.rs @@ -1,5 +1,4 @@ -// This is a part of rust-chrono. -// Copyright (c) 2014-2015, Kang Seonghoon. +// This is a part of Chrono. // See README.md and LICENSE.txt for details. //! ISO 8601 time without timezone. diff --git a/src/offset/fixed.rs b/src/offset/fixed.rs index c1a7d6d..c56cebe 100644 --- a/src/offset/fixed.rs +++ b/src/offset/fixed.rs @@ -1,5 +1,4 @@ -// This is a part of rust-chrono. -// Copyright (c) 2015, Kang Seonghoon. +// This is a part of Chrono. // See README.md and LICENSE.txt for details. /*! diff --git a/src/offset/local.rs b/src/offset/local.rs index 2377168..2b5cda7 100644 --- a/src/offset/local.rs +++ b/src/offset/local.rs @@ -1,5 +1,4 @@ -// This is a part of rust-chrono. -// Copyright (c) 2015, Kang Seonghoon. +// This is a part of Chrono. // See README.md and LICENSE.txt for details. /*! diff --git a/src/offset/mod.rs b/src/offset/mod.rs index 75a86a8..4ae3d71 100644 --- a/src/offset/mod.rs +++ b/src/offset/mod.rs @@ -1,5 +1,4 @@ -// This is a part of rust-chrono. -// Copyright (c) 2014-2015, Kang Seonghoon. +// This is a part of Chrono. // See README.md and LICENSE.txt for details. /*! diff --git a/src/offset/utc.rs b/src/offset/utc.rs index 4071397..55c7079 100644 --- a/src/offset/utc.rs +++ b/src/offset/utc.rs @@ -1,5 +1,4 @@ -// This is a part of rust-chrono. -// Copyright (c) 2015, Kang Seonghoon. +// This is a part of Chrono. // See README.md and LICENSE.txt for details. /*!