You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ad...@apache.org on 2017/04/26 00:51:16 UTC
[05/12] incubator-mynewt-site git commit: Various Updates to fix
discrepencies 1) Add -f to ln command go 1.7 for installing newt on linux
(newt_linux.md) 2) Change develop branch to the master branch as the unstable
branch in repo docs. 3) change 0-late
Various Updates to fix discrepencies
1) Add -f to ln command go 1.7 for installing newt on linux (newt_linux.md)
2) Change develop branch to the master branch as the unstable branch in repo docs.
3) change 0-latest to 1-latest in nrf52_adc tutorial
4) Remove paths from "gcc" in compiler.yml file in native_tools.md
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/2aa85321
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/2aa85321
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/2aa85321
Branch: refs/heads/develop
Commit: 2aa85321ae7bf3c9a42c976ec8c21932f9ba03fa
Parents: 1db5d8d
Author: cwanda <wa...@happycity.com>
Authored: Fri Apr 14 20:22:19 2017 -0700
Committer: aditihilbert <ad...@runtime.io>
Committed: Tue Apr 25 13:03:34 2017 -0700
----------------------------------------------------------------------
docs/newt/install/newt_linux.md | 4 ++--
docs/os/get_started/native_tools.md | 12 ++++++------
docs/os/get_started/project_create.md | 2 +-
docs/os/get_started/vocabulary.md | 4 ++--
docs/os/tutorials/nrf52_adc.md | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/2aa85321/docs/newt/install/newt_linux.md
----------------------------------------------------------------------
diff --git a/docs/newt/install/newt_linux.md b/docs/newt/install/newt_linux.md
index a2c1671..4633105 100644
--- a/docs/newt/install/newt_linux.md
+++ b/docs/newt/install/newt_linux.md
@@ -50,14 +50,14 @@ If you want to build the *newt* tool from its source code, follow the following
**Note**: The Newt tool requires Go version 1.7 or later. Currently, the latest Go version that Ubuntu installs is 1.6. You can run `apt-get install golang-1.7-go` to install version 1.7. You can also download version 1.7 from [https://golang.org/dl/](https://golang.org/dl/).
-```no-highlight
+```hl_lines="1 7"
$sudo apt-get install golang-1.7-go
Reading package lists... Done
...
Unpacking golang-1.7-go (1.7.1-2ubuntu1) ...
Setting up golang-1.7-go (1.7.1-2ubuntu1) ...
$
-$sudo ln -s /usr/lib/go-1.7/bin/go /usr/bin/go
+$sudo ln -sf ../lib/go-1.7/bin/go /usr/bin/go
$go version
go version go1.7.1 linux/amd64
```
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/2aa85321/docs/os/get_started/native_tools.md
----------------------------------------------------------------------
diff --git a/docs/os/get_started/native_tools.md b/docs/os/get_started/native_tools.md
index 282d919..8ca3bdc 100644
--- a/docs/os/get_started/native_tools.md
+++ b/docs/os/get_started/native_tools.md
@@ -33,8 +33,8 @@ Check the gcc version you have installed (either using brew or previously instal
```hl_lines="2 3"
# OS X.
-compiler.path.cc.DARWIN.OVERWRITE: "/usr/local/bin/gcc-5"
-compiler.path.as.DARWIN.OVERWRITE: "/usr/local/bin/gcc-5 -x assembler-with-cpp"
+compiler.path.cc.DARWIN.OVERWRITE: "gcc-5"
+compiler.path.as.DARWIN.OVERWRITE: "gcc-5"
compiler.path.objdump.DARWIN.OVERWRITE: "gobjdump"
compiler.path.objsize.DARWIN.OVERWRITE: "objsize"
compiler.path.objcopy.DARWIN.OVERWRITE: "gobjcopy"
@@ -42,8 +42,8 @@ compiler.path.objcopy.DARWIN.OVERWRITE: "gobjcopy"
with the following:
```no-highlight
-compiler.path.cc.DARWIN.OVERWRITE: "/usr/local/bin/gcc-6"
-compiler.path.as.DARWIN.OVERWRITE: "/usr/local/bin/gcc-6 -x assembler-with-cpp\u201d
+compiler.path.cc.DARWIN.OVERWRITE: "gcc-6"
+compiler.path.as.DARWIN.OVERWRITE: "gcc-6\u201d
```
<br>
@@ -52,8 +52,8 @@ In case you wish to use Clang, you can change your `<mynewt-src-directory>/repos
```hl_lines="2 3"
# OS X.
-compiler.path.cc.DARWIN.OVERWRITE: "/usr/local/bin/gcc-5"
-compiler.path.as.DARWIN.OVERWRITE: "/usr/local/bin/gcc-5 -x assembler-with-cpp"
+compiler.path.cc.DARWIN.OVERWRITE: "gcc-5"
+compiler.path.as.DARWIN.OVERWRITE: "gcc-5"
compiler.path.objdump.DARWIN.OVERWRITE: "gobjdump"
compiler.path.objsize.DARWIN.OVERWRITE: "objsize"
compiler.path.objcopy.DARWIN.OVERWRITE: "gobjcopy"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/2aa85321/docs/os/get_started/project_create.md
----------------------------------------------------------------------
diff --git a/docs/os/get_started/project_create.md b/docs/os/get_started/project_create.md
index c7575af..2c41df3 100644
--- a/docs/os/get_started/project_create.md
+++ b/docs/os/get_started/project_create.md
@@ -89,7 +89,7 @@ repository.apache-mynewt-core:
user: apache
repo: incubator-mynewt-core
```
-Changing to 1-dev will put you on the develop branch. **The Develop Branch may not be stable and you may encounter bugs or other problems.**
+Changing to 0-dev will put you on the latest master branch. **This branch may not be stable and you may encounter bugs or other problems.**
<br>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/2aa85321/docs/os/get_started/vocabulary.md
----------------------------------------------------------------------
diff --git a/docs/os/get_started/vocabulary.md b/docs/os/get_started/vocabulary.md
index a716aca..63970e1 100644
--- a/docs/os/get_started/vocabulary.md
+++ b/docs/os/get_started/vocabulary.md
@@ -47,8 +47,8 @@ relies upon.
the ```apache-mynewt-core``` repository.
* ```vers=1-latest```: Defines the repository version. This string will use the
-latest code in the 'Master' github branch. To use the latest version in the
-develop branch, just change it to ```vers=1-dev```
+latest stable version in the 'Master' github branch. To use the latest version in the
+master branch, just change it to ```vers=0-dev```. Note that this branch might not be stable.
Repositories are versioned collections of packages.
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/2aa85321/docs/os/tutorials/nrf52_adc.md
----------------------------------------------------------------------
diff --git a/docs/os/tutorials/nrf52_adc.md b/docs/os/tutorials/nrf52_adc.md
index c075f01..3fe1fa5 100644
--- a/docs/os/tutorials/nrf52_adc.md
+++ b/docs/os/tutorials/nrf52_adc.md
@@ -65,7 +65,7 @@ project.repositories:
#
repository.apache-mynewt-core:
type: github
- vers: 1-dev
+ vers: 1-latest
user: apache
repo: incubator-mynewt-core
repository.mynewt_nordic: