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.

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

Remove z- prefix from bootstrap-standalone command #844

Merged
merged 1 commit into from
Dec 29, 2022
Merged

Remove z- prefix from bootstrap-standalone command #844

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
2 changes: 1 addition & 1 deletion ...de/vcpkg/commands.zbootstrap-standalone.h → ...ude/vcpkg/commands.bootstrap-standalone.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace vcpkg::Commands
{
struct ZBootstrapStandaloneCommand : BasicCommand
struct BootstrapStandaloneCommand : BasicCommand
{
virtual void perform_and_exit(const VcpkgCmdArguments& args, Filesystem& fs) const override;
};
Expand Down
6 changes: 3 additions & 3 deletions src/vcpkg/commands.zbootstrap-standalone.cpp → src/vcpkg/commands.bootstrap-standalone.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include <vcpkg/base/system.print.h>

#include <vcpkg/archives.h>
#include <vcpkg/commands.bootstrap-standalone.h>
#include <vcpkg/commands.version.h>
#include <vcpkg/commands.zbootstrap-standalone.h>
#include <vcpkg/tools.h>
#include <vcpkg/vcpkgcmdarguments.h>

Expand All @@ -13,14 +13,14 @@
namespace vcpkg::Commands
{
static const CommandStructure COMMAND_STRUCTURE = {
create_example_string("z-bootstrap-standalone"),
create_example_string("bootstrap-standalone"),
0,
0,
{{}, {}},
nullptr,
};

void ZBootstrapStandaloneCommand::perform_and_exit(const VcpkgCmdArguments& args, Filesystem& fs) const
void BootstrapStandaloneCommand::perform_and_exit(const VcpkgCmdArguments& args, Filesystem& fs) const
{
DownloadManager download_manager{{}};
const auto maybe_vcpkg_root_env = args.vcpkg_root_dir_env.get();
Expand Down
6 changes: 3 additions & 3 deletions src/vcpkg/commands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <vcpkg/commands.add-version.h>
#include <vcpkg/commands.add.h>
#include <vcpkg/commands.autocomplete.h>
#include <vcpkg/commands.bootstrap-standalone.h>
#include <vcpkg/commands.buildexternal.h>
#include <vcpkg/commands.cache.h>
#include <vcpkg/commands.check-support.h>
Expand Down Expand Up @@ -43,7 +44,6 @@
#include <vcpkg/commands.version.h>
#include <vcpkg/commands.xdownload.h>
#include <vcpkg/commands.xvsinstances.h>
#include <vcpkg/commands.zbootstrap-standalone.h>
#include <vcpkg/commands.zce.h>
#include <vcpkg/commands.zpreregistertelemetry.h>
#include <vcpkg/commands.zprintconfig.h>
Expand All @@ -63,7 +63,7 @@ namespace vcpkg::Commands
static const X_Download::XDownloadCommand xdownload{};
static const GenerateDefaultMessageMapCommand generate_message_map{};
static const Hash::HashCommand hash{};
static const ZBootstrapStandaloneCommand zboostrap_standalone{};
static const BootstrapStandaloneCommand boostrap_standalone{};
static const ZPreRegisterTelemetryCommand zpreregister_telemetry{};
#if defined(_WIN32)
static const UploadMetrics::UploadMetricsCommand upload_metrics{};
Expand All @@ -76,7 +76,7 @@ namespace vcpkg::Commands
{"x-init-registry", &init_registry},
{"x-download", &xdownload},
{"x-generate-default-message-map", &generate_message_map},
{"z-bootstrap-standalone", &zboostrap_standalone},
{"bootstrap-standalone", &boostrap_standalone},
{"z-preregister-telemetry", &zpreregister_telemetry},
#if defined(_WIN32)
{"x-upload-metrics", &upload_metrics},
Expand Down
2 changes: 1 addition & 1 deletion vcpkg-init/vcpkg-init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Z_VCPKG_bootstrap() {
fi

chmod +x "${VCPKG_ROOT}/vcpkg"
"${VCPKG_ROOT}/vcpkg" z-bootstrap-standalone
"${VCPKG_ROOT}/vcpkg" bootstrap-standalone
echo $VCPKG_BASE_VERSION > "${VCPKG_ROOT}/vcpkg-one-liner-version.txt"
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion vcpkg-init/vcpkg-init.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function bootstrap-vcpkg {
download https://github.com/microsoft/vcpkg-tool/releases/latest/download/vcpkg-glibc $VCPKG
}

& $VCPKG z-bootstrap-standalone
& $VCPKG bootstrap-standalone

$PATH = $ENV:PATH
$ENV:PATH="$VCPKG_ROOT;$PATH"
Expand Down