Skip to content

Editable in manifest mode #1868

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −0
Draft

Editable in manifest mode #1868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions include/vcpkg/base/contractual-constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ namespace vcpkg
inline constexpr StringLiteral JsonIdOverlayPorts = "overlay-ports";
inline constexpr StringLiteral JsonIdOverlayTriplets = "overlay-triplets";
inline constexpr StringLiteral JsonIdOverrides = "overrides";
inline constexpr StringLiteral JsonIdEditables = "editables";
inline constexpr StringLiteral JsonIdPackages = "packages";
inline constexpr StringLiteral JsonIdPackageUnderscoreName = "package_name";
inline constexpr StringLiteral JsonIdPackageUnderscoreUrl = "package_url";
Expand Down
1 change: 1 addition & 0 deletions include/vcpkg/sourceparagraph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ namespace vcpkg
std::string documentation;
std::vector<Dependency> dependencies;
std::vector<DependencyOverride> overrides;
std::vector<std::string> editables;
std::vector<DependencyRequestedFeature> default_features;

ParsedSpdxLicenseDeclaration license;
Expand Down
11 changes: 11 additions & 0 deletions src/vcpkg/commands.install.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1342,6 +1342,17 @@ namespace vcpkg
.value_or_exit(VCPKG_LINE_INFO);

install_plan.print_unsupported_warnings();
for (InstallPlanAction& action : install_plan.install_actions)
{
if(std::find(manifest_core.editables.cbegin(), manifest_core.editables.cend(), action.spec.name()) != manifest_core.editables.cend())
{
action.editable = Editable::Yes;
}
else
{
action.editable = Editable::No;
}
}

// If the manifest refers to itself, it will be added to the install plan.
Util::erase_remove_if(install_plan.install_actions,
Expand Down
3 changes: 3 additions & 0 deletions src/vcpkg/sourceparagraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,6 +1367,7 @@ namespace vcpkg
JsonIdOverrides,
JsonIdSummary,
JsonIdSupports,
JsonIdEditables,
JsonIdVcpkgConfiguration,
};

Expand Down Expand Up @@ -1399,6 +1400,8 @@ namespace vcpkg
r.optional_object_field(obj, JsonIdDependencies, spgh.dependencies, DependencyArrayDeserializer::instance);
r.optional_object_field(
obj, JsonIdOverrides, spgh.overrides, DependencyOverrideArrayDeserializer::instance);
r.optional_object_field(
obj, JsonIdEditables, spgh.editables, Json::ParagraphDeserializer::instance);

r.optional_object_field_emplace(
obj, JsonIdBuiltinBaseline, spgh.builtin_baseline, BaselineCommitDeserializer::instance);
Expand Down
Loading