Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build for windows #66

Merged
merged 5 commits into from
Jul 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ __pycache__
*.swp
*.map
.idea/

*.log
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ before_install:
# - yarn install

script:
- yarn dockerdist
- yarn dockerdist:linux
- yarn dockerdist:win
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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".
20 changes: 16 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -36,8 +40,16 @@
"Category": "Science;Development;"
}
},
"win": {
"target": ["nsis","portable"]
},
"rpm": {
"depends": ["libXScrnSaver"]
},
"nsis": {
"oneClick": "false",
"deleteAppDataOnUninstall": true,
"license": "LICENSE"
}
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down