Explorar el Código

Created a pre-rebuild script. Fixes #20

Andrew Chalkley hace 9 años
padre
commit
f3ad235c1a
Se han modificado 4 ficheros con 18 adiciones y 12 borrados
  1. 2 6
      README.md
  2. 2 0
      package.json
  3. 8 0
      scripts/pre-rebuild.js
  4. 6 6
      scripts/windows-installer.js

+ 2 - 6
README.md

@@ -51,9 +51,7 @@ You'll need installed:
 
 ```
 npm install
-del node_modules\serialport\build\Release\serialport.node
-del node_modules\nslog\build\Release\nslog.node
-npm run rebuild
+npm run pre-rebuild && npm run rebuild
 npm start
 ```
 
@@ -61,9 +59,7 @@ npm start
 
 ```
 npm install
-rm node_modules/serialport/build/Release/serialport.node
-rm node_modules/nslog/build/Release/nslog.node
-npm run rebuild
+npm run pre-rebuild && npm run rebuild
 sudo npm start
 ```
 -------

+ 2 - 0
package.json

@@ -5,11 +5,13 @@
   "main": "index.js",
   "scripts": {
     "start": "electron index.js",
+    "pre-rebuild": "node ./scripts/pre-rebuild.js",
     "rebuild": "electron-rebuild",
     "sign-mac": "electron-osx-sign out/flasher.js-darwin-x64/flasher.js.app",
     "pack-win": "electron-packager . flasher.js --asar  --overwrite --platform=win32 --arch=x64 --icon=resources/icon.ico --prune=true --out=out --version-string.CompanyName=ThingsSDK --version-string.FileDescription=Flasher.js --version-string.ProductName=Flasher.js",
     "pack-mac": "electron-packager . --asar --overwrite --platform=darwin --arch=x64 --icon=resources/icon.icns --prune=true --out=out --osx-sign.identity='Developer ID Application: Secret Monkey Science'",
     "installer-win": "node ./scripts/windows-installer.js",
+    "dist-windows": "npm run pre-rebuild && npm run rebuild && npm run pack-win && npm run installer-win",
     "test": "mocha"
   },
   "repository": {

+ 8 - 0
scripts/pre-rebuild.js

@@ -0,0 +1,8 @@
+const fs = require('fs');
+const path = require('path');
+const rootPath = path.join(__dirname, '..')
+const nslog = path.join(rootPath, 'node_modules', 'nslog', 'build', 'Release', 'nslog.node');
+const serial_port = path.join(rootPath, 'node_modules', 'serialport', 'build', 'Release', 'serialport.node');
+
+fs.unlinkSync(nslog);
+fs.unlinkSync(serial_port);

+ 6 - 6
scripts/windows-installer.js

@@ -2,9 +2,9 @@
 //Taken from Electron API Demos
 //https://github.com/electron/electron-api-demos/blob/master/script/installer.js
 
-const createWindowsInstaller = require('electron-winstaller').createWindowsInstaller
-const path = require('path')
-const rimraf = require('rimraf')
+const createWindowsInstaller = require('electron-winstaller').createWindowsInstaller;
+const path = require('path');
+const rimraf = require('rimraf');
 
 deleteOutputFolder()
   .then(getInstallerConfig)
@@ -27,13 +27,13 @@ function getInstallerConfig () {
     setupExe: 'FlasherjsSetup.exe',
     setupIcon: path.join(rootPath, 'resources', 'icon.ico'),
     skipUpdateIcon: true
-  })
+  });
 }
 
 function deleteOutputFolder () {
   return new Promise((resolve, reject) => {
     rimraf(path.join(__dirname, '..', 'out', 'windows-installer'), (error) => {
       error ? reject(error) : resolve()
-    })
-  })
+    });
+  });
 }