Merge pull request #3362 from karalabe/cocoapods-fix-3000

build: use single CocoaPods package, pre-release dev builds
This commit is contained in:
Péter Szilágyi 2016-11-28 13:28:02 +02:00 committed by GitHub
commit ba41efa8a0
2 changed files with 6 additions and 8 deletions

View File

@ -826,13 +826,12 @@ func doXCodeFramework(cmdline []string) {
// Prepare and upload a PodSpec to CocoaPods // Prepare and upload a PodSpec to CocoaPods
if *deploy != "" { if *deploy != "" {
meta := newPodMetadata(env, archive) meta := newPodMetadata(env, archive)
build.Render("build/pod.podspec", meta.Name+".podspec", 0755, meta) build.Render("build/pod.podspec", "Geth.podspec", 0755, meta)
build.MustRunCommand("pod", *deploy, "push", meta.Name+".podspec", "--allow-warnings", "--verbose") build.MustRunCommand("pod", *deploy, "push", "Geth.podspec", "--allow-warnings", "--verbose")
} }
} }
type podMetadata struct { type podMetadata struct {
Name string
Version string Version string
Commit string Commit string
Archive string Archive string
@ -865,14 +864,13 @@ func newPodMetadata(env build.Environment, archive string) podMetadata {
} }
} }
} }
name := "Geth" version := build.VERSION()
if isUnstableBuild(env) { if isUnstableBuild(env) {
name += "Develop" version += "-unstable." + env.Buildnum
} }
return podMetadata{ return podMetadata{
Name: name,
Archive: archive, Archive: archive,
Version: build.VERSION(), Version: version,
Commit: env.Commit, Commit: env.Commit,
Contributors: contribs, Contributors: contribs,
} }

View File

@ -1,5 +1,5 @@
Pod::Spec.new do |spec| Pod::Spec.new do |spec|
spec.name = '{{.Name}}' spec.name = 'Geth'
spec.version = '{{.Version}}' spec.version = '{{.Version}}'
spec.license = { :type => 'GNU Lesser General Public License, Version 3.0' } spec.license = { :type => 'GNU Lesser General Public License, Version 3.0' }
spec.homepage = 'https://github.com/ethereum/go-ethereum' spec.homepage = 'https://github.com/ethereum/go-ethereum'