Skip to content

Commit 15d1c9b

Browse files
committed
Merge pull request #398 from jasssonpet/master
Logging
2 parents 660df8e + 0c83d82 commit 15d1c9b

File tree

12 files changed

+32
-20
lines changed

12 files changed

+32
-20
lines changed

docs/man_pages/device/device-run.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ device run
22
==========
33

44
Usage:
5-
`$ tns device run <ApplicationId> [--device <Device ID>]`
5+
`$ tns device run <ApplicationId> [--print-app-output] [--device <Device ID>]`
66
Runs the selected application on a connected Android or iOS device.
77
You can run this command on one connected device at a time.
88

@@ -15,6 +15,7 @@ Before running your app on an iOS device, verify that your system and app meet t
1515
* You have built your app with the debug build configuration.
1616

1717
Options:
18+
* `--print-app-output` - If set, prints the output of the running application.
1819
* `--device` - If multiple devices are connected, sets the device on which you want to run the app. You can run this command on one connected device at a time.
1920
<% if(isHtml) { %>
2021

docs/man_pages/project/testing/debug-android.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ debug android
22
==========
33

44
Usage:
5-
`$ tns debug android [--device <Device ID> | --emulator <Emulator Options> | --geny <Geny Name> ] [--debug-brk | --start | --stop | --get-port] [--debug-port <port>]`
5+
`$ tns debug android [--device <Device ID> | --emulator <Emulator Options> | --geny <Geny Name> ] [--debug-brk | --start | --stop | --get-port] [--debug-port <port>] [--print-app-output]`
66

77
Example usage:
8-
`$ tns debug android --get-port` `$ tns debug android --debug-brk [--debug-port <port>]`
9-
`$ tns debug android --start [--debug-port <port>]`
8+
`$ tns debug android --get-port` `$ tns debug android --debug-brk [--debug-port <port>]`
9+
`$ tns debug android --start [--debug-port <port>]`
1010
`$ tns debug android --stop`
1111

1212
Debugs your project on a connected device or in a native emulator.
@@ -22,6 +22,7 @@ Options:
2222
* `--stop` - Detaches the debug tools.
2323
* `--get-port` - Retrieves the port on which you are debugging your application.
2424
* `--debug-port` - Sets a new port on which to attach the debug tools.
25+
* `--print-app-output` - If set, prints the system debug output (logcat).
2526
<% if(isHtml) { %>
2627

2728
#### Related Commands

docs/man_pages/project/testing/debug-ios.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ debug ios
22
==========
33

44
Usage:
5-
`$ tns debug ios [--debug-brk | --start] [--device <Device ID> | --emulator <Emulator Options>] [--no-client]`
5+
`$ tns debug ios [--debug-brk | --start] [--device <Device ID> | --emulator <Emulator Options>] [--print-app-output] [--no-client]`
66

77
Example usage:
88
`$ tns debug ios --debug-brk`
@@ -22,6 +22,7 @@ Options:
2222
* `--debug-brk` - Shorthand for prepare, build and deploy. Prepares, builds and deploys the application package on a device or in an emulator, launches the developer tools of your Safari browser.
2323
* `--start` - Attaches the debug tools to a deployed and running app. Your app must be running on device or emulator, launches the developer tools of your Safari browser.
2424
* `--emulator` - Debug on already running emulator. Requires `xcrun` from Xcode 6 or later.
25+
* `--print-app-output` - If set, prints the standard output of the running application. (Device only)
2526
* `--no-client` - Suppresses the launch of the developer tools in Safari.
2627
<% if(isHtml) { %>
2728

docs/man_pages/project/testing/debug.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@ debug
22
==========
33

44
Usage:
5-
`$ tns debug <Command>`
5+
`$ tns debug <Command> [--print-app-output]`
66
You must run the debug command with a related command.
77

88
Debugs your project on a connected device or in a native emulator.
99

1010
`<Command>` is a related command that extends the debug command. You can run the following related commands:
1111
* `android` - Debugs your project on a connected Android device, native Android emulator or Genymotion emulator.
1212
* `ios` - Debugs your project on a connected iOS device or in a native iOS emulator.
13-
<% if(isHtml) { %>
13+
14+
Options:
15+
* `--print-app-output` - If set, prints the output of the running application.
16+
<% if(isHtml) { %>
1417

1518
#### Related Commands
1619

docs/man_pages/project/testing/emulate-android.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ emulate android
22
==========
33

44
Usage:
5-
`$ tns emulate android [--path <Directory>] [--timeout <Seconds>] [--keyStorePath <File Path> --keyStorePassword <Password> --keyStoreAlias <Name> --keyStoreAliasPassword <Password>] [--release]`
6-
`$ tns emulate android [--avd <Name>] [--path <Directory>] [--timeout <Seconds>] [--keyStorePath <File Path> --keyStorePassword <Password> --keyStoreAlias <Name> --keyStoreAliasPassword <Password>] [--release]`
7-
`$ tns emulate android [--geny <GenyName>] [--path <Directory>] [--timeout <Seconds>] [--keyStorePath <File Path> --keyStorePassword <Password> --keyStoreAlias <Name> --keyStoreAliasPassword <Password>] [--release]`
5+
`$ tns emulate android [--print-app-output] [--path <Directory>] [--timeout <Seconds>] [--keyStorePath <File Path> --keyStorePassword <Password> --keyStoreAlias <Name> --keyStoreAliasPassword <Password>] [--release]`
6+
`$ tns emulate android [--avd <Name>] [--print-app-output] [--path <Directory>] [--timeout <Seconds>] [--keyStorePath <File Path> --keyStorePassword <Password> --keyStoreAlias <Name> --keyStoreAliasPassword <Password>] [--release]`
7+
`$ tns emulate android [--geny <GenyName>] [--print-app-output] [--path <Directory>] [--timeout <Seconds>] [--keyStorePath <File Path> --keyStorePassword <Password> --keyStoreAlias <Name> --keyStoreAliasPassword <Password>] [--release]`
88

99
Builds the specified project and runs it in a native Android emulator.
1010

@@ -32,6 +32,7 @@ Before running your app in the Android emulator from the Android SDK, verify tha
3232
<% } %>
3333

3434
Options:
35+
* `--print-app-output` - If set, prints the system debug output (logcat).
3536
* `--path` - Specifies the directory that contains the project. If not specified, the project is searched for in the current directory and all directories above it.
3637
* `--avd` - Sets the Android virtual device on which you want to run your app. You can set only one device at a time. To list the available Android virtual devices, run `$ android list avd`. You cannot use `--avd` and `--geny` simultaneously.
3738
* `--geny` - Sets the Genymotion virtual device on which you want to run your app. You can set only one device at a time. To list the available Genymotion virtual devices, run `$ genyshell -c "devices list"`. You cannot use `--avd` and `--geny` simultaneously.

docs/man_pages/project/testing/emulate-ios.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ emulate ios
22
==========
33

44
Usage:
5-
`$ tns emulate ios [--path <Directory>] [--device <Device Name>] [--availableDevices] [--release] [--timeout]`
5+
`$ tns emulate ios [--print-app-output] [--path <Directory>] [--device <Device Name>] [--availableDevices] [--release] [--timeout]`
66

7-
Builds the specified project in the cloud and runs it in the native iOS Simulator.
7+
Builds the specified project and runs it in the native iOS Simulator.
88

99
`<Device Name>` is the name of the iOS Simulator device on which you want to run your app as listed by `$ tns emulate ios --availableDevices`
1010
Prerequisites:
@@ -13,6 +13,7 @@ Before running the iOS Simulator, verify that you have met the following require
1313
* You have installed Xcode. The version of Xcode must be compatible with the ios-sim-portable npm package on which the NativeScript CLI depends. For more information, visit https://www.npmjs.org/package/ios-sim-portable
1414

1515
Options:
16+
* `--print-app-output` - If set, prints the standard output of the running application.
1617
* `--availableDevices` - Lists all available device type identifiers for the current XCode.
1718
* `--release` - If set, produces a release build. Otherwise, produces a debug build.
1819
* `--path` - Specifies the directory that contains the project. If not specified, the project is searched for in the current directory and all directories above it.

docs/man_pages/project/testing/emulate.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@ emulate
22
==========
33

44
Usage:
5-
`$ tns emulate <Command> [--release]`
5+
`$ tns emulate <Command> [--print-app-output] [--release]`
66

77
You must run the emulate command with a related command.
88

99
Builds and runs the project in the native emulator for the selected target platform.
1010

1111
`<Command>` is a related command that sets a target platform for the emulate command. You can run the following related commands:
12-
* `android` - Builds the specified project in the cloud and runs it in the native Android emulator.
13-
* `ios` - Builds the specified project in the cloud and runs it in the native iOS Simulator.
12+
* `android` - Builds the specified project and runs it in the native Android emulator.
13+
* `ios` - Builds the specified project and runs it in the native iOS Simulator.
1414

1515
Options:
16+
* `--print-app-output` - If set, prints the output of the running application.
1617
* `--release` - If set, produces a release build. Otherwise, produces a debug build.
1718
<% if(isHtml) { %>
1819

docs/man_pages/project/testing/run-android.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ run android
22
==========
33

44
Usage:
5-
`$ tns run android [--device <Device ID>] [--keyStorePath <File Path> --keyStorePassword <Password> --keyStoreAlias <Name> --keyStoreAliasPassword <Password>] [--release]`
6-
`$ tns run android --emulator [<Emulator Options>] [--keyStorePath <File Path> --keyStorePassword <Password> --keyStoreAlias <Name> --keyStoreAliasPassword <Password>] [--release]`
5+
`$ tns run android [--print-app-output] [--device <Device ID>] [--keyStorePath <File Path> --keyStorePassword <Password> --keyStoreAlias <Name> --keyStoreAliasPassword <Password>] [--release]`
6+
`$ tns run android --emulator [<Emulator Options>] [--print-app-output] [--keyStorePath <File Path> --keyStorePassword <Password> --keyStoreAlias <Name> --keyStoreAliasPassword <Password>] [--release]`
77

88
Runs your project on a connected Android device or in a native Android emulator, if configured. This is shorthand for prepare, build and deploy.
99

@@ -23,6 +23,7 @@ Before running your app in the Android emulator from the Android SDK, verify tha
2323
* /Applications/Genymotion Shell.app/Contents/MacOS/
2424
<% } %>
2525
Options:
26+
* `--print-app-output` - If set, prints the system debug output (logcat).
2627
* `--device` - Specifies a connected device on which to run the app. You cannot use `--device` and `--emulator` simultaneously.
2728
* `--emulator` - If set, runs the app in a native emulator for the target platform, if configured. When set, you can also set any other valid combination of emulator options as listed by `$ tns help emulate android`. You cannot use `--device` and `--emulator` simultaneously.
2829
* `--release` - If set, produces a release build. Otherwise, produces a debug build. When the `--keyStore*` options are specified, produces a signed release build.

lib/config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ export class StaticConfig extends staticConfigBaseLibPath.StaticConfigBase imple
3636
break;
3737
case "win32":
3838
linkToSysRequirements = "http://docs.nativescript.org/setup/ns-cli-setup/ns-setup-win.html#system-requirements";
39+
break;
3940
case "darwin":
4041
linkToSysRequirements = "http://docs.nativescript.org/setup/ns-cli-setup/ns-setup-os-x.html#system-requirements";
42+
break;
4143
default:
4244
linkToSysRequirements = "";
4345
}

0 commit comments

Comments
 (0)