mirror of
https://github.com/meteor/meteor.git
synced 2026-05-02 03:01:46 -04:00
Pass uniload's ignoreProjectDeps down farther
Fixes test-packages from a clean checkout (sigh) Basically, uniload should never depend on your current project! It's building separate JS images!
This commit is contained in:
@@ -678,7 +678,9 @@ _.extend(CompleteCatalog.prototype, {
|
|||||||
title: "building package `" + name + "`",
|
title: "building package `" + name + "`",
|
||||||
rootPath: sourcePath
|
rootPath: sourcePath
|
||||||
}, function () {
|
}, function () {
|
||||||
unip = compiler.compile(self.packageSources[name]).unipackage;
|
unip = compiler.compile(self.packageSources[name], {
|
||||||
|
ignoreProjectDeps: constraintSolverOpts.ignoreProjectDeps
|
||||||
|
}).unipackage;
|
||||||
if (! buildmessage.jobHasMessages()) {
|
if (! buildmessage.jobHasMessages()) {
|
||||||
// Save the build, for a fast load next time
|
// Save the build, for a fast load next time
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -730,6 +730,8 @@ var compileUnibuild = function (unipackage, inputSourceArch, packageLoader,
|
|||||||
// when we already have a resolved set of build-time dependencies and
|
// when we already have a resolved set of build-time dependencies and
|
||||||
// want to use that instead of resolving them again, e.g. when
|
// want to use that instead of resolving them again, e.g. when
|
||||||
// running 'meteor publish-for-arch'.
|
// running 'meteor publish-for-arch'.
|
||||||
|
// - ignoreProjectDeps: if we should, in some specific context that
|
||||||
|
// glasser only half understands, ignore the current project deps
|
||||||
//
|
//
|
||||||
// Returns an object with keys:
|
// Returns an object with keys:
|
||||||
// - unipackage: the built Unipackage
|
// - unipackage: the built Unipackage
|
||||||
@@ -745,7 +747,9 @@ compiler.compile = function (packageSource, options) {
|
|||||||
options = _.extend({ officialBuild: false }, options);
|
options = _.extend({ officialBuild: false }, options);
|
||||||
|
|
||||||
// Determine versions of build-time dependencies
|
// Determine versions of build-time dependencies
|
||||||
var buildTimeDeps = determineBuildTimeDependencies(packageSource);
|
var buildTimeDeps = determineBuildTimeDependencies(packageSource, {
|
||||||
|
ignoreProjectDeps: options.ignoreProjectDeps
|
||||||
|
});
|
||||||
|
|
||||||
// Build plugins
|
// Build plugins
|
||||||
_.each(packageSource.pluginInfo, function (info) {
|
_.each(packageSource.pluginInfo, function (info) {
|
||||||
@@ -834,7 +838,10 @@ compiler.compile = function (packageSource, options) {
|
|||||||
|
|
||||||
// Compile unibuilds. Might use our plugins, so needs to happen second.
|
// Compile unibuilds. Might use our plugins, so needs to happen second.
|
||||||
var loader = new packageLoader.PackageLoader({
|
var loader = new packageLoader.PackageLoader({
|
||||||
versions: buildTimeDeps.packageDependencies
|
versions: buildTimeDeps.packageDependencies,
|
||||||
|
constraintSolverOpts: {
|
||||||
|
ignoreProjectDeps: options.ignoreProjectDeps
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
_.each(packageSource.architectures, function (unibuild) {
|
_.each(packageSource.architectures, function (unibuild) {
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ _.extend(PackageCache.prototype, {
|
|||||||
// on disk, you won't see the changes. To flush the package cache
|
// on disk, you won't see the changes. To flush the package cache
|
||||||
// and force all of the packages to be reloaded the next time
|
// and force all of the packages to be reloaded the next time
|
||||||
// loadPackageAtPath() is called for them, see refresh().
|
// loadPackageAtPath() is called for them, see refresh().
|
||||||
loadPackageAtPath: function (name, loadPath) {
|
loadPackageAtPath: function (name, loadPath, constraintSolverOpts) {
|
||||||
var self = this;
|
var self = this;
|
||||||
buildmessage.assertInCapture();
|
buildmessage.assertInCapture();
|
||||||
|
|
||||||
@@ -179,7 +179,9 @@ _.extend(PackageCache.prototype, {
|
|||||||
// We don't do that anymore and at the moment, we rely on catalog to
|
// We don't do that anymore and at the moment, we rely on catalog to
|
||||||
// initalize ahead of us and swoop in and build all of the local packages
|
// initalize ahead of us and swoop in and build all of the local packages
|
||||||
// informed by a topological sort
|
// informed by a topological sort
|
||||||
var unip = compiler.compile(packageSource).unipackage;
|
var unip = compiler.compile(packageSource, {
|
||||||
|
ignoreProjectDeps: constraintSolverOpts.ignoreProjectDeps
|
||||||
|
}).unipackage;
|
||||||
self.loadedPackages[key] = {
|
self.loadedPackages[key] = {
|
||||||
pkg: unip,
|
pkg: unip,
|
||||||
sourceDir: null,
|
sourceDir: null,
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ exports.PackageLoader = function (options) {
|
|||||||
var self = this;
|
var self = this;
|
||||||
self.versions = options.versions || null;
|
self.versions = options.versions || null;
|
||||||
self.uniloadDir = options.uniloadDir;
|
self.uniloadDir = options.uniloadDir;
|
||||||
self.constraintSolverOpts= options.constraintSolverOpts;
|
self.constraintSolverOpts = options.constraintSolverOpts;
|
||||||
};
|
};
|
||||||
|
|
||||||
_.extend(exports.PackageLoader.prototype, {
|
_.extend(exports.PackageLoader.prototype, {
|
||||||
@@ -53,7 +53,8 @@ _.extend(exports.PackageLoader.prototype, {
|
|||||||
return pkg;
|
return pkg;
|
||||||
}
|
}
|
||||||
|
|
||||||
return packageCache.packageCache.loadPackageAtPath(name, loadPath);
|
return packageCache.packageCache.loadPackageAtPath(
|
||||||
|
name, loadPath, self.constraintSolverOpts);
|
||||||
},
|
},
|
||||||
|
|
||||||
containsPlugins: function (name) {
|
containsPlugins: function (name) {
|
||||||
|
|||||||
Reference in New Issue
Block a user