Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Makefile): use ./script/go.bash #1482

Merged
merged 8 commits into from
Feb 1, 2024
Merged

feat(Makefile): use ./script/go.bash #1482

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2999e15
feat(buildtool): fetch and use correct go version
bassosimone Feb 1, 2024
8d31497
x
bassosimone Feb 1, 2024
1fc4683
x
bassosimone Feb 1, 2024
11bf2c7
Merge branch 'master' into fullbuild
bassosimone Feb 1, 2024
9c1bf89
x
bassosimone Feb 1, 2024
e984ee7
Merge branch 'master' into fullbuild
bassosimone Feb 1, 2024
50118ed
x
bassosimone Feb 1, 2024
688924f
x
bassosimone Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions Makefile
View file
Open in desktop
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
Loading