Skip to content
This repository has been archived by the owner on Jun 29, 2019. It is now read-only.

Commit

Permalink
* Updated electron and some other packages to latest
Browse files Browse the repository at this point in the history
* Updated native\platform-util\rebuild.bat to infer the installed electron version
* Added documentation on rebuilding win32*.node modules
* Rebuilt win32*.node modules
  • Loading branch information
cpriest committed Mar 22, 2017
1 parent ccb97ad commit ec4ad23
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Expand Up @@ -22,7 +22,8 @@
"strict": "off",
"global-require": "off",
"no-restricted-syntax": "off",
"no-multi-spaces": "off"
"no-multi-spaces": "off",
"spaced-comment": "off"
},
"env": {
"jest": true
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Expand Up @@ -8,12 +8,13 @@ node_modules
/plugins/
/devplugins/

/hain-debug.log
/_launched_

/out
*.nupkg

/.idea
hain-debug*.log
/hain-debug*.log
npm-debug.log.*

/local
8 changes: 8 additions & 0 deletions app/native/platform-util/README.md
@@ -0,0 +1,8 @@
## Building

Note, you will need to install node-gyp and depending your platform, other things to rebuild.

The `rebuild.bat` file is a windows batch file.

See [node-gyp installation](https://www.npmjs.com/package/node-gyp#installation) if you need to rebuild this.

15 changes: 13 additions & 2 deletions app/native/platform-util/rebuild.bat
@@ -1,5 +1,16 @@
:init
@echo off
FOR /F "tokens=* USEBACKQ" %%i IN (`..\..\..\node_modules\electron\dist\electron.exe --version`) DO (
SET ELECTRON_VERSION=%%i
)
echo "Electron Version: %ELECTRON_VERSION%"

:build
@echo on
call node-gyp rebuild --python=C:\Python27 --target=1.4.13 --arch=ia32 --dist-url=https://atom.io/download/electron
call node-gyp rebuild --python=C:\Python27 --target=%ELECTRON_VERSION% --arch=ia32 --dist-url=https://atom.io/download/electron
copy /Y .\build\Release\addon.node .\win32-ia32.node
call node-gyp rebuild --python=C:\Python27 --target=1.4.13 --arch=x64 --dist-url=https://atom.io/download/electron

call node-gyp rebuild --python=C:\Python27 --target=%ELECTRON_VERSION% --arch=x64 --dist-url=https://atom.io/download/electron
copy /Y .\build\Release\addon.node .\win32-x64.node

:exit
Binary file modified app/native/platform-util/win32-ia32.node
Binary file not shown.
Binary file modified app/native/platform-util/win32-x64.node
Binary file not shown.
23 changes: 13 additions & 10 deletions package.json
Expand Up @@ -12,15 +12,18 @@
"author": "Heejin Lee <monster@teamappetizer.com>",
"license": "MIT",
"devDependencies": {
"electron": "1.4.13",
"electron-packager": "^8.5.1",
"electron-winstaller": "^2.5.2",
"babel-cli": "^6.23.0",
"babel-core": "^6.23.1",
"babel-loader": "^6.3.2",
"@types/electron": "^1.4.34",
"@types/node": "^7.0.8",
"babel-cli": "^6.24.0",
"babel-core": "^6.24.0",
"babel-loader": "^6.4.1",
"babel-preset-env": "^1.2.2",
"babel-preset-es2015": "^6.24.0",
"babel-preset-react": "^6.23.0",
"babel-preset-es2015": "^6.6.0",
"del": "^2.2.0",
"electron": "^1.6.2",
"electron-packager": "^8.6.0",
"electron-winstaller": "^2.5.2",
"eslint": "^2.13.1",
"eslint-config-airbnb-base": "^3.0.1",
"eslint-plugin-import": "^1.9.2",
Expand All @@ -29,10 +32,10 @@
"gulp-babel": "^6.1.2",
"gulp-install": "^0.6.0",
"gulp-replace": "^0.5.4",
"gulp-shell": "^0.5.2",
"gulp-sourcemaps": "^1.11.1",
"gulp-shell": "^0.6.3",
"gulp-sourcemaps": "^2.4.1",
"gulp-util": "^3.0.7",
"gulp-zip": "^3.2.0",
"gulp-zip": "^4.0.0",
"jest-cli": "12.1.1"
},
"optionalDependencies": {
Expand Down

0 comments on commit ec4ad23

Please sign in to comment.