Skip to content

Commit

Permalink
feat(Makefile): use ./script/go.bash (#1482)
Browse files Browse the repository at this point in the history
By using ./script/go.bash in the `Makefile`, we ensure that we're using
the correct version of Go.

This should be enough to close
ooni/probe#2664.
  • Loading branch information
bassosimone authored Feb 1, 2024
1 parent e9dc6f1 commit 64c4394
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,80 +26,80 @@ help:
#help: command line clients for darwin/amd64 and darwin/arm64.
.PHONY: CLI/darwin
CLI/darwin:
go run ./internal/cmd/buildtool darwin
./script/go.bash run ./internal/cmd/buildtool darwin

#help:
#help: The `make CLI/linux-static-386` command builds and statically links the
#help: ooniprobe and miniooni binaries for linux/386.
.PHONY: CLI/linux-static-386
CLI/linux-static-386:
go run ./internal/cmd/buildtool linux docker 386
./script/go.bash run ./internal/cmd/buildtool linux docker 386

#help:
#help: The `make CLI/linux-static-amd64` command builds and statically links the
#help: ooniprobe and miniooni binaries for linux/amd64.
.PHONY: CLI/linux-static-amd64
CLI/linux-static-amd64:
go run ./internal/cmd/buildtool linux docker amd64
./script/go.bash run ./internal/cmd/buildtool linux docker amd64

#help:
#help: The `make CLI/linux-static-armv6` command builds and statically links the
#help: ooniprobe and miniooni binaries for linux/arm/v6.
.PHONY: CLI/linux-static-armv6
CLI/linux-static-armv6:
go run ./internal/cmd/buildtool linux docker armv6
./script/go.bash run ./internal/cmd/buildtool linux docker armv6

#help:
#help: The `make CLI/linux-static-armv7` command builds and statically links the
#help: ooniprobe and miniooni binaries for linux/arm/v7.
.PHONY: CLI/linux-static-armv7
CLI/linux-static-armv7:
go run ./internal/cmd/buildtool linux docker armv7
./script/go.bash run ./internal/cmd/buildtool linux docker armv7

#help:
#help: The `make CLI/linux-static-arm64` command builds and statically links the
#help: ooniprobe and miniooni binaries for linux/arm64.
.PHONY: CLI/linux-static-arm64
CLI/linux-static-arm64:
go run ./internal/cmd/buildtool linux docker arm64
./script/go.bash run ./internal/cmd/buildtool linux docker arm64

#help:
#help: The `make CLI/miniooni` command creates a build of miniooni, for the current
#help: system, putting the binary in the top-level directory.
.PHONY: CLI/miniooni
CLI/miniooni:
go run ./internal/cmd/buildtool generic miniooni
./script/go.bash run ./internal/cmd/buildtool generic miniooni

#help:
#help: The `make CLI/ooniprobe` command creates a build of ooniprobe, for the current
#help: system, putting the binary in the top-level directory.
.PHONY: CLI/ooniprobe
CLI/ooniprobe:
go run ./internal/cmd/buildtool generic ooniprobe
./script/go.bash run ./internal/cmd/buildtool generic ooniprobe

#help:
#help: The `make CLI/windows` command builds the ooniprobe and miniooni
#help: command line clients for windows/386 and windows/amd64.
.PHONY: CLI/windows
CLI/windows:
go run ./internal/cmd/buildtool windows
./script/go.bash run ./internal/cmd/buildtool windows

#help:
#help: The `make android` command builds the oonimkall library for Android
#help: and compiles miniooni and ooniprobe for android CLI usage.
.PHONY: android
android: search/for/java
go run ./internal/cmd/buildtool android cdeps zlib openssl libevent tor
go run ./internal/cmd/buildtool android cli
go run ./internal/cmd/buildtool android gomobile
./script/go.bash run ./internal/cmd/buildtool android cdeps zlib openssl libevent tor
./script/go.bash run ./internal/cmd/buildtool android cli
./script/go.bash run ./internal/cmd/buildtool android gomobile
./MOBILE/android/createpom

#help:
#help: The `make ios` command builds the oonimkall library for iOS.
.PHONY: ios
ios: search/for/zip search/for/xcode
go run ./internal/cmd/buildtool ios cdeps zlib openssl libevent tor
go run ./internal/cmd/buildtool ios gomobile
./script/go.bash run ./internal/cmd/buildtool ios cdeps zlib openssl libevent tor
./script/go.bash run ./internal/cmd/buildtool ios gomobile
./MOBILE/ios/make-extra-frameworks
./MOBILE/ios/zipframeworks
./MOBILE/ios/createpodspecs
Expand Down

0 comments on commit 64c4394

Please sign in to comment.