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

Allow circular deps when initializing catalog if already built.

Browse Source 
Previously, we could only run any commands at all on this branch because
of a typo that was causing us to ignore all plugin dependencies when we
computed build-time dependencies (fixed in f94fd9d). This commit puts us
back in the state we thought we were in (things mostly work if you have
package builds cached from a different meteor branch).
This commit is contained in:
Emily Stark
2014-03-30 20:24:41 -07:00
parent a6152c392c
commit 8382013dd7
1 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tools/catalog.js
View File

@@ -320,17 +320,39 @@ _.extend(Catalog.prototype, {
var remaining = _.clone(self.effectiveLocalPackages);
var onStack = {}; // map from name to true
var maybeGetUpToDateBuild = function (name) {
var sourcePath = self.effectiveLocalPackages[name];
var buildDir = path.join(sourcePath, '.build');
if (fs.existsSync(buildDir)) {
var unipackage = new Unipackage(sourcePath);
unipackage.initFromPath(name, buildDir, { buildOfPath: sourcePath });
if (compiler.checkUpToDate(packageSources[name], unipackage)) {
return unipackage;
}
}
return null;
};
var build = function (name) {
var unipackage = null;
if (! _.has(remaining, name))
return;
// First build things that have to build before us (if not built yet)
_.each(packageBuildDeps[name], function (otherName) {
if (_.has(onStack, otherName)) {
buildmessage.error("circular dependency between packages " +
name + " and " + otherName);
// recover by not enforcing one of the depedencies
return;
// Allow a circular dependency if the other thing is already
// built and doesn't need to be rebuilt.
unipackage = maybeGetUpToDateBuild(otherName);
if (unipackage) {
return;
} else {
buildmessage.error("circular dependency between packages " +
name + " and " + otherName);
// recover by not enforcing one of the depedencies
return;
}
}
onStack[otherName] = true;
@@ -339,18 +361,8 @@ _.extend(Catalog.prototype, {
});
// Now build this package if it needs building
var unipackage = null;
var sourcePath = self.effectiveLocalPackages[name];
var buildDir = path.join(sourcePath, '.build');
if (fs.existsSync(buildDir)) {
// Looks like we have an existing build. See if it's up to date.
unipackage = new Unipackage(sourcePath);
unipackage.initFromPath(name, buildDir, { buildOfPath: sourcePath });
if (! compiler.checkUpToDate(packageSources[name], unipackage))
unipackage = null;
}
unipackage = maybeGetUpToDateBuild(name);
if (! unipackage) {
// Didn't have a build or it wasn't up to date. Build it.
@@ -363,6 +375,7 @@ _.extend(Catalog.prototype, {
if (! buildmessage.jobHasMessages()) {
// Save the build, for a fast load next time
try {
var buildDir = path.join(sourcePath, '.build');
files.addToGitignore(sourcePath, '.build*');
unipackage.saveToPath(buildDir, { buildOfPath: sourcePath });
} catch (e) {