Skip to content

Revert "build,test: make building addon tests less fragile" - broken source tarballs #18287

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

Closed
rvagg wants to merge 4 commits into from
Closed

Revert "build,test: make building addon tests less fragile" - broken source tarballs #18287

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d705e6
Revert "build,tools: check freshness of doc addons"
rvagg Jan 23, 2018
a6051eb
Revert "build,test: make building addon tests less fragile"
rvagg Jan 23, 2018
9134772
Revert "tools: simplify tools/doc/addon-verify.js"
rvagg Jan 23, 2018
cd9fd23
Revert "tools: teach gyp to write an 'all deps' rule"
rvagg Jan 23, 2018
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
Prev Previous commit
Next Next commit
Revert "tools: simplify tools/doc/addon-verify.js" 
This reverts commit c668263.

Reverted along with d9b59de as this breaks compilation from
downloadable source tarballs.
  • Loading branch information
@rvagg
rvagg committed Jan 24, 2018
commit 91347726c061a68d01b9644ef3f844d2ff03e9c1
103 changes: 59 additions & 44 deletions tools/doc/addon-verify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use strict';

const { strictEqual } = require('assert');
const fs = require('fs');
const path = require('path');
const marked = require('marked');
Expand All @@ -9,36 +8,52 @@ const rootDir = path.resolve(__dirname, '..', '..');
const doc = path.resolve(rootDir, 'doc', 'api', 'addons.md');
const verifyDir = path.resolve(rootDir, 'test', 'addons');

const contents = fs.readFileSync(doc).toString();

const tokens = marked.lexer(contents);
let id = 0;
let currentHeader;

let currentHeader;
const addons = {};
const content = fs.readFileSync(doc, 'utf8');
for (const { text, type } of marked.lexer(content)) {
if (type === 'heading' && text) {
currentHeader = text;
tokens.forEach((token) => {
if (token.type === 'heading' && token.text) {
currentHeader = token.text;
addons[currentHeader] = {
files: {}
};
}
if (type === 'code') {
const match = text.match(/^\/\/\s+(.*\.(?:cc|h|js))[\r\n]/);
if (token.type === 'code') {
var match = token.text.match(/^\/\/\s+(.*\.(?:cc|h|js))[\r\n]/);
if (match !== null) {
addons[currentHeader].files[match[1]] = text;
addons[currentHeader].files[match[1]] = token.text;
}
}
});
for (var header in addons) {
verifyFiles(addons[header].files,
header,
console.log.bind(null, 'wrote'),
function(err) { if (err) throw err; });
}

for (const header in addons) {
let { files } = addons[header];
function once(fn) {
var once = false;
return function() {
if (once)
return;
once = true;
fn.apply(this, arguments);
};
}

function verifyFiles(files, blockName, onprogress, ondone) {
// must have a .cc and a .js to be a valid test
if (!Object.keys(files).some((name) => /\.cc$/.test(name)) ||
!Object.keys(files).some((name) => /\.js$/.test(name))) {
continue;
return;
}

const blockName = header
blockName = blockName
.toLowerCase()
.replace(/\s/g, '_')
.replace(/[^a-z\d_]/g, '');
Expand All @@ -47,17 +62,29 @@ for (const header in addons) {
`${(++id < 10 ? '0' : '') + id}_${blockName}`
);

files = Object.entries(files).map(([name, content]) => {
if (name === 'test.js') content = boilerplate(name, content);
return { name, content, path: path.resolve(dir, name) };
files = Object.keys(files).map(function(name) {
if (name === 'test.js') {
files[name] = `'use strict';
const common = require('../../common');
${files[name].replace(
"'./build/Release/addon'",
// eslint-disable-next-line no-template-curly-in-string
'`./build/${common.buildType}/addon`')}
`;
}
return {
path: path.resolve(dir, name),
name: name,
content: files[name]
};
});

files.push({
path: path.resolve(dir, 'binding.gyp'),
content: JSON.stringify({
targets: [
{
target_name: 'binding',
target_name: 'addon',
defines: [ 'V8_DEPRECATION_WARNINGS=1' ],
sources: files.map(function(file) {
return file.name;
Expand All @@ -67,34 +94,22 @@ for (const header in addons) {
})
});

try {
fs.mkdirSync(dir);
} catch (e) {
strictEqual(e.code, 'EEXIST');
}
fs.mkdir(dir, function() {
// Ignore errors

for (const file of files) {
let content;
try {
content = fs.readFileSync(file.path, 'utf8');
} catch (e) {
strictEqual(e.code, 'ENOENT');
}
const done = once(ondone);
var waiting = files.length;
files.forEach(function(file) {
fs.writeFile(file.path, file.content, function(err) {
if (err)
return done(err);

// Only update when file content has changed to prevent unneeded rebuilds.
if (content !== file.content) {
fs.writeFileSync(file.path, file.content);
console.log('wrote', file.path);
}
}
}
if (onprogress)
onprogress(file.path);

function boilerplate(name, content) {
return `'use strict';
const common = require('../../common');
${content.replace(
"'./build/Release/binding'",
// eslint-disable-next-line no-template-curly-in-string
'`./build/${common.buildType}/binding`')}
`;
if (--waiting === 0)
done();
});
});
});
}