This commit is contained in:
Admin 2018-04-28 13:37:45 +07:00
parent 40dae5a761
commit 5d17b5dd1f
5 changed files with 29 additions and 29 deletions

View file

@ -63,7 +63,7 @@ import (
var (
// Files that end up in the getf*.zip archive.
gethArchiveFiles = []string{
getfArchiveFiles = []string{
"COPYING",
executablePath("getf"),
}
@ -352,7 +352,7 @@ func doArchive(cmdline []string) {
arch = flag.String("arch", runtime.GOARCH, "Architecture cross packaging")
atype = flag.String("type", "zip", "Type of archive to write (zip|tar)")
signer = flag.String("signer", "", `Environment variable holding the signing key (e.g. LINUX_SIGNING_KEY)`)
upload = flag.String("upload", "", `Destination to upload the archives (usually "gethstore/builds")`)
upload = flag.String("upload", "", `Destination to upload the archives (usually "getfstore/builds")`)
ext string
)
flag.CommandLine.Parse(cmdline)
@ -372,7 +372,7 @@ func doArchive(cmdline []string) {
alltools = "getf-alltools-" + base + ext
)
maybeSkipArchive(env)
if err := build.WriteArchive(getf, gethArchiveFiles); err != nil {
if err := build.WriteArchive(getf, getfArchiveFiles); err != nil {
log.Fatal(err)
}
if err := build.WriteArchive(alltools, allToolsArchiveFiles); err != nil {
@ -642,7 +642,7 @@ func doWindowsInstaller(cmdline []string) {
var (
arch = flag.String("arch", runtime.GOARCH, "Architecture for cross build packaging")
signer = flag.String("signer", "", `Environment variable holding the signing key (e.g. WINDOWS_SIGNING_KEY)`)
upload = flag.String("upload", "", `Destination to upload the archives (usually "gethstore/builds")`)
upload = flag.String("upload", "", `Destination to upload the archives (usually "getfstore/builds")`)
workdir = flag.String("workdir", "", `Output directory for packages (uses temp dir if unset)`)
)
flag.CommandLine.Parse(cmdline)
@ -654,7 +654,7 @@ func doWindowsInstaller(cmdline []string) {
var (
devTools []string
allTools []string
gethTool string
getfTool string
)
for _, file := range allToolsArchiveFiles {
if file == "COPYING" { // license, copied later
@ -662,7 +662,7 @@ func doWindowsInstaller(cmdline []string) {
}
allTools = append(allTools, filepath.Base(file))
if filepath.Base(file) == "getf.exe" {
gethTool = file
getfTool = file
} else {
devTools = append(devTools, file)
}
@ -672,7 +672,7 @@ func doWindowsInstaller(cmdline []string) {
// first section contains the getf binary, second section holds the dev tools.
templateData := map[string]interface{}{
"License": "COPYING",
"Geth": gethTool,
"Getf": getfTool,
"DevTools": devTools,
}
build.Render("build/nsis.getf.nsi", filepath.Join(*workdir, "getf.nsi"), 0644, nil)
@ -713,7 +713,7 @@ func doAndroidArchive(cmdline []string) {
local = flag.Bool("local", false, `Flag whether we're only doing a local build (skip Maven artifacts)`)
signer = flag.String("signer", "", `Environment variable holding the signing key (e.g. ANDROID_SIGNING_KEY)`)
deploy = flag.String("deploy", "", `Destination to deploy the archive (usually "https://oss.sonatype.org")`)
upload = flag.String("upload", "", `Destination to upload the archive (usually "gethstore/builds")`)
upload = flag.String("upload", "", `Destination to upload the archive (usually "getfstore/builds")`)
)
flag.CommandLine.Parse(cmdline)
env := build.Env()
@ -841,7 +841,7 @@ func doXCodeFramework(cmdline []string) {
local = flag.Bool("local", false, `Flag whether we're only doing a local build (skip Maven artifacts)`)
signer = flag.String("signer", "", `Environment variable holding the signing key (e.g. IOS_SIGNING_KEY)`)
deploy = flag.String("deploy", "", `Destination to deploy the archive (usually "trunk")`)
upload = flag.String("upload", "", `Destination to upload the archives (usually "gethstore/builds")`)
upload = flag.String("upload", "", `Destination to upload the archives (usually "getfstore/builds")`)
)
flag.CommandLine.Parse(cmdline)
env := build.Env()
@ -875,8 +875,8 @@ func doXCodeFramework(cmdline []string) {
// Prepare and upload a PodSpec to CocoaPods
if *deploy != "" {
meta := newPodMetadata(env, archive)
build.Render("build/pod.podspec", "Geth.podspec", 0755, meta)
build.MustRunCommand("pod", *deploy, "push", "Geth.podspec", "--allow-warnings", "--verbose")
build.Render("build/pod.podspec", "Getf.podspec", 0755, meta)
build.MustRunCommand("pod", *deploy, "push", "Getf.podspec", "--allow-warnings", "--verbose")
}
}
@ -981,7 +981,7 @@ func xgoTool(args []string) *exec.Cmd {
func doPurge(cmdline []string) {
var (
store = flag.String("store", "", `Destination from where to purge archives (usually "gethstore/builds")`)
store = flag.String("store", "", `Destination from where to purge archives (usually "getfstore/builds")`)
limit = flag.Int("days", 30, `Age threshold above which to delete unstalbe archives`)
)
flag.CommandLine.Parse(cmdline)

View file

@ -30,7 +30,7 @@
CRCCheck on
!define GROUPNAME "Ethereum"
!define APPNAME "Geth"
!define APPNAME "Getf"
!define DESCRIPTION "Official Go implementation of the Ethereum protocol"
!addplugindir .\

View file

@ -13,9 +13,9 @@ PageEx license
PageExEnd
# Install getf binary
Section "Geth" GETH_IDX
Section "Getf" GETF_IDX
SetOutPath $INSTDIR
file {{.Geth}}
file {{.Getf}}
# Create start menu launcher
createDirectory "$SMPROGRAMS\${APPNAME}"
@ -24,14 +24,14 @@ Section "Geth" GETH_IDX
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 "Getf incoming peers (TCP:30303)"
SimpleFC::AdvRemoveRule "Getf outgoing peers (TCP:30303)"
SimpleFC::AdvRemoveRule "Getf UDP discovery (UDP:30303)"
# Firewall - add rules
SimpleFC::AdvAddRule "Geth incoming peers (TCP:30303)" "" 6 1 1 2147483647 1 "$INSTDIR\getf.exe" "" "" "Ethereum" 30303 "" "" ""
SimpleFC::AdvAddRule "Geth outgoing peers (TCP:30303)" "" 6 2 1 2147483647 1 "$INSTDIR\getf.exe" "" "" "Ethereum" "" 30303 "" ""
SimpleFC::AdvAddRule "Geth UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\getf.exe" "" "" "Ethereum" "" 30303 "" ""
SimpleFC::AdvAddRule "Getf incoming peers (TCP:30303)" "" 6 1 1 2147483647 1 "$INSTDIR\getf.exe" "" "" "Ethereum" 30303 "" "" ""
SimpleFC::AdvAddRule "Getf outgoing peers (TCP:30303)" "" 6 2 1 2147483647 1 "$INSTDIR\getf.exe" "" "" "Ethereum" "" 30303 "" ""
SimpleFC::AdvAddRule "Getf UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\getf.exe" "" "" "Ethereum" "" 30303 "" ""
# Set default IPC endpoint (https://github.com/ethereum/EIPs/issues/147)
${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\getf.ipc"
@ -54,8 +54,8 @@ Var GetInstalledSize.total
Function GetInstalledSize
StrCpy $GetInstalledSize.total 0
${if} ${SectionIsSelected} ${GETH_IDX}
SectionGetSize ${GETH_IDX} $0
${if} ${SectionIsSelected} ${GETF_IDX}
SectionGetSize ${GETF_IDX} $0
IntOp $GetInstalledSize.total $GetInstalledSize.total + $0
${endif}

View file

@ -17,9 +17,9 @@ 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 "Getf incoming peers (TCP:30303)"
SimpleFC::AdvRemoveRule "Getf outgoing peers (TCP:30303)"
SimpleFC::AdvRemoveRule "Getf UDP discovery (UDP:30303)"
# Remove IPC endpoint (https://github.com/ethereum/EIPs/issues/147)
${un.EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\getf.ipc"

View file

@ -1,5 +1,5 @@
Pod::Spec.new do |spec|
spec.name = 'Geth'
spec.name = 'Getf'
spec.version = '{{.Version}}'
spec.license = { :type => 'GNU Lesser General Public License, Version 3.0' }
spec.homepage = 'https://github.com/ethereum/go-etherfact'
@ -11,12 +11,12 @@ Pod::Spec.new do |spec|
spec.platform = :ios
spec.ios.deployment_target = '9.0'
spec.ios.vendored_frameworks = 'Frameworks/Geth.framework'
spec.ios.vendored_frameworks = 'Frameworks/Getf.framework'
spec.prepare_command = <<-CMD
curl https://gethstore.blob.core.windows.net/builds/{{.Archive}}.tar.gz | tar -xvz
mkdir Frameworks
mv {{.Archive}}/Geth.framework Frameworks
mv {{.Archive}}/Getf.framework Frameworks
rm -rf {{.Archive}}
CMD
end