Skip to content

Commit ed5a96c

Browse files
author
Dane Springmeyer
committed
version temp directory on configuration to avoid cache clash between debug and release builds
1 parent 4b24eb8 commit ed5a96c

1 file changed

Lines changed: 11 additions & 15 deletions

File tree

build.js

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,29 @@ TODO
77
- cloudfront + logging
88
- script to check for acl-public
99
- use require() to support node_modules location of binary?
10+
- consider json config for configuring build and for handling routing remotely
11+
- drop tar.gz - use node-tar directly - https://github.com/isaacs/node-tar/issues/11
1012
*/
1113

1214
var package_json = require('./package.json');
1315
var Binary = require('./lib/binary_name.js').Binary;
1416
var util = require('./build-util/tools.js');
1517
var mkdirp = require('mkdirp');
16-
// https://github.com/isaacs/node-tar/issues/11
17-
//var tar = require('tar');
1818
var targz = require('tar.gz');
1919
var cp = require('child_process');
2020
var fs = require('fs');
2121
var path = require('path');
2222
var os = require('os');
2323
var crypto = require('crypto');
2424

25-
var cloudfront_url = 'http://dei9kzb8scfgo.cloudfront.net/';
26-
var s3_url = 'http://node-sqlite3.s3.amazonaws.com/';
27-
2825
var opts = {
2926
name: 'node_sqlite3',
3027
force: false,
3128
stage: false,
3229
configuration: 'Release',
3330
target_arch: process.arch,
3431
platform: process.platform,
35-
uri: s3_url,
32+
uri: 'http://node-sqlite3.s3.amazonaws.com/',
3633
paths: {}
3734
}
3835

@@ -202,16 +199,15 @@ if (opts.force) {
202199
test(opts,true,done);
203200
} catch (ex) {
204201
var from = opts.binary.getRemotePath();
205-
var tmpdir;
202+
var tmpdirbase = '/tmp/';
206203
if (os.tmpdir) {
207-
tmpdir = os.tmpdir();
208-
} else {
209-
var tmpdir = '/tmp/node-sqlite3-' + opts.binary.configuration;
210-
try {
211-
mkdirp.sync(tmpdir);
212-
} catch (err) {
213-
log_debug(err);
214-
}
204+
tmpdirbase = os.tmpdir();
205+
}
206+
var tmpdir = path.join(tmpdirbase,'node-sqlite3-'+opts.binary.configuration);
207+
try {
208+
mkdirp.sync(tmpdir);
209+
} catch (err) {
210+
log_debug(err);
215211
}
216212

217213
log('Checking for ' + from);

0 commit comments

Comments
 (0)