From ba988aecd33c754372b41d525a5fe039f0feb226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sat, 2 Apr 2016 10:39:40 +0200 Subject: [PATCH 1/4] Add Electron Linux target --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 317078a..18a7036 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "protractor": "protractor test/protractor-conf.js", "build-electron-windows": "electron-packager . \"Glowing Bear\" --platform=win32 --arch=ia32 --version=0.37.2 --overwrite --icon=assets/img/favicon.ico --asar=true --version-string.FileDescription=\"Glowing Bear\" --ignore=node_modules --ignore=test", "build-electron-darwin": "electron-packager . \"Glowing Bear\" --platform=darwin --arch=x64 --version=0.37.3 --overwrite --icon=assets/img/glowing-bear.icns --version-string.FileDescription=\"Glowing Bear\" --ignore=node_modules --ignore=test", + "build-electron-linux": "electron-packager . \"Glowing Bear\" --platform=linux --arch=x64 --version=0.37.3 --overwrite --icon=assets/img/favicon.ico --version-string.FileDescription=\"Glowing Bear\" --ignore=node_modules --ignore=test", "update-index-async": "node -e \"require('shelljs/global'); sed('-i', /\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/, '//@@NG_LOADER_START@@\\n' + cat('app/bower_components/angular-loader/angular-loader.min.js') + '\\n//@@NG_LOADER_END@@', 'app/index-async.html');\"" } } From 4fb04dae09a8c2dd4cb49eaf17d0cd3b49abfe14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sat, 2 Apr 2016 10:37:29 +0200 Subject: [PATCH 2/4] Add npm script to use local files (for electron or cordova) This copies useless files as well, I'm not sure what's the best way to deal with that. --- bower.json | 4 +++- package.json | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 72a4e1c..4b4cf5b 100644 --- a/bower.json +++ b/bower.json @@ -12,6 +12,8 @@ "angular-touch": "1.4.x", "angular-loader": "1.4.x", "angular-mocks": "1.4.x", - "html5-boilerplate": "~4.3.0" + "html5-boilerplate": "~4.3.0", + "underscore": "~1.7", + "bootstrap": "~3.1" } } diff --git a/package.json b/package.json index 18a7036..b75478d 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "update-webdriver": "webdriver-manager update", "preprotractor": "npm run update-webdriver", "protractor": "protractor test/protractor-conf.js", + "use-local-files": "find bower_components \\( -name \"*min.js\" -o -name \"*min.css\" \\) -exec cp {} 3rdparty \\; ; cp -r bower_components/bootstrap/fonts . ; sed -i 's,https://cdnjs.cloudflare.com/ajax/libs/[^\"]*/,3rdparty/,g' index.html ; sed -i 's, integrity=\".*\" crossorigin=\"anonymous\",,' index.html", "build-electron-windows": "electron-packager . \"Glowing Bear\" --platform=win32 --arch=ia32 --version=0.37.2 --overwrite --icon=assets/img/favicon.ico --asar=true --version-string.FileDescription=\"Glowing Bear\" --ignore=node_modules --ignore=test", "build-electron-darwin": "electron-packager . \"Glowing Bear\" --platform=darwin --arch=x64 --version=0.37.3 --overwrite --icon=assets/img/glowing-bear.icns --version-string.FileDescription=\"Glowing Bear\" --ignore=node_modules --ignore=test", "build-electron-linux": "electron-packager . \"Glowing Bear\" --platform=linux --arch=x64 --version=0.37.3 --overwrite --icon=assets/img/favicon.ico --version-string.FileDescription=\"Glowing Bear\" --ignore=node_modules --ignore=test", From 2112757a2d2472b1ae09310a289cc526747f586f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sat, 2 Apr 2016 18:07:12 +0200 Subject: [PATCH 3/4] Fix emojione in electron --- bower.json | 3 ++- electron-globals.js | 3 +++ js/glowingbear.js | 6 ++++++ package.json | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 4b4cf5b..be44d88 100644 --- a/bower.json +++ b/bower.json @@ -14,6 +14,7 @@ "angular-mocks": "1.4.x", "html5-boilerplate": "~4.3.0", "underscore": "~1.7", - "bootstrap": "~3.1" + "bootstrap": "~3.1", + "emojione": "~2.1" } } diff --git a/electron-globals.js b/electron-globals.js index 9259511..2c910ca 100644 --- a/electron-globals.js +++ b/electron-globals.js @@ -7,3 +7,6 @@ var setElectronBadge = function(value) { }; global.setElectronBadge = setElectronBadge; + +// Let Glowing Bear know it's running as an electron app +window.is_electron = 1; diff --git a/js/glowingbear.js b/js/glowingbear.js index 54e1f04..e609079 100644 --- a/js/glowingbear.js +++ b/js/glowingbear.js @@ -104,6 +104,12 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', } })(); + if (window.is_electron) { + // Use packaged emojione sprite in the electron app + emojione.imageType = 'svg'; + emojione.sprites = true; + emojione.imagePathSVGSprites = './3rdparty/emojione.sprites.svg'; + } $rootScope.isWindowFocused = function() { if (typeof $scope.documentHidden === "undefined") { diff --git a/package.json b/package.json index b75478d..fe2fbc0 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "update-webdriver": "webdriver-manager update", "preprotractor": "npm run update-webdriver", "protractor": "protractor test/protractor-conf.js", - "use-local-files": "find bower_components \\( -name \"*min.js\" -o -name \"*min.css\" \\) -exec cp {} 3rdparty \\; ; cp -r bower_components/bootstrap/fonts . ; sed -i 's,https://cdnjs.cloudflare.com/ajax/libs/[^\"]*/,3rdparty/,g' index.html ; sed -i 's, integrity=\".*\" crossorigin=\"anonymous\",,' index.html", + "use-local-files": "find bower_components \\( -name \"*min.js\" -o -name \"*min.css\" \\) -exec cp {} 3rdparty \\; ; cp -r bower_components/bootstrap/fonts . ; p bower_components/emojione/assets/sprites/emojione.sprites.svg 3rdparty; sed -i 's,https://cdnjs.cloudflare.com/ajax/libs/[^\"]*/,3rdparty/,g' index.html ; sed -i 's, integrity=\".*\" crossorigin=\"anonymous\",,' index.html", "build-electron-windows": "electron-packager . \"Glowing Bear\" --platform=win32 --arch=ia32 --version=0.37.2 --overwrite --icon=assets/img/favicon.ico --asar=true --version-string.FileDescription=\"Glowing Bear\" --ignore=node_modules --ignore=test", "build-electron-darwin": "electron-packager . \"Glowing Bear\" --platform=darwin --arch=x64 --version=0.37.3 --overwrite --icon=assets/img/glowing-bear.icns --version-string.FileDescription=\"Glowing Bear\" --ignore=node_modules --ignore=test", "build-electron-linux": "electron-packager . \"Glowing Bear\" --platform=linux --arch=x64 --version=0.37.3 --overwrite --icon=assets/img/favicon.ico --version-string.FileDescription=\"Glowing Bear\" --ignore=node_modules --ignore=test", From f4245f1296e7e21ebc53d6ac54d8c93b09403367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sat, 2 Apr 2016 18:08:55 +0200 Subject: [PATCH 4/4] Electron: Use a Makefile --- .gitignore | 4 ++++ electron.makefile | 27 +++++++++++++++++++++++++++ package.json | 7 +++---- 3 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 electron.makefile diff --git a/.gitignore b/.gitignore index c346b13..a2291bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ bower_components/ node_modules/ + +# Electron stuff +fonts/ +Glowing\ Bear-*/ diff --git a/electron.makefile b/electron.makefile new file mode 100644 index 0000000..7f75daf --- /dev/null +++ b/electron.makefile @@ -0,0 +1,27 @@ +# Common flags for electron-packager on all platforms +ELECTRON_COMMON=. "Glowing Bear" --overwrite --version-string.FileDescription="Glowing Bear" --ignore=node_modules --ignore=test --ignore=bower_components + +# fetch dependencies for local installation +bower: + bower install + +# copy dependencies from bower_components to the correct place +copylocal: + find bower_components \( -name "*min.js" -o -name "*min.css" \) -exec cp {} 3rdparty \; + cp -r bower_components/bootstrap/fonts . + cp bower_components/emojione/assets/sprites/emojione.sprites.svg 3rdparty + +# modify index.html to use local files +uselocal: copylocal + sed -i 's,https://cdnjs.cloudflare.com/ajax/libs/[^\"]*/,3rdparty/,g' index.html + sed -i 's, integrity=\".*\" crossorigin=\"anonymous\",,' index.html + +# build the electron app for various platforms +build-electron-windows: uselocal + electron-packager ${ELECTRON_COMMON} --platform=win32 --arch=ia32 --version=0.37.2 --icon=assets/img/favicon.ico --asar=true + +build-electron-darwin: uselocal + electron-packager ${ELECTRON_COMMON} --platform=darwin --arch=x64 --version=0.37.3 --icon=assets/img/glowing-bear.icns + +build-electron-linux: uselocal + electron-packager ${ELECTRON_COMMON} --platform=linux --arch=x64 --version=0.37.3 --icon=assets/img/favicon.ico diff --git a/package.json b/package.json index fe2fbc0..dbc35e4 100644 --- a/package.json +++ b/package.json @@ -32,10 +32,9 @@ "update-webdriver": "webdriver-manager update", "preprotractor": "npm run update-webdriver", "protractor": "protractor test/protractor-conf.js", - "use-local-files": "find bower_components \\( -name \"*min.js\" -o -name \"*min.css\" \\) -exec cp {} 3rdparty \\; ; cp -r bower_components/bootstrap/fonts . ; p bower_components/emojione/assets/sprites/emojione.sprites.svg 3rdparty; sed -i 's,https://cdnjs.cloudflare.com/ajax/libs/[^\"]*/,3rdparty/,g' index.html ; sed -i 's, integrity=\".*\" crossorigin=\"anonymous\",,' index.html", - "build-electron-windows": "electron-packager . \"Glowing Bear\" --platform=win32 --arch=ia32 --version=0.37.2 --overwrite --icon=assets/img/favicon.ico --asar=true --version-string.FileDescription=\"Glowing Bear\" --ignore=node_modules --ignore=test", - "build-electron-darwin": "electron-packager . \"Glowing Bear\" --platform=darwin --arch=x64 --version=0.37.3 --overwrite --icon=assets/img/glowing-bear.icns --version-string.FileDescription=\"Glowing Bear\" --ignore=node_modules --ignore=test", - "build-electron-linux": "electron-packager . \"Glowing Bear\" --platform=linux --arch=x64 --version=0.37.3 --overwrite --icon=assets/img/favicon.ico --version-string.FileDescription=\"Glowing Bear\" --ignore=node_modules --ignore=test", + "build-electron-windows": "make -f electron.makefile build-electron-windows", + "build-electron-darwin": "make -f electron.makefile build-electron-darwin", + "build-electron-linux": "make -f electron.makefile build-electron-linux", "update-index-async": "node -e \"require('shelljs/global'); sed('-i', /\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/, '//@@NG_LOADER_START@@\\n' + cat('app/bower_components/angular-loader/angular-loader.min.js') + '\\n//@@NG_LOADER_END@@', 'app/index-async.html');\"" } }