Merge branch 'feature/electron-builder' into dev

for #105

circle.yml

@@ -30,6 +30,7 @@ dependencies:
     - tar zcvf $CIRCLE_ARTIFACTS/mattermost-desktop-osx.tar.gz -C release mattermost-desktop-osx
     - tar zcvf $CIRCLE_ARTIFACTS/mattermost-desktop-linux-ia32.tar.gz -C release mattermost-desktop-linux-ia32
     - tar zcvf $CIRCLE_ARTIFACTS/mattermost-desktop-linux-x64.tar.gz -C release mattermost-desktop-linux-x64
+    - mv release/*.deb $CIRCLE_ARTIFACTS/
 
 test:
   override:

circle/make_draft.sh

@@ -52,3 +52,5 @@ deploy win64 zip
 deploy osx tar.gz
 deploy linux-ia32 tar.gz
 deploy linux-x64 tar.gz
+upload mattermost-desktop-$RELEASE_TAG-i386 release/mattermost-desktop-$RELEASE_TAG-i386.deb
+upload mattermost-desktop-$RELEASE_TAG-amd64 release/mattermost-desktop-$RELEASE_TAG-amd64.deb

docker/Dockerfile

@@ -7,6 +7,9 @@ ENV PATH=$HOME/.nodebrew/current/bin:$PATH
 USER root
 RUN apt-get update && apt-get -y install wget bzip2 zip
 
+# electron-builder
+RUN apt-get update && apt-get -y install ruby ruby-dev gcc make icnsutils graphicsmagick xz-utils && gem install fpm
+
 USER xclient
 # install Node.js
 RUN curl -L git.io/nodebrew | perl - setup && nodebrew install-binary $NODE_VERSION && nodebrew use $NODE_VERSION

docker/package_in_docker.sh

@@ -3,3 +3,4 @@
 set -ex
 cd electron-mattermost
 npm run package:all
+npm run package:linux

gulpfile.js

@@ -190,7 +190,7 @@ function makePackage(platform, arch, callback) {
     prune: true,
     overwrite: true,
     "app-version": packageJson.version,
-    icon: 'resources/appicon',
+    icon: 'resources/icon',
     "version-string": {
       CompanyName: packageJson.author,
       LegalCopyright: 'Copyright (c) 2015 ' + packageJson.author,

package.json

@@ -4,7 +4,7 @@
   "version": "1.1.1",
   "description": "Mattermost Desktop application for Windows, Mac and Linux",
   "main": "main.js",
-  "author": "Yuya Ochiai",
+  "author": "Yuya Ochiai <yuya0321@gmail.com>",
   "license": "MIT",
   "engines": {
     "node": ">=4.2.0"
@@ -20,7 +20,7 @@
     "package": "gulp package",
     "package:windows": "gulp package:windows",
     "package:osx": "gulp package:osx",
-    "package:linux": "gulp package:linux",
+    "package:linux": "gulp build && build --platform linux --arch all -d deb",
     "package:all": "gulp package:all",
     "prettify": "gulp prettify"
   },
@@ -30,6 +30,7 @@
     "babel-preset-react": "^6.5.0",
     "chromedriver": "^2.20.0",
     "del": "^2.2.0",
+    "electron-builder": "^3.11.0",
     "electron-connect": "^0.3.7",
     "electron-packager": "^5.1.0",
     "electron-prebuilt": "0.37.3",
@@ -50,5 +51,15 @@
     "webdriverio": "^3.3.0",
     "webpack": "^1.12.15",
     "webpack-stream": "^3.1.0"
+  },
+  "build": {
+    "linux": {
+      "synopsis": "Mattermost Desktop"
+    }
+  },
+  "directories":{
+    "buildResources": "resources",
+    "app": "dist",
+    "output": "release"
   }
 }

src/package.json

@@ -4,7 +4,7 @@
   "version": "1.1.1",
   "description": "Mattermost Desktop application for Windows, Mac and Linux",
   "main": "main.js",
-  "author": "Yuya Ochiai",
+  "author": "Yuya Ochiai <yuya0321@gmail.com>",
   "license": "MIT",
   "devDependencies": {
     "electron-connect": "^0.3.3"