From 2812480af9ff6ca399c3507ad10bf98131146536 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Fri, 2 Mar 2018 14:15:53 +0300 Subject: [PATCH] Documentation fixes. (#1377) --- CHANGELOG.md | 2 +- README.md | 1 + samples/androidNativeActivity/README.md | 3 ++- samples/csvparser/README.md | 2 +- samples/gitchurn/README.md | 2 +- samples/gtk/README.md | 2 +- samples/libcurl/README.md | 2 +- samples/nonBlockingEchoServer/README.md | 2 +- samples/opengl/README.md | 2 +- samples/socket/README.md | 2 +- 10 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83b0de52e33..b6fae4b2968 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## v0.6.1 (Mar 2018) * Various bugfixes * Support total ordering in FP comparisons - * Interop generate string constants from string macrodefinitions + * Interop generates string constants from string macrodefinitions * STM32 blinky demo in pure Kotlin/Native * Top level variables initialization redesign (proper dependency order) * Support kotlin.math on WebAssembly targets diff --git a/README.md b/README.md index 7b594cfd938..d6dfe8bb086 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ without the need to ship an additional execution runtime. Prerequisites: * install JDK for your platform, instead of JRE. The build requires ```tools.jar```, which is not included in JRE; * on macOS install Xcode 9.2 +* on Fedora 26+ ```yum install ncurses-compat-libs``` may be needed To compile from sources use following steps: diff --git a/samples/androidNativeActivity/README.md b/samples/androidNativeActivity/README.md index 6c8b448d1f4..5f6aabcd47c 100644 --- a/samples/androidNativeActivity/README.md +++ b/samples/androidNativeActivity/README.md @@ -8,5 +8,6 @@ See https://developer.android.com/studio/index.html for more details on Android To build use `ANDROID_HOME= ../gradlew buildApk`. -Run `$ANDROID_HOME/sdk/platform-tools/adb install -r build/outputs/apk/androidNativeActivity-arm-debug.apk` +Run `$ANDROID_HOME/platform-tools/adb install -r build/outputs/apk/debug/androidNativeActivity-debug.apk` to deploy the apk on the Android device or emulator (note that only ARM-based devices are currently supported). + diff --git a/samples/csvparser/README.md b/samples/csvparser/README.md index 2bce84cbff5..78a87932afc 100644 --- a/samples/csvparser/README.md +++ b/samples/csvparser/README.md @@ -13,7 +13,7 @@ or pass `-PrunArgs="./European_Mammals_Red_List_Nov_2009.csv 4 100"` to gradle r Alternatively you can run artifact directly - ./build/konan/bin/CsvParser/CsvParser.kexe ./European_Mammals_Red_List_Nov_2009.csv 4 100 + ./build/konan/bin//CsvParser.kexe ./European_Mammals_Red_List_Nov_2009.csv 4 100 It will print number of all unique entries in fifth column (Family, zero-based index) in first 100 rows of the CSV file. diff --git a/samples/gitchurn/README.md b/samples/gitchurn/README.md index c0eff08ecbf..684d4c9e18d 100644 --- a/samples/gitchurn/README.md +++ b/samples/gitchurn/README.md @@ -12,6 +12,6 @@ or pass `-PrunArgs="../../"` to gradle run. Alternatively you can run artifact directly - ./build/konan/bin/GitChurn/GitChurn.kexe ../../ + ./build/konan/bin//GitChurn.kexe ../../ It will print most frequently modified (by number of commits) files in repository. diff --git a/samples/gtk/README.md b/samples/gtk/README.md index 04314deddcc..ea54adfcb74 100644 --- a/samples/gtk/README.md +++ b/samples/gtk/README.md @@ -14,7 +14,7 @@ To run on Mac also install XQuartz X server (https://www.xquartz.org/), and then Alternatively you can run artifact directly - ./build/konan/bin/Gtk3Demo/Gtk3Demo.kexe + ./build/konan/bin//Gtk3Demo.kexe Dialog box with the button will be shown, and application will print message and terminate on button click. diff --git a/samples/libcurl/README.md b/samples/libcurl/README.md index ea858ff025e..32f9e31b8d7 100644 --- a/samples/libcurl/README.md +++ b/samples/libcurl/README.md @@ -12,6 +12,6 @@ or pass `-PrunArgs="https://www.jetbrains.com"` to gradle run. Alternatively you can run artifact directly - ./build/konan/bin/Curl/Curl.kexe https://www.jetbrains.com + ./build/konan/bin//Curl.kexe https://www.jetbrains.com It will perform HTTP get and print out the data obtained. diff --git a/samples/nonBlockingEchoServer/README.md b/samples/nonBlockingEchoServer/README.md index 7cb5a9ee409..8d87106841f 100644 --- a/samples/nonBlockingEchoServer/README.md +++ b/samples/nonBlockingEchoServer/README.md @@ -18,7 +18,7 @@ or pass `-PrunArgs="3000"` to gradle run. Alternatively you can run artifact directly - ./build/konan/bin/EchoServer/EchoServer.kexe 3000 & + ./build/konan/bin//EchoServer.kexe 3000 & Test the server by connecting to it, for example with telnet: diff --git a/samples/opengl/README.md b/samples/opengl/README.md index 11d843308ce..a51b473c866 100644 --- a/samples/opengl/README.md +++ b/samples/opengl/README.md @@ -9,7 +9,7 @@ To run use `../gradlew run` Alternatively you can run artifact directly - ./build/konan/bin/OpenGlTeapot${target}/OpenGlTeapot${target}.kexe + ./build/konan/bin//OpenGlTeapot.kexe It will render 3D model of teapot. Feel free to experiment with it, the whole power of OpenGL is at your hands. diff --git a/samples/socket/README.md b/samples/socket/README.md index ae7661a4be9..12a72f1ffe0 100644 --- a/samples/socket/README.md +++ b/samples/socket/README.md @@ -11,7 +11,7 @@ or pass `-PrunArgs="3000"` to gradle run. Alternatively you can run artifact directly - ./build/konan/bin/EchoServer/EchoServer.kexe 3000 & + ./build/konan/bin//EchoServer.kexe 3000 & Test the server by conecting to it, for example with telnet: