forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: Change references to COPYING file

Browse source
This commit is contained in:
wbt 2020-02-14 15:23:38 -05:00 committed by GitHub
parent 855690523a
commit 4f7ba3d326
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build/ci.go
View file

@ -66,13 +66,13 @@ import (
var ( var (
// Files that end up in the geth*.zip archive. // Files that end up in the geth*.zip archive.
gethArchiveFiles = []string{ gethArchiveFiles = []string{
"COPYING", "COPYING.txt",
executablePath("geth"), executablePath("geth"),
} }
// Files that end up in the geth-alltools*.zip archive. // Files that end up in the geth-alltools*.zip archive.
allToolsArchiveFiles = []string{ allToolsArchiveFiles = []string{
"COPYING", "COPYING.txt",
executablePath("abigen"), executablePath("abigen"),
executablePath("bootnode"), executablePath("bootnode"),
executablePath("evm"), executablePath("evm"),
@ -764,7 +764,7 @@ func doWindowsInstaller(cmdline []string) {
gethTool string gethTool string
) )
for _, file := range allToolsArchiveFiles { for _, file := range allToolsArchiveFiles {
if file == "COPYING" { // license, copied later if file == "COPYING.txt" { // license, copied later
continue continue
} }
allTools = append(allTools, filepath.Base(file)) allTools = append(allTools, filepath.Base(file))
@ -778,7 +778,7 @@ func doWindowsInstaller(cmdline []string) {
// Render NSIS scripts: Installer NSIS contains two installer sections, // Render NSIS scripts: Installer NSIS contains two installer sections,
// first section contains the geth binary, second section holds the dev tools. // first section contains the geth binary, second section holds the dev tools.
templateData := map[string]interface{}{ templateData := map[string]interface{}{
"License": "COPYING", "License": "COPYING.txt",
"Geth": gethTool, "Geth": gethTool,
"DevTools": devTools, "DevTools": devTools,
} }
@ -790,7 +790,7 @@ func doWindowsInstaller(cmdline []string) {
if err := cp.CopyFile(filepath.Join(*workdir, "SimpleFC.dll"), "build/nsis.simplefc.dll"); err != nil { if err := cp.CopyFile(filepath.Join(*workdir, "SimpleFC.dll"), "build/nsis.simplefc.dll"); err != nil {
log.Fatal("Failed to copy SimpleFC.dll: %v", err) log.Fatal("Failed to copy SimpleFC.dll: %v", err)
} }
if err := cp.CopyFile(filepath.Join(*workdir, "COPYING"), "COPYING"); err != nil { if err := cp.CopyFile(filepath.Join(*workdir, "COPYING.txt"), "COPYING.txt"); err != nil {
log.Fatal("Failed to copy copyright note: %v", err) log.Fatal("Failed to copy copyright note: %v", err)
} }
// Build the installer. This assumes that all the needed files have been previously // Build the installer. This assumes that all the needed files have been previously