Skip to content
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.

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

All make platforms should use one instance of shared resources #42

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions lib/magic-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,17 @@ MagicHelper.prototype._buildTargets = function (toBuild, nodes, targets) {

return makePlatform.init(root)
.then(function () {
// Используем sharedResources основной make-платформы, если она была проинициализирована
var sharedResources = baseMakePlatform.getSharedResources();
if (sharedResources) {
makePlatform._sharedResources = sharedResources;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А точно не стоит сделать сеттер вместо доступа к приватной переменной?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

здесь не сеттер нужно делать, здесь нужно унести это все в сам enb. Этот код по большому счету - один большой хак, и тут приватные данные уже используются. Сеттер для sharedResources смысла не имеет

}

if (useCache) {
// Используем кэш основной make-платформы
makePlatform._cacheStorage = baseMakePlatform._cacheStorage;
} else {
makePlatform.dropCache();
}

// Используем логгер основной make-платформы
Expand Down