github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Skip tropohouse colon converter on new packages

Browse Source 
It's not necessary, and at least a few months ago when we added
isopack-2 I thought it might corrupt things.
This commit is contained in:
David Glasser
2015-07-13 11:59:07 -07:00
parent e164d39663
commit 6443a693ba
2 changed files with 79 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/isopack.js
View File

@@ -246,7 +246,8 @@ Isopack.convertIsopackFormat = Profile(
// of the isopack metadata. Returns null if there is no package here.
Isopack.readMetadataFromDirectory =
Profile("Isopack.readMetadataFromDirectory", function (isopackDirectory) {
var metadata;
var metadata = null;
let originalVersion = null;
// deal with different versions of "isopack.json", backwards compatible
var isopackJsonPath = files.pathJoin(isopackDirectory, "isopack.json");
@@ -257,9 +258,11 @@ Isopack.readMetadataFromDirectory =
if (isopackJson['isopack-2']) {
metadata = isopackJson['isopack-2'];
originalVersion = 'isopack-2';
} else if (isopackJson['isopack-1']) {
metadata = Isopack.convertIsopackFormat(
isopackJson['isopack-1'], 'isopack-1', 'isopack-2');
originalVersion = 'isopack-1';
} else {
// This file is from the future and no longer supports this version
throw new Error("Could not find isopack data supported any supported format (isopack-1 or isopack-2).\n" +
@@ -273,6 +276,7 @@ Isopack.readMetadataFromDirectory =
metadata = Isopack.convertIsopackFormat(metadata,
"unipackage-pre2", "isopack-2");
originalVersion = 'unipackage-pre2';
}
if (metadata.format !== "unipackage-pre2") {
@@ -287,7 +291,7 @@ Isopack.readMetadataFromDirectory =
}
}
return metadata;
return {metadata, originalVersion};
});
_.extend(Isopack.prototype, {
@@ -696,7 +700,7 @@ _.extend(Isopack.prototype, {
// realpath'ing dir.
dir = files.realpath(dir);
var mainJson = Isopack.readMetadataFromDirectory(dir);
var {metadata: mainJson} = Isopack.readMetadataFromDirectory(dir);
if (! mainJson) {
throw new Error("No metadata files found for isopack at: " + dir);
}

133
tools/tropohouse.js
View File

@@ -64,70 +64,80 @@ exports._extractAndConvert = function (packageTarball, forceConvert) {
// Step 1. Load the metadata from isopack.json and convert colons in the
// file paths. We have already converted the colons in the actual files
// while untarring.
var metadata = Isopack.readMetadataFromDirectory(targetDirectory);
var convertedMetadata = colonConverter.convertIsopack(metadata);
var {metadata, originalVersion} =
Isopack.readMetadataFromDirectory(targetDirectory);
// Step 2. Write the isopack.json file
// XXX BBP we only need this for pre-1.1 packages, and this will corrupt BBP
// packages, so detect the BBP case and don't do this.
var isopackFileData = {};
isopackFileData['isopack-2'] = convertedMetadata;
// By the time that isopack-2 came out (around Meteor 1.2) nobody should be
// making colon packages anyway, so let's not waste effort converting (and
// moreover, not bother to make sure the code below works for isopack-2).
if (originalVersion === 'unipackage-pre2' ||
originalVersion === 'isopack-1') {
var convertedMetadata = colonConverter.convertIsopack(metadata);
var isopackJsonPath = files.pathJoin(targetDirectory, "isopack.json");
// Step 2. Write the isopack.json file
var isopackFileData = {};
isopackFileData['isopack-2'] = convertedMetadata;
if (files.exists(isopackJsonPath)) {
files.chmod(isopackJsonPath, 0o777);
var isopackJsonPath = files.pathJoin(targetDirectory, "isopack.json");
if (files.exists(isopackJsonPath)) {
files.chmod(isopackJsonPath, 0o777);
}
files.writeFile(
isopackJsonPath,
new Buffer(JSON.stringify(isopackFileData, null, 2), 'utf8'),
{mode: 0o444});
// Step 3. Clean up old unipackage.json file if it exists
files.unlink(files.pathJoin(targetDirectory, "unipackage.json"));
// Result: Now we are in a state where the isopack.json file paths are
// consistent with the paths in the downloaded tarball.
// Now, we have to convert the unibuild files in the same way.
_.each(convertedMetadata.builds, function (unibuildMeta) {
var unibuildJsonPath = files.pathJoin(targetDirectory,
unibuildMeta.path);
var unibuildJson = JSON.parse(files.readFile(unibuildJsonPath));
if (unibuildJson.format !== "unipackage-unibuild-pre1") {
throw new Error("Unsupported isopack unibuild format: " +
JSON.stringify(unibuildJson.format));
}
var convertedUnibuild = colonConverter.convertUnibuild(unibuildJson);
files.chmod(unibuildJsonPath, 0o777);
files.writeFile(
unibuildJsonPath,
new Buffer(JSON.stringify(convertedUnibuild, null, 2), 'utf8'),
{mode: 0o444});
// Result: Now we are in a state where the unibuild file paths are
// consistent with the paths in the downloaded tarball.
});
// Lastly, convert the build plugins, which are in the JSImage format
_.each(convertedMetadata.plugins, function (pluginMeta) {
var programJsonPath = files.pathJoin(targetDirectory, pluginMeta.path);
var programJson = JSON.parse(files.readFile(programJsonPath));
if (programJson.format !== "javascript-image-pre1") {
throw new Error("Unsupported plugin format: " +
JSON.stringify(programJson.format));
}
var convertedPlugin = colonConverter.convertJSImage(programJson);
files.chmod(programJsonPath, 0o777);
files.writeFile(
programJsonPath,
new Buffer(JSON.stringify(convertedPlugin, null, 2), 'utf8'),
{mode: 0o444});
// Result: Now we are in a state where the build plugin file paths are
// consistent with the paths in the downloaded tarball.
});
}
files.writeFile(isopackJsonPath,
new Buffer(JSON.stringify(isopackFileData, null, 2), 'utf8'),
{mode: 0o444});
// Step 3. Clean up old unipackage.json file if it exists
files.unlink(files.pathJoin(targetDirectory, "unipackage.json"));
// Result: Now we are in a state where the isopack.json file paths are
// consistent with the paths in the downloaded tarball.
// Now, we have to convert the unibuild files in the same way.
_.each(convertedMetadata.builds, function (unibuildMeta) {
var unibuildJsonPath = files.pathJoin(targetDirectory, unibuildMeta.path);
var unibuildJson = JSON.parse(files.readFile(unibuildJsonPath));
if (unibuildJson.format !== "unipackage-unibuild-pre1") {
throw new Error("Unsupported isopack unibuild format: " +
JSON.stringify(unibuildJson.format));
}
var convertedUnibuild = colonConverter.convertUnibuild(unibuildJson);
files.chmod(unibuildJsonPath, 0o777);
files.writeFile(unibuildJsonPath,
new Buffer(JSON.stringify(convertedUnibuild, null, 2), 'utf8'),
{mode: 0o444});
// Result: Now we are in a state where the unibuild file paths are
// consistent with the paths in the downloaded tarball.
});
// Lastly, convert the build plugins, which are in the JSImage format
_.each(convertedMetadata.plugins, function (pluginMeta) {
var programJsonPath = files.pathJoin(targetDirectory, pluginMeta.path);
var programJson = JSON.parse(files.readFile(programJsonPath));
if (programJson.format !== "javascript-image-pre1") {
throw new Error("Unsupported plugin format: " +
JSON.stringify(programJson.format));
}
var convertedPlugin = colonConverter.convertJSImage(programJson);
files.chmod(programJsonPath, 0o777);
files.writeFile(programJsonPath,
new Buffer(JSON.stringify(convertedPlugin, null, 2), 'utf8'),
{mode: 0o444});
// Result: Now we are in a state where the build plugin file paths are
// consistent with the paths in the downloaded tarball.
});
}
return targetDirectory;
@@ -318,7 +328,8 @@ _.extend(exports.Tropohouse.prototype, {
var downloadedArches = [];
// Find out which arches we have by reading the isopack metadata
var packageMetadata = Isopack.readMetadataFromDirectory(packagePath);
var {metadata: packageMetadata} =
Isopack.readMetadataFromDirectory(packagePath);
// packageMetadata is null if there is no package at packagePath
if (packageMetadata) {