Merge pull request #36 from NordicSemiconductor/master

Merge master to release 1.0

Changelog.md

@@ -1,5 +1,10 @@
+## Version 1.0.10
+### Updates
+* Add installing section for Connected Home over IP dependencies
+* Updated project import step
+
 ## Version 1.0.9
-## Updates
+### Updates
 * Updated according to changes of Electron dialog API
 
 ## Version 1.0.8

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pc-nrfconnect-gettingstarted",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "displayName": "Getting Started Assistant",
   "description": "Guide for setting up toolchains and getting the code for nRF Connect SDK",
   "repository": {

resources/data/darwin_deps-0.9.3.json

@@ -78,6 +78,47 @@
                 }
             ]
         },
+        {
+            "type": "Checkable",
+            "steps": [
+                {
+                    "type": "Step",
+                    "title": "Install GN build system",
+                    "description": [
+                        "_Note: If you are not interested in the [Connected Home over IP](https://www.connectedhomeip.com/) applications, omit this section._",
+                        "Install GN build system by completing following steps:",
+                        "1. Download and extract [GN](https://gn.googlesource.com/gn/) build system executable archive used by the Connected Home over IP to generate output files:",
+                        " ",
+                        {
+                            "type": "commands",
+                            "description": [
+                                "mkdir ${HOME}/gn && cd ${HOME}/gn",
+                                "wget -O gn.zip https://chrome-infra-packages.appspot.com/dl/gn/gn/mac-amd64/+/latest",
+                                "unzip gn.zip",
+                                "rm gn.zip"
+                            ]
+                        },
+                        " ",
+                        "2. Add the GN location to the system PATH:",
+                        " ",
+                        {
+                            "type": "commands",
+                            "description": [
+                                "echo 'export PATH=${HOME}/gn:\"$PATH\"' >> ${HOME}/.bashrc",
+                                "source ${HOME}/.bashrc"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "checkers": [
+                {
+                    "type": "Checker",
+                    "checkerType": "command",
+                    "commands": "gn --version"
+                }
+            ]
+        },
         {
             "type": "Checkable",
             "steps": [

resources/data/linux_zephyr_deps-0.9.5.json

@@ -136,6 +136,47 @@
                 }
             ]
         },
+        {
+            "type": "Checkable",
+            "steps": [
+                {
+                    "type": "Step",
+                    "title": "Installing GN build system",
+                    "description": [
+                        "_Note: If you are not interested in the [Connected Home over IP](https://www.connectedhomeip.com/) applications, omit this section._",
+                        "Install GN build system by completing following steps:",
+                        "1. Download and extract [GN](https://gn.googlesource.com/gn/) build system executable archive used by the Connected Home over IP to generate output files:",
+                        " ",
+                        {
+                            "type": "commands",
+                            "description": [
+                                "mkdir ${HOME}/gn && cd ${HOME}/gn",
+                                "wget -O gn.zip https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+/latest",
+                                "unzip gn.zip",
+                                "rm gn.zip"
+                            ]
+                        },
+                        " ",
+                        "2. Add the GN location to the system PATH:",
+                        " ",
+                        {
+                            "type": "commands",
+                            "description": [
+                                "echo 'export PATH=${HOME}/gn:\"$PATH\"' >> ${HOME}/.bashrc",
+                                "source ${HOME}/.bashrc"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "checkers": [
+                {
+                    "type": "Checker",
+                    "checkerType": "command",
+                    "commands": "gn --version"
+                }
+            ]
+        },
         {
             "type": "Checkable",
             "steps": [

resources/data/ses_config-0.1.2.json

@@ -43,15 +43,20 @@
             "steps": [
                 {
                     "type": "Step",
-                    "title": "Choose paths",
+                    "title": "Import project",
                     "description": [
                         "Select **File > Open nRF Connect SDK Project**.",
                         "To import a project into SES, you must specify the following information:",
-                        "- **CMakeLists.txt** - the location of the ``CMakeLists.txt`` project file of the sample that you want to work with (for example, the full path to ``ncs/nrf/applications/asset_tracker/CMakeLists.txt``)",
-                        "- **Board Directory** - the location of the board description for which to build the project (for example, the full path to ``ncs/zephyr/boards/arm/nrf9160_pca10090``)",
-                        "- **Board Name** - the board name for which to build the project (for example, ``nrf9160_pca10090ns``)",
-                        "- **Build Directory** - the folder in which to run the build (for example, the full path to ``ncs/nrf/applications/asset_tracker/build``)",
-                        "- **Delete Existing CMakeCache.txt** - select this option to ensure that you are not building with an outdated build cache",
+                        "- **nRF Connect SDK Release** - Select the nRF Connect SDK version that you want to work with.",
+                        "- **nRF Connect Toolchain Version** - Select NONE.",
+                        "- **Projects** - Select the project that you want to work with.",
+                        "    Select any of the checkboxes to add samples and applications from the respective area to the drop-down list. To add custom projects to the drop-down list, click and select the folder that contains the projects that you want to add.",
+                        "- **Board Name** - Select the board that you want to work with.",
+                        "    Select any of the checkboxes to add the respective build targets to the drop-down list. To add custom build targets to the drop-down list, click and select the folder that contains the board definitions.",
+                        "    _Note that if you work with a TrustZone device, you usually build the firmware for the non-secure domain and must therefore select the non-secure build target, for example, **nrf9160dk_nrf9160ns** or **nrf5340pdk_nrf5340_cpuappns**._",
+                        "- **Build Directory** - Select the folder in which to run the build. The field is filled automatically based on the selected board name, but you can specify a different directory.",
+                        "- **Clean Build Directory** - Select this option to ensure that you are not building with an outdated build cache.",
+                        "- **Extended Settings** - Select this option to display a field where you can specify additional CMake options to be used for building.",
                         " ",
                         "Click **OK** to open the project."
                     ]