Commit ed5a96c2 by Dane Springmeyer

version temp directory on configuration to avoid cache clash between debug and release builds

parent 4b24eb82
...@@ -7,14 +7,14 @@ TODO ...@@ -7,14 +7,14 @@ TODO
- cloudfront + logging - cloudfront + logging
- script to check for acl-public - script to check for acl-public
- use require() to support node_modules location of binary? - use require() to support node_modules location of binary?
- consider json config for configuring build and for handling routing remotely
- drop tar.gz - use node-tar directly - https://github.com/isaacs/node-tar/issues/11
*/ */
var package_json = require('./package.json'); var package_json = require('./package.json');
var Binary = require('./lib/binary_name.js').Binary; var Binary = require('./lib/binary_name.js').Binary;
var util = require('./build-util/tools.js'); var util = require('./build-util/tools.js');
var mkdirp = require('mkdirp'); var mkdirp = require('mkdirp');
// https://github.com/isaacs/node-tar/issues/11
//var tar = require('tar');
var targz = require('tar.gz'); var targz = require('tar.gz');
var cp = require('child_process'); var cp = require('child_process');
var fs = require('fs'); var fs = require('fs');
...@@ -22,9 +22,6 @@ var path = require('path'); ...@@ -22,9 +22,6 @@ var path = require('path');
var os = require('os'); var os = require('os');
var crypto = require('crypto'); var crypto = require('crypto');
var cloudfront_url = 'http://dei9kzb8scfgo.cloudfront.net/';
var s3_url = 'http://node-sqlite3.s3.amazonaws.com/';
var opts = { var opts = {
name: 'node_sqlite3', name: 'node_sqlite3',
force: false, force: false,
...@@ -32,7 +29,7 @@ var opts = { ...@@ -32,7 +29,7 @@ var opts = {
configuration: 'Release', configuration: 'Release',
target_arch: process.arch, target_arch: process.arch,
platform: process.platform, platform: process.platform,
uri: s3_url, uri: 'http://node-sqlite3.s3.amazonaws.com/',
paths: {} paths: {}
} }
...@@ -202,16 +199,15 @@ if (opts.force) { ...@@ -202,16 +199,15 @@ if (opts.force) {
test(opts,true,done); test(opts,true,done);
} catch (ex) { } catch (ex) {
var from = opts.binary.getRemotePath(); var from = opts.binary.getRemotePath();
var tmpdir; var tmpdirbase = '/tmp/';
if (os.tmpdir) { if (os.tmpdir) {
tmpdir = os.tmpdir(); tmpdirbase = os.tmpdir();
} else { }
var tmpdir = '/tmp/node-sqlite3-' + opts.binary.configuration; var tmpdir = path.join(tmpdirbase,'node-sqlite3-'+opts.binary.configuration);
try { try {
mkdirp.sync(tmpdir); mkdirp.sync(tmpdir);
} catch (err) { } catch (err) {
log_debug(err); log_debug(err);
}
} }
log('Checking for ' + from); log('Checking for ' + from);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment