Merge pull request #66 from fermiumlabs/winbuild

Build for windows

.gitignore

@@ -18,3 +18,5 @@ __pycache__
 *.swp
 *.map
 .idea/
+
+*.log

.travis.yml

@@ -23,4 +23,5 @@ before_install:
 #  - yarn install
 
 script:
-  - yarn dockerdist
+  - yarn dockerdist:linux
+  - yarn dockerdist:win

README.md

@@ -13,4 +13,5 @@ A native app for [JupyterLab](https://github.com/jupyterlab/jupyterlab), based o
 
 ### Building for distribution
 
-To test building for distribution install [Docker](https://docs.docker.com/engine/installation/) and run `yarn dockerdist` or `npm run dockerdist`
+To test building for distribution install [Docker](https://docs.docker.com/engine/installation/) and run `yarn dockerdist:platform` or `npm run dockerdist:platform` where "platform"
+ is either "linux", "win" or "mac".

package.json

@@ -13,10 +13,14 @@
     "build:all": "npm run build && npm start",
     "pack": "npm run build && electron-builder --dir",
     "dist": "npm run build && electron-builder",
-    "dist:linux": "npm run build && electron-builder",
-    "dist:mac": "npm run build && electron-builder",
-    "dist:win": "npm run build && electron-builder",
-    "dockerdist": "docker run --rm -ti -v ${PWD}:/project -v ${PWD##*/}-node-modules:/project/node_modules -v ~/.electron:/root/.electron electronuserland/electron-builder:wine /bin/bash -c \"yarn && yarn dist:linux\""
+    "dist:linux": "npm run build && electron-builder --linux",
+    "dockerdist:linux": "docker run --rm -ti -v ${PWD}:/project -v ${PWD##*/}-node-modules:/project/node_modules -v ~/.electron:/root/.electron electronuserland/electron-builder:wine /bin/bash -c \"yarn && yarn dist:linux\"",
+    "dist:mac": "npm run build && electron-builder --macos",
+    "dockerdist:mac": "docker run --rm -ti -v ${PWD}:/project -v ${PWD##*/}-node-modules:/project/node_modules -v ~/.electron:/root/.electron electronuserland/electron-builder:wine /bin/bash -c \"yarn && yarn dist:mac\"",
+    "dist:win": "npm run build && electron-builder --win",
+    "dockerdist:win": "docker run --rm -ti -v ${PWD}:/project -v ${PWD##*/}-node-modules:/project/node_modules -v ~/.electron:/root/.electron electronuserland/electron-builder:wine /bin/bash -c \"yarn && yarn dist:win\"",
+    "dist:all": "npm run build && electron-builder --linux --win",
+    "dockerdist:all": "docker run --rm -ti -v ${PWD}:/project -v ${PWD##*/}-node-modules:/project/node_modules -v ~/.electron:/root/.electron electronuserland/electron-builder:wine /bin/bash -c \"yarn && yarn dist:all\""
   },
   "build": {
     "productName": "JupyterLab App",
@@ -36,8 +40,16 @@
         "Category": "Science;Development;"
       }
     },
+    "win": {
+      "target": ["nsis","portable"]
+    },
     "rpm": {
       "depends": ["libXScrnSaver"]
+    },
+    "nsis": {
+      "oneClick": "false",
+      "deleteAppDataOnUninstall": true,
+      "license": "LICENSE"
     }
   },
   "repository": {

src/main/app.ts

@@ -70,8 +70,8 @@ class JupyterServer {
                 }
                 resolve(serverData);
             });
+
 
-            /* Windows doesn't support exec */ 
             if (process.platform !== "win32"){
                 this.nbServer.stdin.write('exec jupyter notebook --no-browser --port ' + port + '\n');
             }