From a8d36956d53e4759d22cf201306138b63bbbcd35 Mon Sep 17 00:00:00 2001 From: Philipp Wollermann Date: Fri, 17 Feb 2017 12:21:21 +0000 Subject: Export Bazel's LICENSE file using our normal repo sync process. -- PiperOrigin-RevId: 147825291 MOS_MIGRATED_REVID=147825291 --- scripts/packages/chocolatey/.gitignore | 2 +- scripts/packages/chocolatey/bazel.nuspec.template | 2 +- scripts/packages/chocolatey/build.ps1 | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'scripts/packages') diff --git a/scripts/packages/chocolatey/.gitignore b/scripts/packages/chocolatey/.gitignore index d7b988a0ac..6bf4f7c838 100644 --- a/scripts/packages/chocolatey/.gitignore +++ b/scripts/packages/chocolatey/.gitignore @@ -2,5 +2,5 @@ *.zip bazel.nuspec tools/*.exe -tools/LICENSE.txt +tools/LICENSE tools/params.json diff --git a/scripts/packages/chocolatey/bazel.nuspec.template b/scripts/packages/chocolatey/bazel.nuspec.template index 3d64d5fe32..9b673a5528 100644 --- a/scripts/packages/chocolatey/bazel.nuspec.template +++ b/scripts/packages/chocolatey/bazel.nuspec.template @@ -42,7 +42,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe https://cdn.rawgit.com/bazelbuild/bazel/master/site/images/bazel-logo.png Copyright 2016 The Bazel Authors. All rights reserved. - https://github.com/bazelbuild/bazel/tree/master/LICENSE.txt + https://github.com/bazelbuild/bazel/tree/master/LICENSE true https://github.com/bazelbuild/bazel.git https://www.bazel.build/versions/master/docs/getting-started.html diff --git a/scripts/packages/chocolatey/build.ps1 b/scripts/packages/chocolatey/build.ps1 index fc60fb675f..ae1d594163 100644 --- a/scripts/packages/chocolatey/build.ps1 +++ b/scripts/packages/chocolatey/build.ps1 @@ -31,7 +31,7 @@ if ($fixPackage -eq $true) { } rm -force -ErrorAction SilentlyContinue ./*.nupkg rm -force -ErrorAction SilentlyContinue ./bazel.nuspec -rm -force -ErrorAction SilentlyContinue ./tools/LICENSE.txt +rm -force -ErrorAction SilentlyContinue ./tools/LICENSE rm -force -ErrorAction SilentlyContinue ./tools/params.json rm -force -ErrorAction SilentlyContinue ./tools/*.orig if ($checksum -eq "") { @@ -55,13 +55,13 @@ $nuspecTemplate = get-content "bazel.nuspec.template" | out-string $nuspecExpanded = $ExecutionContext.InvokeCommand.ExpandString($nuspecTemplate) add-content -value $nuspecExpanded -path bazel.nuspec -write-host "Copying LICENSE.txt from repo-root to tools directory" +write-host "Copying LICENSE from repo-root to tools directory" $licenseHeader = @" -From: https://github.com/bazelbuild/bazel/blob/master/LICENSE.txt +From: https://github.com/bazelbuild/bazel/blob/master/LICENSE "@ -add-content -value $licenseHeader -path "./tools/LICENSE.txt" -add-content -value (get-content "../../../LICENSE.txt") -path "./tools/LICENSE.txt" +add-content -value $licenseHeader -path "./tools/LICENSE" +add-content -value (get-content "../../../LICENSE") -path "./tools/LICENSE" $params = @{ package = @{ -- cgit v1.2.3