Skip to content

Commit 6a657d3

Browse files
egorpuginegorpugin
committed
Use PackageId APIs to access path and version. Initial restoration of vs generator.
1 parent 590989e commit 6a657d3

22 files changed

Lines changed: 216 additions & 279 deletions

‎src/sw/client/client.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ int parse_main(int argc, char **argv)
308308
// post setup args
309309

310310
for (sw::PackageId p : cl_activate)
311-
gUserSelectedPackages[p.ppath] = p.version;
311+
gUserSelectedPackages[p.getPath()] = p.getVersion();
312312

313313
return setup_main(args);
314314
}

‎src/sw/client/command/override.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void override_package_perform(sw::SwContext &swctx, const sw::PackagePath &prefi
4949
auto gn = swctx.getLocalStorage().getOverriddenPackagesStorage().getPackagesDatabase().getMaxGroupNumber() + 1;
5050
for (auto &[pkg, desc] : getPackages(*b))
5151
{
52-
sw::PackageId pkg2{ prefix / pkg.ppath, pkg.version };
52+
sw::PackageId pkg2{ prefix / pkg.getPath(), pkg.getVersion() };
5353
auto dir = fs::absolute(".");
5454
LOG_INFO(logger, "Overriding " + pkg2.toString() + " to " + dir.u8string());
5555
// fix deps' prefix

‎src/sw/client/command/upload.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ sw::PackageDescriptionMap getPackages(const sw::SwBuild &b, const sw::SourceDirM
5252
for (auto &[pkg, td] : b.getTargets())
5353
{
5454
// deps
55-
if (pkg.ppath.isAbsolute())
55+
if (pkg.getPath().isAbsolute())
5656
continue;
5757
auto t = td.getAnyTarget();
5858

@@ -61,14 +61,14 @@ sw::PackageDescriptionMap getPackages(const sw::SwBuild &b, const sw::SourceDirM
6161
// source, version, path
6262
t->getSource().save(j["source"]);
6363
j["version"] = pkg.getVersion().toString();
64-
j["path"] = pkg.ppath.toString();
64+
j["path"] = pkg.getPath().toString();
6565

6666
// find root dir
6767
path rd;
6868
if (!sources.empty())
6969
{
7070
auto src = t->getSource().clone(); // copy
71-
src->applyVersion(pkg.version);
71+
src->applyVersion(pkg.getVersion());
7272
auto si = sources.find(src->getHash());
7373
if (si == sources.end())
7474
throw SW_RUNTIME_ERROR("no such source");
@@ -126,8 +126,7 @@ SUBCOMMAND_DECL2(upload)
126126
for (auto &[id, d] : m)
127127
{
128128
write_file(fs::current_path() / SW_BINARY_DIR / "upload" / id.toString() += ".json", d->getString());
129-
auto id2 = id;
130-
id2.ppath = sw::PackagePath(upload_prefix) / id2.ppath;
129+
auto id2 = sw::PackageId(sw::PackagePath(upload_prefix) / id.getPath(), id.getVersion());
131130
LOG_INFO(logger, "Uploading " + id2.toString());
132131
}
133132

‎src/sw/client/command/uri.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ F(install)
9696
{
9797
SetupConsole();
9898
bUseSystemPause = true;
99-
swctx.install(sw::UnresolvedPackages{ sw::UnresolvedPackage{p.ppath, p.version} });
99+
swctx.install(sw::UnresolvedPackages{ sw::UnresolvedPackage{p.getPath(), p.getVersion()} });
100100
}
101101
else
102102
{
@@ -154,7 +154,7 @@ F(upload)
154154
url += normalize_path(pkg.getHashPath() / "sw.cpp");
155155
auto fn = sw::get_temp_filename("uploads") / "sw.cpp";
156156
auto spec_data = download_file(url);
157-
boost::replace_all(spec_data, pkg.version.toString(), new_version.toString());
157+
boost::replace_all(spec_data, pkg.getVersion().toString(), new_version.toString());
158158
write_file(fn, spec_data);
159159

160160
// before scp
@@ -167,7 +167,7 @@ F(upload)
167167

168168
// run secure as below?
169169
ScopedCurrentPath scp(fn.parent_path());
170-
gUploadPrefix = pkg.ppath.slice(0, std::stoi(uri_args[3]));
170+
gUploadPrefix = pkg.getPath().slice(0, std::stoi(uri_args[3]));
171171
cli_upload(swctx);
172172

173173
/*primitives::Command c;

‎src/sw/client/generator/generator.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ struct VSGenerator : Generator
7575
const sw::InsecurePath deps_subdir = "Dependencies";
7676
const sw::InsecurePath overridden_deps_subdir = "Overridden Packages";
7777
const String predefined_targets_dir = ". SW Predefined Targets"s;
78+
const String visualizers_dir = "Visualizers"s;
7879
const String all_build_name = "ALL_BUILD"s;
7980
const String build_dependencies_name = "BUILD_DEPENDENCIES"s;
8081

0 commit comments

Comments
 (0)