Use preinstall script to improve error logging

Author: lgeiger

binding.gyp

@@ -8,7 +8,6 @@
       'cflags_cc!': ['-fno-exceptions'],
       'conditions': [
         ['OS=="win"', {
-          'download_lib': '<!(node scripts/download-win-lib 2>&1 > zmq-build.log)',
           'msbuild_toolset': 'v140',
           'defines': ['ZMQ_STATIC'],
           'include_dirs': ['windows/include'],
@@ -18,7 +17,6 @@
           ],
         }],
         ['OS=="mac" or OS=="solaris"', {
-          'install_zmq': '<!(./build_libzmq.sh 2>&1 > zmq-build.log)',
           'xcode_settings': {
             'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
             'MACOSX_DEPLOYMENT_TARGET': '10.7',
@@ -29,7 +27,6 @@
         ['OS=="openbsd" or OS=="freebsd"', {
         }],
         ['OS=="linux"', {
-          'install_zmq': '<!(./build_libzmq.sh 2>&1 > zmq-build.log)',
           'libraries': [ '<(PRODUCT_DIR)/../../zmq/lib/libzmq.a' ],
           'include_dirs': [ '<(PRODUCT_DIR)/../../zmq/include' ],
         }],

build_libzmq.sh

@@ -17,7 +17,7 @@ export CFLAGS=-fPIC
 export CXXFLAGS=-fPIC
 export PKG_CONFIG_PATH=$ZMQ_PREFIX/lib/pkgconfig
 
-test -f zeromq-$ZMQ.tar.gz || ZMQ=$ZMQ ZMQ_REPO=$ZMQ_REPO node ../scripts/download-zmq.js 2>&1 > ../zmq-build.log
+test -f zeromq-$ZMQ.tar.gz || ZMQ=$ZMQ ZMQ_REPO=$ZMQ_REPO node ../scripts/download-zmq.js
 test -d $ZMQ_SRC_DIR || tar xzf zeromq-$ZMQ.tar.gz
 cd $ZMQ_SRC_DIR
 

package.json

@@ -24,7 +24,8 @@
     "node": ">=0.10"
   },
   "scripts": {
-    "install": "prebuild --install",
+    "build:libzmq": "node scripts/download-win-lib.js && ./build_libzmq.sh",
+    "install": "prebuild --install --preinstall \"npm run build:libzmq\"",
     "build:docs": "jsdoc -R README.md -d docs lib/*.js",
     "test": "mocha --expose-gc --slow 300",
     "test:electron": "electron-mocha --slow 300",

scripts/download-win-lib.js

@@ -1,13 +1,16 @@
-var download = require('./download').download;
-var path = require('path');
-var fs = require('fs');
+if (process.platform === 'win32') {
+  console.log('Downloading libzmq for Windows')
+  var download = require('./download').download;
+  var path = require('path');
+  var fs = require('fs');
 
-var TAR_URL = 'https://github.com/nteract/libzmq-win/releases/download/v1.0.0/libzmq-' + process.arch + '.lib';
-var DIR_NAME = path.join(__dirname, '..', 'windows', 'lib');
-var FILE_NAME = path.join(DIR_NAME, 'libzmq.lib');
+  var TAR_URL = 'https://github.com/nteract/libzmq-win/releases/download/v1.0.0/libzmq-' + process.arch + '.lib';
+  var DIR_NAME = path.join(__dirname, '..', 'windows', 'lib');
+  var FILE_NAME = path.join(DIR_NAME, 'libzmq.lib');
 
-if (!fs.existsSync(DIR_NAME)) {
-  fs.mkdirSync(DIR_NAME);
-}
+  if (!fs.existsSync(DIR_NAME)) {
+    fs.mkdirSync(DIR_NAME);
+  }
 
-download(TAR_URL, FILE_NAME);
+  download(TAR_URL, FILE_NAME);
+}