Skip to content

Commit

Permalink
Delete calls to removed scripts. (#833)
Browse files Browse the repository at this point in the history
In #817 vestigial scripts to install "ce.ps1" and friends were removed, but smoke testing the 2022-12-13 release found that package.json still referred to them.

Drive-by changed a few 'ce's to 'vcpkg-artifacts's.
  • Loading branch information
BillyONeal authored Dec 14, 2022
1 parent e6d0aa6 commit 5dbc097
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 264 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ tracking, and edits to which libraries are available.
This repository contains the contents formerly at https://github.com/microsoft/vcpkg in the
"toolsrc" tree, and build support.

# Vcpkg-ce: "Configure Environment" / artifacts
# vcpkg-artifacts

Parts of vcpkg powered by "ce" are currently in 'preview' -- there will most certainly be changes between now
vcpkg-artifacts are currently in 'preview' -- there will most certainly be changes between now
and when the tool is 'released' based on feedback.

You can use it, but be forewarned that we may change formats, commands, etc.
Expand All @@ -32,9 +32,9 @@ It

## Installation

While the usage of `ce` is the same on all platforms, the installation/loading/removal is slightly different depending on the platform you're using.
While the usage of `vcpkg-artifacts` is the same on all platforms, the installation/loading/removal is slightly different depending on the platform you're using.

`ce` doesn't persist any changes to the environment, nor does it automatically add itself to the start-up environment. If you wish to make it load in a window, you can just execute the script. Manually adding that in your profile will load it in every new window.
`vcpkg-artifacts` don't persist any changes to the environment, nor do they automatically add themselves to the start-up environment. If you wish to make it load in a window, you can just execute the script. Manually adding that in your profile will load it in every new window.

<hr>

Expand Down
216 changes: 0 additions & 216 deletions ce/assets/LICENSE.txt

This file was deleted.

11 changes: 5 additions & 6 deletions ce/assets/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vcpkg-ce",
"version": "0.8.0",
"description": "vcpkg-ce CLI",
"description": "vcpkg-artifacts",
"main": "ce/dist/main.js",
"bin": {
"ce_": "./ce/dist/main.js"
Expand All @@ -13,8 +13,8 @@
"node": ">=16.0.0"
},
"scripts": {
"postinstall": "node ./create-links create && node ./wrapper-scripts create",
"uninstall": "node ./create-links remove && node ./wrapper-scripts remove",
"postinstall": "node ./create-links create",
"uninstall": "node ./create-links remove",
"prepack": "npx rimraf ./common/temp/node_modules/.pnpm/typescript* ./common/temp/node_modules/.pnpm/translate-strings* ./common/temp/node_modules/.pnpm/ts-morph* ./common/temp/node_modules/.pnpm/@types* && node ./prepare-deploy.js"
},
"repository": {
Expand All @@ -25,9 +25,8 @@
"**/*"
],
"keywords": [
"vcpkg-ce",
"vcpkg",
"ce"
"vcpkg-artifacts",
"vcpkg"
],
"author": "Microsoft",
"license": "MIT",
Expand Down
16 changes: 0 additions & 16 deletions ce/ce/readme.md

This file was deleted.

16 changes: 0 additions & 16 deletions ce/test/readme.md

This file was deleted.

6 changes: 3 additions & 3 deletions include/vcpkg/base/messages.h
Original file line number Diff line number Diff line change
Expand Up @@ -1088,11 +1088,11 @@ namespace vcpkg
(msg::system_api, msg::exit_code, msg::url),
"",
"{url}: {system_api} failed with exit code {exit_code}");
DECLARE_MESSAGE(DownloadingVcpkgCeBundle, (msg::version), "", "Downloading vcpkg-ce bundle {version}...");
DECLARE_MESSAGE(DownloadingVcpkgCeBundle, (msg::version), "", "Downloading vcpkg-artifacts bundle {version}...");
DECLARE_MESSAGE(DownloadingVcpkgCeBundleLatest,
(),
"This message is normally displayed only in development.",
"Downloading latest vcpkg-ce bundle...");
"Downloading latest vcpkg-artifacts bundle...");
DECLARE_MESSAGE(DownloadingVcpkgStandaloneBundle, (msg::version), "", "Downloading standalone bundle {version}.");
DECLARE_MESSAGE(DownloadingVcpkgStandaloneBundleLatest, (), "", "Downloading latest standalone bundle.");
DECLARE_MESSAGE(DownloadRootsDir,
Expand Down Expand Up @@ -1315,7 +1315,7 @@ namespace vcpkg
(msg::tool_name, msg::version),
"",
"Could not parse version for tool {tool_name}. Version string was: {version}");
DECLARE_MESSAGE(FailedToProvisionCe, (), "", "Failed to provision vcpkg-ce.");
DECLARE_MESSAGE(FailedToProvisionCe, (), "", "Failed to provision vcpkg-artifacts.");
DECLARE_MESSAGE(FailedToRead, (msg::path, msg::error_msg), "", "Failed to read {path}: {error_msg}");
DECLARE_MESSAGE(FailedToReadParagraph, (msg::path), "", "Failed to read paragraphs from {path}");
DECLARE_MESSAGE(FailedToRemoveControl, (msg::path), "", "Failed to remove control file {path}");
Expand Down
6 changes: 3 additions & 3 deletions locales/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,9 @@
"_DownloadingTool.comment": "An example of {tool_name} is aria2. An example of {url} is https://github.com/microsoft/vcpkg. An example of {path} is /foo/bar.",
"DownloadingUrl": "Downloading {url}",
"_DownloadingUrl.comment": "An example of {url} is https://github.com/microsoft/vcpkg.",
"DownloadingVcpkgCeBundle": "Downloading vcpkg-ce bundle {version}...",
"DownloadingVcpkgCeBundle": "Downloading vcpkg-artifacts bundle {version}...",
"_DownloadingVcpkgCeBundle.comment": "An example of {version} is 1.3.8.",
"DownloadingVcpkgCeBundleLatest": "Downloading latest vcpkg-ce bundle...",
"DownloadingVcpkgCeBundleLatest": "Downloading latest vcpkg-artifacts bundle...",
"_DownloadingVcpkgCeBundleLatest.comment": "This message is normally displayed only in development.",
"DownloadingVcpkgStandaloneBundle": "Downloading standalone bundle {version}.",
"_DownloadingVcpkgStandaloneBundle.comment": "An example of {version} is 1.3.8.",
Expand Down Expand Up @@ -506,7 +506,7 @@
"_FailedToParseSerializedBinParagraph.comment": "'{error_msg}' is the error message for failing to parse the Binary Paragraph. An example of {error_msg} is File Not Found.",
"FailedToParseVersionXML": "Could not parse version for tool {tool_name}. Version string was: {version}",
"_FailedToParseVersionXML.comment": "An example of {tool_name} is aria2. An example of {version} is 1.3.8.",
"FailedToProvisionCe": "Failed to provision vcpkg-ce.",
"FailedToProvisionCe": "Failed to provision vcpkg-artifacts.",
"FailedToRead": "Failed to read {path}: {error_msg}",
"_FailedToRead.comment": "An example of {path} is /foo/bar. An example of {error_msg} is File Not Found.",
"FailedToReadParagraph": "Failed to read paragraphs from {path}",
Expand Down

0 comments on commit 5dbc097

Please sign in to comment.