diff options
| -rw-r--r-- | Makefile | 25 | ||||
| -rw-r--r-- | build/ci.go | 20 |
2 files changed, 29 insertions, 16 deletions
@@ -2,12 +2,11 @@ # with Go source code. If you know what GOPATH is then you probably # don't need to bother with make. -.PHONY: geth geth-cross evm all test clean +.PHONY: geth android ios geth-cross evm all test clean .PHONY: geth-linux geth-linux-386 geth-linux-amd64 geth-linux-mips64 geth-linux-mips64le .PHONY: geth-linux-arm geth-linux-arm-5 geth-linux-arm-6 geth-linux-arm-7 geth-linux-arm64 .PHONY: geth-darwin geth-darwin-386 geth-darwin-amd64 .PHONY: geth-windows geth-windows-386 geth-windows-amd64 -.PHONY: geth-android geth-ios GOBIN = build/bin GO ?= latest @@ -20,11 +19,21 @@ geth: evm: build/env.sh go run build/ci.go install ./cmd/evm @echo "Done building." - @echo "Run \"$(GOBIN)/evm to start the evm." + @echo "Run \"$(GOBIN)/evm\" to start the evm." all: build/env.sh go run build/ci.go install +android: + build/env.sh go run build/ci.go aar --local + @echo "Done building." + @echo "Import \"$(GOBIN)/geth.aar\" to use the library." + +ios: + build/env.sh go run build/ci.go xcode --local + @echo "Done building." + @echo "Import \"$(GOBIN)/Geth.framework\" to use the library." + test: all build/env.sh go run build/ci.go test @@ -112,13 +121,3 @@ geth-windows-amd64: build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=windows/amd64 -v ./cmd/geth @echo "Windows amd64 cross compilation done:" @ls -ld $(GOBIN)/geth-windows-* | grep amd64 - -geth-android: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=android-21/aar -v ./cmd/geth - @echo "Android cross compilation done:" - @ls -ld $(GOBIN)/geth-android-* - -geth-ios: - build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=ios-7.0/framework -v ./cmd/geth - @echo "iOS framework cross compilation done:" - @ls -ld $(GOBIN)/geth-ios-* diff --git a/build/ci.go b/build/ci.go index 59f4acc02..61e8614ed 100644 --- a/build/ci.go +++ b/build/ci.go @@ -29,8 +29,8 @@ Available commands are: importkeys -- imports signing keys from env debsrc [ -signer key-id ] [ -upload dest ] -- creates a debian source package nsis -- creates a Windows NSIS installer - aar [ -sign key-id ] [-deploy repo] [ -upload dest ] -- creates an Android archive - xcode [ -sign key-id ] [-deploy repo] [ -upload dest ] -- creates an iOS XCode framework + aar [ -local ] [ -sign key-id ] [-deploy repo] [ -upload dest ] -- creates an Android archive + xcode [ -local ] [ -sign key-id ] [-deploy repo] [ -upload dest ] -- creates an iOS XCode framework xgo [ options ] -- cross builds according to options For all commands, -n prevents execution of external programs (dry run mode). @@ -654,6 +654,7 @@ func doWindowsInstaller(cmdline []string) { func doAndroidArchive(cmdline []string) { var ( + 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")`) @@ -666,6 +667,11 @@ func doAndroidArchive(cmdline []string) { build.MustRun(gomobileTool("init")) build.MustRun(gomobileTool("bind", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/ethereum/go-ethereum/mobile")) + if *local { + // If we're building locally, copy bundle to build dir and skip Maven + os.Rename("geth.aar", filepath.Join(GOBIN, "geth.aar")) + return + } meta := newMavenMetadata(env) build.Render("build/mvn.pom", meta.Package+".pom", 0755, meta) @@ -768,6 +774,7 @@ func newMavenMetadata(env build.Environment) mavenMetadata { func doXCodeFramework(cmdline []string) { var ( + 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")`) @@ -777,12 +784,19 @@ func doXCodeFramework(cmdline []string) { // Build the iOS XCode framework build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile")) + build.MustRun(gomobileTool("init")) + bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "--prefix", "GE", "-v", "github.com/ethereum/go-ethereum/mobile") + if *local { + // If we're building locally, use the build folder and stop afterwards + bind.Dir, _ = filepath.Abs(GOBIN) + build.MustRun(bind) + return + } archive := "geth-" + archiveBasename("ios", env) if err := os.Mkdir(archive, os.ModePerm); err != nil { log.Fatal(err) } - bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "--prefix", "GE", "-v", "github.com/ethereum/go-ethereum/mobile") bind.Dir, _ = filepath.Abs(archive) build.MustRun(bind) build.MustRunCommand("tar", "-zcvf", archive+".tar.gz", archive) |