Skip to content

Add --exclude-target to exclude targets when using --all #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dapetcu21 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add --exclude-target to exclude targets when using --all #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ var prebuildify = require('./index')
var argv = minimist(process.argv.slice(2), {
alias: {
target: 't',
excludeTarget: ['exclude-target', 'x'],
version: 'v',
all: 'a',
napi: 'n-api',
Expand All @@ -21,6 +22,7 @@ var argv = minimist(process.argv.slice(2), {
})

argv.targets = [].concat(argv.target || [])
argv.excludedTargets = [].concat(argv.excludeTarget || [])
argv.cwd = argv.cwd || argv._[0] || '.'

prebuildify(argv, function (err) {
Expand Down
32 changes: 21 additions & 11 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ function prebuildify (opts, cb) {
nodeGyp: process.env.PREBUILD_NODE_GYP || npmbin('node-gyp'),
shell: process.env.PREBUILD_SHELL || shell(),
cwd: '.',
targets: []
targets: [],
excludedTargets: [],
}, opts)

if (!opts.armv) {
Expand All @@ -36,7 +37,7 @@ function prebuildify (opts, cb) {
opts.out = opts.cwd
}

var targets = resolveTargets(opts.targets, opts.all, opts.napi, opts.electronCompat)
var targets = resolveTargets(opts.targets, opts.all, opts.napi, opts.electronCompat, opts.excludedTargets)

if (!targets.length) {
return process.nextTick(cb, new Error('You must specify at least one target'))
Expand Down Expand Up @@ -285,16 +286,18 @@ function shell () {
return os.platform() === 'android' ? 'sh' : undefined
}

function resolveTargets (targets, all, napi, electronCompat) {
targets = targets.map(function (v) {
if (typeof v === 'object' && v !== null) return v
if (v.indexOf('@') === -1) v = 'node@' + v
function parseTarget(v) {
if (typeof v === 'object' && v !== null) return v
if (v.indexOf('@') === -1) v = 'node@' + v

return {
runtime: v.split('@')[0],
target: v.split('@')[1].replace(/^v/, '')
}
})
return {
runtime: v.split('@')[0],
target: v.split('@')[1].replace(/^v/, '')
}
}

function resolveTargets (targets, all, napi, electronCompat, excludedTargets) {
targets = targets.map(parseTarget)

// TODO: also support --lts and get versions from travis
if (all) {
Expand All @@ -313,6 +316,13 @@ function resolveTargets (targets, all, napi, electronCompat) {
if (targets[0].target === '9.0.0') targets[0].target = '9.6.1'
}

excludedTargets = excludedTargets.map(parseTarget)
targets = targets.filter(function (a) {
return !excludedTargets.find(function (b) {
return a.runtime === b.runtime && a.target === b.target
})
})

return targets
}

Expand Down