Updated versions This closes #167.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/commit/4bc395c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/4bc395c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/4bc395c1 Branch: refs/heads/develop Commit: 4bc395c141b3d8eb1993fc4c290b4a4d1a91afe8 Parents: 85f956e Author: cwanda <[email protected]> Authored: Fri Apr 7 14:47:52 2017 -0700 Committer: aditihilbert <[email protected]> Committed: Fri Apr 7 16:49:00 2017 -0700 ---------------------------------------------------------------------- docs/os/tutorials/nrf52_adc.md | 4 ++-- docs/os/tutorials/repo/add_repos.md | 27 +++++++++++++++++---------- docs/os/tutorials/repo/create_repo.md | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4bc395c1/docs/os/tutorials/nrf52_adc.md ---------------------------------------------------------------------- diff --git a/docs/os/tutorials/nrf52_adc.md b/docs/os/tutorials/nrf52_adc.md index 269e6b5..c075f01 100644 --- a/docs/os/tutorials/nrf52_adc.md +++ b/docs/os/tutorials/nrf52_adc.md @@ -65,12 +65,12 @@ project.repositories: # repository.apache-mynewt-core: type: github - vers: 0-dev + vers: 1-dev user: apache repo: incubator-mynewt-core repository.mynewt_nordic: type: github - vers: 0-latest + vers: 1-latest user: runtimeinc repo: mynewt_nordic ``` http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4bc395c1/docs/os/tutorials/repo/add_repos.md ---------------------------------------------------------------------- diff --git a/docs/os/tutorials/repo/add_repos.md b/docs/os/tutorials/repo/add_repos.md index e280c8e..370c0d3 100644 --- a/docs/os/tutorials/repo/add_repos.md +++ b/docs/os/tutorials/repo/add_repos.md @@ -78,7 +78,7 @@ In the same `myproj` above you will see the following repo descriptor. ```no-highlight repository.apache-Mynewt-core: type: github - vers: 0-latest + vers: 1-latest user: apache repo: incubator-mynewt-core ``` @@ -137,14 +137,14 @@ project.repositories: # repository.apache-Mynewt-core: type: github - vers: 0-latest + vers: 1-latest user: apache repo: incubator-mynewt-core # a special repo to hold hardware specific stuff for arduino zero repository.Mynewt_arduino_zero: type: github - vers: 0-latest + vers: 1-latest user: runtimeinc repo: Mynewt_arduino_zero ``` @@ -158,10 +158,10 @@ systems like github. The repo descriptor in your `project.yml` file must specify the version of the repo you will accept into your project. For now, we are at the beginnings of Mynewt. For testing and evaluation -please use `0-latest` in the `vers` field in your repo descriptor. +please use `1-latest` in the `vers` field in your repo descriptor. ``` - vers:0-latest + vers:1-latest ``` See [Create a Repo](create_repo) for a description of the versioning system and all the possible ways to specify a version to use. @@ -182,15 +182,22 @@ Here is the `repository.yml` file from the apache-Mynewt-core: ```no-highlight repo.name: apache-mynewt-core repo.versions: - "0.0.0": "develop" + "0.0.0": "master" + "0.0.1": "master" "0.7.9": "mynewt_0_8_0_b2_tag" "0.8.0": "mynewt_0_8_0_tag" "0.9.0": "mynewt_0_9_0_tag" - "0.9.1": "master" - "0-latest": "0.9.0" - "0-dev": "0.9.1" + "0.9.9": "mynewt_1_0_0_b1_tag" + "0.9.99": "mynewt_1_0_0_b2_tag" + "0.9.999": "mynewt_1_0_0_rc1_tag" + "1.0.0": "mynewt_1_0_0_tag" + + "0-latest": "1.0.0" # 1.0.0 + "0-dev": "0.0.0" # master + "0.8-latest": "0.8.0" "0.9-latest": "0.9.0" + "1.0-latest": "1.0.0" # 1.0.0 ``` <br> @@ -235,7 +242,7 @@ The stability string can be one of 3 pre-defined stability values. In your `project.yml` file you can specify different combinations of the version number and stability value. For example: -* `0-latest` -- The latest version with major number 0 +* `1-latest` -- The latest version with major number 1 * `1.2-stable` -- The latest stable version with major and minor number 1.2 * `1.2-dev` -- The development version from 1.2 * `1.1.1` -- a specific version 1.1.1 http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4bc395c1/docs/os/tutorials/repo/create_repo.md ---------------------------------------------------------------------- diff --git a/docs/os/tutorials/repo/create_repo.md b/docs/os/tutorials/repo/create_repo.md index 21ec9c5..9688a9f 100644 --- a/docs/os/tutorials/repo/create_repo.md +++ b/docs/os/tutorials/repo/create_repo.md @@ -87,7 +87,7 @@ The stability string can be one of 3 pre-defined stability values. In your `project.yml` file you can specify different combinations of the version number and stability value. For example: -* `0-latest` -- The latest version with major number 0 +* `1-latest` -- The latest version with major number 1 * `1.2-stable` -- The latest stable version with major and minor number 1.2 * `1.2-dev` -- The development version from 1.2 * `1.1.1` -- a specific version 1.1.1
