From 35b9835fd5e31d890f50dcdff3635a9e4137a069 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Tue, 14 Nov 2017 23:05:35 +0000 Subject: [PATCH] Exclude build files --- ElectronClient/.gitignore | 3 ++- ElectronClient/build.sh | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ElectronClient/.gitignore b/ElectronClient/.gitignore index dff8df06ca..4ebce96af4 100644 --- a/ElectronClient/.gitignore +++ b/ElectronClient/.gitignore @@ -1,4 +1,5 @@ build/ app/node_modules/ dist/ -app/lib/ \ No newline at end of file +app/lib/ +app/gui/*.min.js \ No newline at end of file diff --git a/ElectronClient/build.sh b/ElectronClient/build.sh index f3cd6b5eee..e8b98e524d 100644 --- a/ElectronClient/build.sh +++ b/ElectronClient/build.sh @@ -5,16 +5,19 @@ BUILD_DIR="$ROOT_DIR/app" rsync -a "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/" -for JSX_FILE in "$BUILD_DIR"/gui/*.jsx; do - JS_FILE="${JSX_FILE::-4}.min.js" - if [ $JSX_FILE -nt $JS_FILE ]; then - echo "Compile $JS_FILE..." - "$ROOT_DIR/app/node_modules/.bin/babel" --presets react "$JSX_FILE" > "$JS_FILE" - if [[ $? != 0 ]]; then - exit 1 - fi - fi -done +cd "$BUILD_DIR" +npm run compile + +# for JSX_FILE in "$BUILD_DIR"/gui/*.jsx; do +# JS_FILE="${JSX_FILE::-4}.min.js" +# if [ $JSX_FILE -nt $JS_FILE ]; then +# echo "Compile $JS_FILE..." +# "$ROOT_DIR/app/node_modules/.bin/babel" --presets react "$JSX_FILE" > "$JS_FILE" +# if [[ $? != 0 ]]; then +# exit 1 +# fi +# fi +# done # TRANSLATION_BUILD_SCRIPT="$ROOT_DIR/../CliClient/build/build-translation.js" # if [[ ! -f $TRANSLATION_BUILD_SCRIPT ]]; then