|
|
|
@ -59,6 +59,7 @@ import ( |
|
|
|
|
"strings" |
|
|
|
|
"time" |
|
|
|
|
|
|
|
|
|
"github.com/cespare/cp" |
|
|
|
|
"github.com/ethereum/go-ethereum/internal/build" |
|
|
|
|
"github.com/ethereum/go-ethereum/params" |
|
|
|
|
) |
|
|
|
@ -516,8 +517,9 @@ func doDebianSource(cmdline []string) { |
|
|
|
|
log.Fatalf("Failed to rename Go source folder: %v", err) |
|
|
|
|
} |
|
|
|
|
// Add all dependency modules in compressed form
|
|
|
|
|
build.CopyFolder(filepath.Join(pkgdir, ".mod", "cache", "download"), filepath.Join(gobuild.Default.GOPATH, "pkg", "mod", "cache", "download"), 0755) |
|
|
|
|
|
|
|
|
|
if err := cp.CopyAll(filepath.Join(pkgdir, ".mod", "cache", "download"), filepath.Join(gobuild.Default.GOPATH, "pkg", "mod", "cache", "download")); err != nil { |
|
|
|
|
log.Fatalf("Failed to copy Go module dependencies: %v", err) |
|
|
|
|
} |
|
|
|
|
// Run the packaging and upload to the PPA
|
|
|
|
|
debuild := exec.Command("debuild", "-S", "-sa", "-us", "-uc", "-d", "-Zxz") |
|
|
|
|
debuild.Dir = pkgdir |
|
|
|
@ -783,9 +785,12 @@ func doWindowsInstaller(cmdline []string) { |
|
|
|
|
build.Render("build/nsis.uninstall.nsh", filepath.Join(*workdir, "uninstall.nsh"), 0644, allTools) |
|
|
|
|
build.Render("build/nsis.pathupdate.nsh", filepath.Join(*workdir, "PathUpdate.nsh"), 0644, nil) |
|
|
|
|
build.Render("build/nsis.envvarupdate.nsh", filepath.Join(*workdir, "EnvVarUpdate.nsh"), 0644, nil) |
|
|
|
|
build.CopyFile(filepath.Join(*workdir, "SimpleFC.dll"), "build/nsis.simplefc.dll", 0755) |
|
|
|
|
build.CopyFile(filepath.Join(*workdir, "COPYING"), "COPYING", 0755) |
|
|
|
|
|
|
|
|
|
if err := cp.CopyFile(filepath.Join(*workdir, "SimpleFC.dll"), "build/nsis.simplefc.dll"); err != nil { |
|
|
|
|
log.Fatal("Failed to copy SimpleFC.dll: %v", err) |
|
|
|
|
} |
|
|
|
|
if err := cp.CopyFile(filepath.Join(*workdir, "COPYING"), "COPYING"); err != nil { |
|
|
|
|
log.Fatal("Failed to copy copyright note: %v", err) |
|
|
|
|
} |
|
|
|
|
// Build the installer. This assumes that all the needed files have been previously
|
|
|
|
|
// built (don't mix building and packaging to keep cross compilation complexity to a
|
|
|
|
|
// minimum).
|
|
|
|
@ -802,7 +807,6 @@ func doWindowsInstaller(cmdline []string) { |
|
|
|
|
"/DARCH="+*arch, |
|
|
|
|
filepath.Join(*workdir, "geth.nsi"), |
|
|
|
|
) |
|
|
|
|
|
|
|
|
|
// Sign and publish installer.
|
|
|
|
|
if err := archiveUpload(installer, *upload, *signer); err != nil { |
|
|
|
|
log.Fatal(err) |
|
|
|
|