self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-04-11 11:12:03 +02:00
Code Issues Releases Activity

Removed need for build dir for Electron app

Browse Source
This commit is contained in:
Laurent Cozic 2017-11-04 12:32:26 +00:00
parent 6e4effdecf
commit ddf9f442e5
5 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CliClient/app/build-translation.js
View File

@ -141,7 +141,7 @@ async function main() {
const rnJsonLocaleDir = rnDir + '/locales';
await execCommand('rsync -a "' + jsonLocalesDir + '/" "' + rnJsonLocaleDir + '"');
const electronJsonLocaleDir = rootDir + '/ElectronClient/build/locales';
const electronJsonLocaleDir = rootDir + '/ElectronClient/app/locales';
await execCommand('rsync -a "' + jsonLocalesDir + '/" "' + electronJsonLocaleDir + '"');
}

4
ElectronClient/.gitignore vendored
View File

@ -1,2 +1,4 @@
node_modules/
build/
app/locales/
app/node_modules/
app/lib/

20
ElectronClient/build.sh
View File

@ -1,9 +1,8 @@
#!/bin/bash
ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
BUILD_DIR="$ROOT_DIR/build"
BUILD_DIR="$ROOT_DIR/app"
rsync -a app/ $BUILD_DIR/
rsync -a "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/"
TRANSLATION_BUILD_SCRIPT="$ROOT_DIR/../CliClient/build/build-translation.js"
@ -12,4 +11,19 @@ if [[ ! -f $TRANSLATION_BUILD_SCRIPT ]]; then
exit 1
fi
node "$TRANSLATION_BUILD_SCRIPT" --silent
node "$TRANSLATION_BUILD_SCRIPT" --silent
# ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# BUILD_DIR="$ROOT_DIR/build"
# rsync -a app/ $BUILD_DIR/
# rsync -a "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/"
# TRANSLATION_BUILD_SCRIPT="$ROOT_DIR/../CliClient/build/build-translation.js"
# if [[ ! -f $TRANSLATION_BUILD_SCRIPT ]]; then
# echo "Build the CLI app first ($TRANSLATION_BUILD_SCRIPT missing)"
# exit 1
# fi
# node "$TRANSLATION_BUILD_SCRIPT" --silent

2
ElectronClient/run.sh
View File

@ -2,5 +2,5 @@
ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd "$ROOT_DIR"
./build.sh
cd "$ROOT_DIR/build"
cd "$ROOT_DIR/app"
node_modules/.bin/electron .

2
joplin.sublime-project
View File

@ -30,6 +30,8 @@
"CliClient/tests/src",
"CliClient/tests/sync",
"ElectronClient/build",
"ElectronClient/app/lib",
"ElectronClient/app/locale",
"node_modules",
"ReactNativeClient/android/.gradle",
"ReactNativeClient/android/.idea",