diff --git a/build/ci.go b/build/ci.go index 4569e339f9..5fec1e9d6e 100644 --- a/build/ci.go +++ b/build/ci.go @@ -67,7 +67,7 @@ var ( // Files that end up in the geth*.zip archive. gethArchiveFiles = []string{ "COPYING", - executablePath("geth"), + executablePath("worldland"), } // Files that end up in the geth-alltools*.zip archive. @@ -76,7 +76,7 @@ var ( executablePath("abigen"), executablePath("bootnode"), executablePath("evm"), - executablePath("geth"), + executablePath("worldland"), executablePath("puppeth"), executablePath("rlpdump"), executablePath("clef"), @@ -97,8 +97,8 @@ var ( Description: "Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode.", }, { - BinaryName: "geth", - Description: "Ethereum CLI client.", + BinaryName: "worldland", + Description: "Worldland CLI client.", }, { BinaryName: "puppeth", @@ -949,7 +949,7 @@ func doWindowsInstaller(cmdline []string) { continue } allTools = append(allTools, filepath.Base(file)) - if filepath.Base(file) == "geth.exe" { + if filepath.Base(file) == "worldland.exe" { gethTool = file } else { devTools = append(devTools, file) @@ -957,13 +957,13 @@ func doWindowsInstaller(cmdline []string) { } // 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 worldland binary, second section holds the dev tools. templateData := map[string]interface{}{ - "License": "COPYING", - "Geth": gethTool, - "DevTools": devTools, + "License": "COPYING", + "Worldland": gethTool, + "DevTools": devTools, } - build.Render("build/nsis.geth.nsi", filepath.Join(*workdir, "geth.nsi"), 0644, nil) + build.Render("build/nsis.worldland.nsi", filepath.Join(*workdir, "worldland.nsi"), 0644, nil) build.Render("build/nsis.install.nsh", filepath.Join(*workdir, "install.nsh"), 0644, templateData) 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) @@ -981,7 +981,7 @@ func doWindowsInstaller(cmdline []string) { if env.Commit != "" { version[2] += "-" + env.Commit[:8] } - installer, err := filepath.Abs("geth-" + archiveBasename(*arch, params.ArchiveVersion(env.Commit)) + ".exe") + installer, err := filepath.Abs("worldland-" + archiveBasename(*arch, params.ArchiveVersion(env.Commit)) + ".exe") if err != nil { log.Fatalf("Failed to convert installer file path: %v", err) } @@ -991,7 +991,7 @@ func doWindowsInstaller(cmdline []string) { "/DMINORVERSION="+version[1], "/DBUILDVERSION="+version[2], "/DARCH="+*arch, - filepath.Join(*workdir, "geth.nsi"), + filepath.Join(*workdir, "worldland.nsi"), ) // Sign and publish installer. if err := archiveUpload(installer, *upload, *signer, *signify); err != nil { diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index c14e0bd1f6..c6961e0439 100644 --- a/build/nsis.install.nsh +++ b/build/nsis.install.nsh @@ -1,4 +1,4 @@ -Name "geth ${MAJORVERSION}.${MINORVERSION}.${BUILDVERSION}" # VERSION variables set through command line arguments +Name "worldland ${MAJORVERSION}.${MINORVERSION}.${BUILDVERSION}" # VERSION variables set through command line arguments InstallDir "$InstDir" OutFile "${OUTPUTFILE}" # set through command line arguments @@ -12,30 +12,30 @@ PageEx license LicenseData {{.License}} PageExEnd -# Install geth binary -Section "Geth" GETH_IDX +# Install worldland binary +Section "Worldland" WORLDLAND_IDX SetOutPath $INSTDIR - file {{.Geth}} + file {{.Worldland}} # Create start menu launcher createDirectory "$SMPROGRAMS\${APPNAME}" - createShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\geth.exe" - createShortCut "$SMPROGRAMS\${APPNAME}\Attach.lnk" "$INSTDIR\geth.exe" "attach" + createShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\worldland.exe" + createShortCut "$SMPROGRAMS\${APPNAME}\Attach.lnk" "$INSTDIR\worldland.exe" "attach" createShortCut "$SMPROGRAMS\${APPNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" # Firewall - remove rules (if exists) - SimpleFC::AdvRemoveRule "Geth incoming peers (TCP:30303)" - SimpleFC::AdvRemoveRule "Geth outgoing peers (TCP:30303)" - SimpleFC::AdvRemoveRule "Geth UDP discovery (UDP:30303)" + SimpleFC::AdvRemoveRule "WorldLand incoming peers (TCP:30303)" + SimpleFC::AdvRemoveRule "WorldLand outgoing peers (TCP:30303)" + SimpleFC::AdvRemoveRule "WorldLand UDP discovery (UDP:30303)" # Firewall - add rules - SimpleFC::AdvAddRule "Geth incoming peers (TCP:30303)" "" 6 1 1 2147483647 1 "$INSTDIR\geth.exe" "" "" "Ethereum" 30303 "" "" "" - SimpleFC::AdvAddRule "Geth outgoing peers (TCP:30303)" "" 6 2 1 2147483647 1 "$INSTDIR\geth.exe" "" "" "Ethereum" "" 30303 "" "" - SimpleFC::AdvAddRule "Geth UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\geth.exe" "" "" "Ethereum" "" 30303 "" "" + SimpleFC::AdvAddRule "WorldLand incoming peers (TCP:30303)" "" 6 1 1 2147483647 1 "$INSTDIR\worldland.exe" "" "" "WorldLand" 30303 "" "" "" + SimpleFC::AdvAddRule "WorldLand outgoing peers (TCP:30303)" "" 6 2 1 2147483647 1 "$INSTDIR\worldland.exe" "" "" "WorldLand" "" 30303 "" "" + SimpleFC::AdvAddRule "WorldLand UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\worldland.exe" "" "" "WorldLand" "" 30303 "" "" # Set default IPC endpoint (https://github.com/ethereum/EIPs/issues/147) - ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc" - ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\geth.ipc" + ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\worldland.ipc" + ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\worldland.ipc" # Add instdir to PATH Push "$INSTDIR" @@ -54,8 +54,8 @@ Var GetInstalledSize.total Function GetInstalledSize StrCpy $GetInstalledSize.total 0 - ${if} ${SectionIsSelected} ${GETH_IDX} - SectionGetSize ${GETH_IDX} $0 + ${if} ${SectionIsSelected} ${WORLDLAND_IDX} + SectionGetSize ${WORLDLAND_IDX} $0 IntOp $GetInstalledSize.total $GetInstalledSize.total + $0 ${endif} diff --git a/build/nsis.uninstall.nsh b/build/nsis.uninstall.nsh index 6358faa74e..835e278635 100644 --- a/build/nsis.uninstall.nsh +++ b/build/nsis.uninstall.nsh @@ -17,12 +17,12 @@ Section "Uninstall" rmDir "$SMPROGRAMS\${APPNAME}" # Firewall - remove rules if exists - SimpleFC::AdvRemoveRule "Geth incoming peers (TCP:30303)" - SimpleFC::AdvRemoveRule "Geth outgoing peers (TCP:30303)" - SimpleFC::AdvRemoveRule "Geth UDP discovery (UDP:30303)" + SimpleFC::AdvRemoveRule "Worldland incoming peers (TCP:30303)" + SimpleFC::AdvRemoveRule "Worldland outgoing peers (TCP:30303)" + SimpleFC::AdvRemoveRule "Worldland UDP discovery (UDP:30303)" # Remove IPC endpoint (https://github.com/ethereum/EIPs/issues/147) - ${un.EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc" + ${un.EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\worldland.ipc" # Remove install directory from PATH Push "$INSTDIR"