From c607b1bc8913ab84a3ae169d7cf950dc0d26404f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 10 May 2017 13:36:27 +0100 Subject: [PATCH] npm is "smart" enough to try and install our electron wrapper as a module instead of the actual electron package. With no way to ignore directories. I'd like to think of this as temporary, until I get to rip apart riot-web and riot-electron Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- {electron => electron_app}/build/icon.icns | Bin {electron => electron_app}/build/icon.ico | Bin {electron => electron_app}/build/icons/128x128.png | Bin {electron => electron_app}/build/icons/16x16.png | Bin {electron => electron_app}/build/icons/24x24.png | Bin {electron => electron_app}/build/icons/256x256.png | Bin {electron => electron_app}/build/icons/48x48.png | Bin {electron => electron_app}/build/icons/512x512.png | Bin {electron => electron_app}/build/icons/64x64.png | Bin {electron => electron_app}/build/icons/96x96.png | Bin .../build/install-spinner.gif | Bin {electron => electron_app}/img/riot.ico | Bin {electron => electron_app}/img/riot.png | Bin {electron => electron_app}/package.json | 0 {electron => electron_app}/riot.im/README | 0 {electron => electron_app}/riot.im/config.json | 0 {electron => electron_app}/src/electron-main.js | 0 {electron => electron_app}/src/squirrelhooks.js | 0 {electron => electron_app}/src/tray.js | 0 {electron => electron_app}/src/vectormenu.js | 0 package.json | 8 ++++---- release.sh | 4 ++-- scripts/electron-package.sh | 12 ++++++------ scripts/make-icons.sh | 10 +++++----- 24 files changed, 17 insertions(+), 17 deletions(-) rename {electron => electron_app}/build/icon.icns (100%) rename {electron => electron_app}/build/icon.ico (100%) rename {electron => electron_app}/build/icons/128x128.png (100%) rename {electron => electron_app}/build/icons/16x16.png (100%) rename {electron => electron_app}/build/icons/24x24.png (100%) rename {electron => electron_app}/build/icons/256x256.png (100%) rename {electron => electron_app}/build/icons/48x48.png (100%) rename {electron => electron_app}/build/icons/512x512.png (100%) rename {electron => electron_app}/build/icons/64x64.png (100%) rename {electron => electron_app}/build/icons/96x96.png (100%) rename {electron => electron_app}/build/install-spinner.gif (100%) rename {electron => electron_app}/img/riot.ico (100%) rename {electron => electron_app}/img/riot.png (100%) rename {electron => electron_app}/package.json (100%) rename {electron => electron_app}/riot.im/README (100%) rename {electron => electron_app}/riot.im/config.json (100%) rename {electron => electron_app}/src/electron-main.js (100%) rename {electron => electron_app}/src/squirrelhooks.js (100%) rename {electron => electron_app}/src/tray.js (100%) rename {electron => electron_app}/src/vectormenu.js (100%) diff --git a/electron/build/icon.icns b/electron_app/build/icon.icns similarity index 100% rename from electron/build/icon.icns rename to electron_app/build/icon.icns diff --git a/electron/build/icon.ico b/electron_app/build/icon.ico similarity index 100% rename from electron/build/icon.ico rename to electron_app/build/icon.ico diff --git a/electron/build/icons/128x128.png b/electron_app/build/icons/128x128.png similarity index 100% rename from electron/build/icons/128x128.png rename to electron_app/build/icons/128x128.png diff --git a/electron/build/icons/16x16.png b/electron_app/build/icons/16x16.png similarity index 100% rename from electron/build/icons/16x16.png rename to electron_app/build/icons/16x16.png diff --git a/electron/build/icons/24x24.png b/electron_app/build/icons/24x24.png similarity index 100% rename from electron/build/icons/24x24.png rename to electron_app/build/icons/24x24.png diff --git a/electron/build/icons/256x256.png b/electron_app/build/icons/256x256.png similarity index 100% rename from electron/build/icons/256x256.png rename to electron_app/build/icons/256x256.png diff --git a/electron/build/icons/48x48.png b/electron_app/build/icons/48x48.png similarity index 100% rename from electron/build/icons/48x48.png rename to electron_app/build/icons/48x48.png diff --git a/electron/build/icons/512x512.png b/electron_app/build/icons/512x512.png similarity index 100% rename from electron/build/icons/512x512.png rename to electron_app/build/icons/512x512.png diff --git a/electron/build/icons/64x64.png b/electron_app/build/icons/64x64.png similarity index 100% rename from electron/build/icons/64x64.png rename to electron_app/build/icons/64x64.png diff --git a/electron/build/icons/96x96.png b/electron_app/build/icons/96x96.png similarity index 100% rename from electron/build/icons/96x96.png rename to electron_app/build/icons/96x96.png diff --git a/electron/build/install-spinner.gif b/electron_app/build/install-spinner.gif similarity index 100% rename from electron/build/install-spinner.gif rename to electron_app/build/install-spinner.gif diff --git a/electron/img/riot.ico b/electron_app/img/riot.ico similarity index 100% rename from electron/img/riot.ico rename to electron_app/img/riot.ico diff --git a/electron/img/riot.png b/electron_app/img/riot.png similarity index 100% rename from electron/img/riot.png rename to electron_app/img/riot.png diff --git a/electron/package.json b/electron_app/package.json similarity index 100% rename from electron/package.json rename to electron_app/package.json diff --git a/electron/riot.im/README b/electron_app/riot.im/README similarity index 100% rename from electron/riot.im/README rename to electron_app/riot.im/README diff --git a/electron/riot.im/config.json b/electron_app/riot.im/config.json similarity index 100% rename from electron/riot.im/config.json rename to electron_app/riot.im/config.json diff --git a/electron/src/electron-main.js b/electron_app/src/electron-main.js similarity index 100% rename from electron/src/electron-main.js rename to electron_app/src/electron-main.js diff --git a/electron/src/squirrelhooks.js b/electron_app/src/squirrelhooks.js similarity index 100% rename from electron/src/squirrelhooks.js rename to electron_app/src/squirrelhooks.js diff --git a/electron/src/tray.js b/electron_app/src/tray.js similarity index 100% rename from electron/src/tray.js rename to electron_app/src/tray.js diff --git a/electron/src/vectormenu.js b/electron_app/src/vectormenu.js similarity index 100% rename from electron/src/vectormenu.js rename to electron_app/src/vectormenu.js diff --git a/package.json b/package.json index b8a4accc820..884811af93c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "main": "electron/src/electron-main.js", + "main": "electron_app/src/electron-main.js", "version": "0.9.9", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", @@ -165,9 +165,9 @@ "target": "squirrel" }, "directories": { - "buildResources": "electron/build", - "output": "electron/dist", - "app": "electron" + "buildResources": "electron_app/build", + "output": "electron_app/dist", + "app": "electron_app" } } } diff --git a/release.sh b/release.sh index 9d02e98e938..c245456051b 100755 --- a/release.sh +++ b/release.sh @@ -2,7 +2,7 @@ # # Script to perform a release of vector-web. # -# Requires github-changelog-generator; to install, do +# Requires github-changelog-generator; to install, do # pip install git+https://github.com/matrix-org/github-changelog-generator.git set -e @@ -15,7 +15,7 @@ release="${1#v}" tag="v${release}" echo "electron npm version" -cd electron +cd electron_app npm version --no-git-tag-version "$release" git commit package.json -m "$tag" diff --git a/scripts/electron-package.sh b/scripts/electron-package.sh index 87e353f7462..a5718df8324 100755 --- a/scripts/electron-package.sh +++ b/scripts/electron-package.sh @@ -90,8 +90,8 @@ npm run build:electron popd -distdir="$builddir/electron/dist" -pubdir="$projdir/electron/pub" +distdir="$builddir/electron_app/dist" +pubdir="$projdir/electron_app/pub" rm -r "$pubdir" || true mkdir -p "$pubdir" @@ -120,11 +120,11 @@ cp $distdir/win/*.nupkg "$pubdir/update/win32/x64/" cp $distdir/win/RELEASES "$pubdir/update/win32/x64/" # Move the debs to the main project dir's dist folder -rm -r "$projdir/electron/dist" || true -mkdir -p "$projdir/electron/dist" -cp $distdir/*.deb "$projdir/electron/dist/" +rm -r "$projdir/electron_app/dist" || true +mkdir -p "$projdir/electron_app/dist" +cp $distdir/*.deb "$projdir/electron_app/dist/" rm -rf "$builddir" echo "Riot Desktop is ready to go in $pubdir: this directory can be hosted on your web server." -echo "deb archives are in electron/dist/ - these should be added into your debian repository" +echo "deb archives are in electron_app/dist/ - these should be added into your debian repository" diff --git a/scripts/make-icons.sh b/scripts/make-icons.sh index ebb15852c1a..19e48895df4 100755 --- a/scripts/make-icons.sh +++ b/scripts/make-icons.sh @@ -52,7 +52,7 @@ cp "$tmpdir/256.png" "$tmpdir/Riot.iconset/icon_256x256.png" cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_256x256@2x.png" cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_512x512.png" cp "$tmpdir/1024.png" "$tmpdir/Riot.iconset/icon_512x512@2x.png" -iconutil -c icns -o electron/build/icon.icns "$tmpdir/Riot.iconset" +iconutil -c icns -o electron_app/build/icon.icns "$tmpdir/Riot.iconset" cp "$tmpdir/36.png" "res/vector-icons/android-chrome-36x36.png" cp "$tmpdir/48.png" "res/vector-icons/android-chrome-48x48.png" @@ -79,17 +79,17 @@ cp "$tmpdir/144.png" "res/vector-icons/mstile-144x144.png" cp "$tmpdir/150.png" "res/vector-icons/mstile-150x150.png" cp "$tmpdir/310.png" "res/vector-icons/mstile-310x310.png" cp "$tmpdir/310x150.png" "res/vector-icons/mstile-310x150.png" -cp "$tmpdir/180.png" "electron/img/riot.png" +cp "$tmpdir/180.png" "electron_app/img/riot.png" convert "$tmpdir/16.png" "$tmpdir/32.png" "$tmpdir/64.png" "$tmpdir/128.png" "$tmpdir/256.png" "res/vector-icons/favicon.ico" -cp "res/vector-icons/favicon.ico" "electron/build/icon.ico" -cp "res/vector-icons/favicon.ico" "electron/img/riot.ico" +cp "res/vector-icons/favicon.ico" "electron_app/build/icon.ico" +cp "res/vector-icons/favicon.ico" "electron_app/img/riot.ico" # https://github.com/electron-userland/electron-builder/blob/3f97b86993d4ea5172e562b182230a194de0f621/src/targets/LinuxTargetHelper.ts#L127 for i in 24 96 16 48 64 128 256 512 do - cp "$tmpdir/$i.png" "electron/build/icons/${i}x${i}.png" + cp "$tmpdir/$i.png" "electron_app/build/icons/${i}x${i}.png" done rm -r "$tmpdir"