From a59bf55c1600276ba72146db5db44f80a95b93de Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Sun, 10 Dec 2017 16:06:43 +0000 Subject: [PATCH] Electron: Fixes #3: Paths with '.' would cause JSX compilation to fail --- BUILD.md | 17 +++++++++++------ ElectronClient/app/compile-jsx.js | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/BUILD.md b/BUILD.md index 0cf232fedd..d3cf2dfd13 100644 --- a/BUILD.md +++ b/BUILD.md @@ -34,12 +34,17 @@ From `/ElectronClient` you can also run `run.sh` to run the app for testing. # Building the Mobile application -From `/ReactNativeClient`, run `npm install`, then `react-native run-ios` or `react-native run-android`. +First you need to to setup React Native to build projects with native code. For this, follow the instructions on the [Get Started](https://facebook.github.io/react-native/docs/getting-started.html) tutorial, in the "Building Projects with Native Code" tab. + +Then, from `/ReactNativeClient`, run `npm install`, then `react-native run-ios` or `react-native run-android`. # Building the Terminal application -From `/CliClient`: -- Run `npm install` -- Then `build.sh` -- Copy the translations to the build directory: `rsync -aP ../ReactNativeClient/locales/ build/locales/` -- Run `run.sh` to start the application for testing. +``` +cd CliClient +npm install +./build.sh +rsync -aP ../ReactNativeClient/locales/ build/locales/ +``` + +Run `run.sh` to start the application for testing. \ No newline at end of file diff --git a/ElectronClient/app/compile-jsx.js b/ElectronClient/app/compile-jsx.js index c84e490b0c..4663c74549 100644 --- a/ElectronClient/app/compile-jsx.js +++ b/ElectronClient/app/compile-jsx.js @@ -21,7 +21,7 @@ fs.readdirSync(guiPath).forEach((filename) => { if (ext !== 'jsx') return; p.pop(); - const basePath = p.join('/'); + const basePath = p.join('.'); const jsPath = basePath + '.min.js';