Browse Source

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>
pull/3877/head
Michael Telatynski 5 years ago
parent
commit
c607b1bc89
  1. 0
      electron_app/build/icon.icns
  2. 0
      electron_app/build/icon.ico
  3. 0
      electron_app/build/icons/128x128.png
  4. 0
      electron_app/build/icons/16x16.png
  5. 0
      electron_app/build/icons/24x24.png
  6. 0
      electron_app/build/icons/256x256.png
  7. 0
      electron_app/build/icons/48x48.png
  8. 0
      electron_app/build/icons/512x512.png
  9. 0
      electron_app/build/icons/64x64.png
  10. 0
      electron_app/build/icons/96x96.png
  11. 0
      electron_app/build/install-spinner.gif
  12. 0
      electron_app/img/riot.ico
  13. 0
      electron_app/img/riot.png
  14. 0
      electron_app/package.json
  15. 0
      electron_app/riot.im/README
  16. 0
      electron_app/riot.im/config.json
  17. 0
      electron_app/src/electron-main.js
  18. 0
      electron_app/src/squirrelhooks.js
  19. 0
      electron_app/src/tray.js
  20. 0
      electron_app/src/vectormenu.js
  21. 8
      package.json
  22. 4
      release.sh
  23. 12
      scripts/electron-package.sh
  24. 10
      scripts/make-icons.sh

0
electron/build/icon.icns → electron_app/build/icon.icns

0
electron/build/icon.ico → electron_app/build/icon.ico

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 102 KiB

0
electron/build/icons/128x128.png → electron_app/build/icons/128x128.png

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

0
electron/build/icons/16x16.png → electron_app/build/icons/16x16.png

Before

Width:  |  Height:  |  Size: 673 B

After

Width:  |  Height:  |  Size: 673 B

0
electron/build/icons/24x24.png → electron_app/build/icons/24x24.png

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
electron/build/icons/256x256.png → electron_app/build/icons/256x256.png

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
electron/build/icons/48x48.png → electron_app/build/icons/48x48.png

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

0
electron/build/icons/512x512.png → electron_app/build/icons/512x512.png

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

0
electron/build/icons/64x64.png → electron_app/build/icons/64x64.png

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
electron/build/icons/96x96.png → electron_app/build/icons/96x96.png

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

0
electron/build/install-spinner.gif → electron_app/build/install-spinner.gif

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

0
electron/img/riot.ico → electron_app/img/riot.ico

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 102 KiB

0
electron/img/riot.png → electron_app/img/riot.png

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
electron/package.json → electron_app/package.json

0
electron/riot.im/README → electron_app/riot.im/README

0
electron/riot.im/config.json → electron_app/riot.im/config.json

0
electron/src/electron-main.js → electron_app/src/electron-main.js

0
electron/src/squirrelhooks.js → electron_app/src/squirrelhooks.js

0
electron/src/tray.js → electron_app/src/tray.js

0
electron/src/vectormenu.js → electron_app/src/vectormenu.js

8
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"
}
}
}

4
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"

12
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"

10
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"

Loading…
Cancel
Save