From 5dbc097c1c0cff737e59256054486a0738dac3e3 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 14 Dec 2022 10:49:25 -0800 Subject: [PATCH] Delete calls to removed scripts. (#833) In https://github.com/microsoft/vcpkg-tool/pull/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. --- README.md | 8 +- ce/assets/LICENSE.txt | 216 ---------------------------------- ce/assets/package.json | 11 +- ce/ce/readme.md | 16 --- ce/test/readme.md | 16 --- include/vcpkg/base/messages.h | 6 +- locales/messages.json | 6 +- 7 files changed, 15 insertions(+), 264 deletions(-) delete mode 100644 ce/assets/LICENSE.txt delete mode 100644 ce/ce/readme.md delete mode 100644 ce/test/readme.md diff --git a/README.md b/README.md index 54ce512a71..64c7f8af49 100644 --- a/README.md +++ b/README.md @@ -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. @@ -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.
diff --git a/ce/assets/LICENSE.txt b/ce/assets/LICENSE.txt deleted file mode 100644 index e54fc3fbcb..0000000000 --- a/ce/assets/LICENSE.txt +++ /dev/null @@ -1,216 +0,0 @@ -MICROSOFT PRE-RELEASE SOFTWARE LICENSE TERMS - -MICROSOFT VCPKG-CE PROJECT - -These license terms are an agreement between Microsoft Corporation (or based on -where you live, one of its affiliates) and you. They apply to the pre-release -software named above. The terms also apply to any Microsoft services or updates -for the software, except to the extent those have additional terms. - -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE RIGHTS BELOW. - -1. INSTALLATION AND USE RIGHTS. - - a. General. You may install and use any number of copies of the software. - - b. Third Party Components. The software may include third party components - with separate legal notices or governed by other agreements, as may be - described in the “…Notice” file(s) accompanying the software. - -2. PRE-RELEASE SOFTWARE. This software is a pre-release version. It may not - operate correctly or work the way a final version will. Microsoft may change - it for the final, commercial version. Microsoft is not obligated to provide - maintenance, technical support or updates to you for the software. - -3. FEEDBACK. If you give feedback about the software to Microsoft, you give to - Microsoft, without charge, the right to use, share and commercialize your - feedback in any way and for any purpose. You will not give feedback that is - subject to a license that requires Microsoft to license its software or - documentation to third parties because we include your feedback in them. - These rights survive this agreement. - -4. DATA. - - a. Data Collection. The software may collect information about you and your - use of the software, and send that to Microsoft. Microsoft may use this - information to provide services and improve our products and services. - You may opt-out of many of these scenarios, but not all, as described in - the product documentation. There are also some features in the software - that may enable you and Microsoft to collect data from users of your - applications. If you use these features, you must comply with applicable - law, including providing appropriate notices to users of your - applications together with a copy of Microsoft’s privacy statement. Our - privacy statement is located at - https://go.microsoft.com/fwlink/?LinkID=824704. You can learn more about - data collection and use in the help documentation and our privacy - statement. Your use of the software operates as your consent to these - practices. - - b. Processing of Personal Data. To the extent Microsoft is a processor or - subprocessor of personal data in connection with the software, Microsoft - makes the commitments in the European Union General Data Protection - Regulation Terms of the Online Services Terms to all customers effective - May 25, 2018, at https://docs.microsoft.com/en-us/legal/gdpr. - -5. TIME-SENSITIVE SOFTWARE. - - a) Period. This agreement is effective on your acceptance and terminates on - the earlier of (i) 30 days following first availability of a commercial - release of the software or (ii) upon termination by Microsoft. Microsoft - may extend this agreement in its discretion. - - b) Notice. You may receive periodic reminder notices of this date through - the software. - - c) Access to data. You may not be able to access data used in the software - when it stops running. - -6. FEEDBACK. If you give feedback about the software to Microsoft, you give to - Microsoft, without charge, the right to use, share and commercialize your - feedback in any way and for any purpose. You will not give feedback that is - subject to a license that requires Microsoft to license its software or - documentation to third parties because we include your feedback in them. - These rights survive this agreement. - -7. SCOPE OF LICENSE. The software is licensed, not sold. This agreement only - gives you some rights to use the software. Microsoft reserves all other - rights. Unless applicable law gives you more rights despite this limitation, - you may use the software only as expressly permitted in this agreement. In - doing so, you must comply with any technical limitations in the software - that only allow you to use it in certain ways. You may not - - - work around any technical limitations in the software; - - - reverse engineer, decompile or disassemble the software, or otherwise - attempt to derive the source code for the software, except and to the - extent required by third party licensing terms governing use of certain - open-source components that may be included with the software; - - - remove, minimize, block or modify any notices of Microsoft or its - suppliers in the software; - - - use the software in any way that is against the law; - - - share, publish, rent, or lease the software; or, - - - provide the software as a stand-alone offering or combined with any of - your applications for others to use, or transfer the software or this - agreement to any third party. - -8. EXPORT RESTRICTIONS. You must comply with all domestic and international - export laws and regulations that apply to the software, which include - restrictions on destinations, end users and end use. For further information - on export restrictions, visit www.microsoft.com/exporting. - -9. SUPPORT SERVICES. Because this software is “as is,” we may not provide - support services for it. - -10. ENTIRE AGREEMENT. This agreement, and the terms for supplements, updates, - Internet-based services and support services that you use, are the entire - agreement for the software and support services. - -11. APPLICABLE LAW. If you acquired the software in the United States, - Washington law applies to interpretation of and claims for breach of this - agreement, and the laws of the state where you live apply to all other - claims. If you acquired the software in any other country, its laws apply. - -12. CONSUMER RIGHTS; REGIONAL VARIATIONS. This agreement describes certain legal - rights. You may have other rights, including consumer rights, under the laws - of your state or country. Separate and apart from your relationship with - Microsoft, you may also have rights with respect to the party from which you - acquired the software. This agreement does not change those other rights if - the laws of your state or country do not permit it to do so. For example, if - you acquired the software in one of the below regions, or mandatory country - law applies, then the following provisions apply to you: - - a. Australia. You have statutory guarantees under the Australian Consumer - Law and nothing in this agreement is intended to affect those rights. - - b. Canada. If you acquired this software in Canada, you may stop receiving - updates by turning off the automatic update feature, disconnecting your - device from the Internet (if and when you re-connect to the Internet, - however, the software will resume checking for and installing updates), - or uninstalling the software. The product documentation, if any, may also - specify how to turn off updates for your specific device or software. - - c. Germany and Austria. - - (i) Warranty. The properly licensed software will perform substantially - as described in any Microsoft materials that accompany the software. - However, Microsoft gives no contractual guarantee in relation to the - licensed software. - - (ii) Limitation of Liability. In case of intentional conduct, gross - negligence, claims based on the Product Liability Act, as well as, - in case of death or personal or physical injury, Microsoft is liable - according to the statutory law. - - Subject to the foregoing clause (ii), Microsoft will only be liable for - slight negligence if Microsoft is in breach of such material contractual - obligations, the fulfillment of which facilitate the due performance of - this agreement, the breach of which would endanger the purpose of this - agreement and the compliance with which a party may constantly trust in - (so-called "cardinal obligations"). In other cases of slight negligence, - Microsoft will not be liable for slight negligence. - -13. DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED “AS-IS.” YOU BEAR THE RISK - OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR - CONDITIONS. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT - XCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE AND NON-INFRINGEMENT. - -14. LIMITATION ON AND EXCLUSION OF DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND - ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY - OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR - INCIDENTAL DAMAGES. - - This limitation applies to (a) anything related to the software, services, - content (including code) on third party Internet sites, or third party - applications; and (b) claims for breach of contract, breach of warranty, - guarantee or condition, strict liability, negligence, or other tort to the - extent permitted by applicable law. - - It also applies even if Microsoft knew or should have known about the - possibility of the damages. The above limitation or exclusion may not apply - to you because your country may not allow the exclusion or limitation of - incidental, consequential or other damages. - -Please note: As this software is distributed in Quebec, Canada, some of the -clauses in this agreement are provided below in French. - -Remarque : Ce logiciel étant distribué au Québec, Canada, certaines des clauses -dans ce contrat sont fournies ci-dessous en français. - -EXONÉRATION DE GARANTIE. Le logiciel visé par une licence est offert -« tel quel ». Toute utilisation de ce logiciel est à votre seule risque et -péril. Microsoft n’accorde aucune autre garantie expresse. Vous pouvez -bénéficier de droits additionnels en vertu du droit local sur la protection des -consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le -droit locale, les garanties implicites de qualité marchande, d’adéquation à un -usage particulier et d’absence de contrefaçon sont exclues. - -LIMITATION DES DOMMAGES-INTÉRÊTS ET EXCLUSION DE RESPONSABILITÉ POUR LES -DOMMAGES. Vous pouvez obtenir de Microsoft et de ses fournisseurs une -indemnisation en cas de dommages directs uniquement à hauteur de 5,00 $ US. Vous -ne pouvez prétendre à aucune indemnisation pour les autres dommages, y compris -les dommages spéciaux, indirects ou accessoires et pertes de bénéfices. - -Cette limitation concerne: - -- tout ce qui est relié au logiciel, aux services ou au contenu (y compris le - code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et - -- les réclamations au titre de violation de contrat ou de garantie, ou au titre - de responsabilité stricte, de négligence ou d’une autre faute dans la limite - autorisée par la loi en vigueur. - -Elle s’applique également, même si Microsoft connaissait ou devrait connaître -l’éventualité d’un tel dommage. Si votre pays n’autorise pas l’exclusion ou la -limitation de responsabilité pour les dommages indirects, accessoires ou de -quelque nature que ce soit, il se peut que la limitation ou l’exclusion -ci-dessus ne s’appliquera pas à votre égard. - -EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous -pourriez avoir d’autres droits prévus par les lois de votre pays. Le présent -contrat ne modifie pas les droits que vous confèrent les lois de votre pays si -celles-ci ne le permettent pas. diff --git a/ce/assets/package.json b/ce/assets/package.json index ca00bad3f6..72fcd69a33 100644 --- a/ce/assets/package.json +++ b/ce/assets/package.json @@ -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" @@ -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": { @@ -25,9 +25,8 @@ "**/*" ], "keywords": [ - "vcpkg-ce", - "vcpkg", - "ce" + "vcpkg-artifacts", + "vcpkg" ], "author": "Microsoft", "license": "MIT", diff --git a/ce/ce/readme.md b/ce/ce/readme.md deleted file mode 100644 index a80ef3149a..0000000000 --- a/ce/ce/readme.md +++ /dev/null @@ -1,16 +0,0 @@ -# vcpkg-ce Project - - -# Contributing -This project welcomes contributions and suggestions. Most contributions require you to agree to a -Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us -the rights to use your contribution. For details, visit https://cla.microsoft.com. - -When you submit a pull request, a CLA-bot will automatically determine whether you need to provide -a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions -provided by the bot. You will only need to do this once across all repos using our CLA. - -This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). -For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or -contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. - diff --git a/ce/test/readme.md b/ce/test/readme.md deleted file mode 100644 index a80ef3149a..0000000000 --- a/ce/test/readme.md +++ /dev/null @@ -1,16 +0,0 @@ -# vcpkg-ce Project - - -# Contributing -This project welcomes contributions and suggestions. Most contributions require you to agree to a -Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us -the rights to use your contribution. For details, visit https://cla.microsoft.com. - -When you submit a pull request, a CLA-bot will automatically determine whether you need to provide -a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions -provided by the bot. You will only need to do this once across all repos using our CLA. - -This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). -For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or -contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. - diff --git a/include/vcpkg/base/messages.h b/include/vcpkg/base/messages.h index 6b9758e616..5da1462517 100644 --- a/include/vcpkg/base/messages.h +++ b/include/vcpkg/base/messages.h @@ -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, @@ -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}"); diff --git a/locales/messages.json b/locales/messages.json index 4a8046853f..c2ee499868 100644 --- a/locales/messages.json +++ b/locales/messages.json @@ -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.", @@ -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}",