c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: replace ./make (python3) with ./mk (makefile) (#343)

Browse source 
This pull request fixes https://github.com/ooni/probe/issues/1471. We have replaced the original build script (`./make`) with the `./mk` makefile (executable using `#!/usr/bin/make -f`). We concluded supporting direct builds from Windows is not worth the effort and halving the code we need to maintain is probably a good plus. Both macOS and Linux install GNU make at `/usr/bin/make`, so we should be okay in the common use cases.

I significantly simplified the management of Go versioning by requiring the user to manage it and by enforcing that we are using the desired Go version. This speeds up builds and works in sane operating systems that use the last version of a specific package. Otherwise, it's possible to use the `go get golang.org/dl/go${version}` feature.

The remaining question mark was related to updating the Android SDK. I have determined that a good course of action is pinning to the latest CLI tools and always forcing the CLI tools to install the latest required packages (e.g., the NDK).
This commit is contained in:
Simone Basso 2021-05-11 16:15:13 +02:00 • committed by GitHub
commit b2209bb637
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 668 additions and 1480 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Readme.md
View file

@ -34,13 +34,13 @@ This will generate a binary called `ooniprobe` in the current directory.
## Android bindings
Make sure you have Python 3.8+ installed, then run:
Make sure you have GNU make installed, then run:
```bash
./make -t android
./mk android
```
Builds bindings for Android. (Add `----disable-embedding-psiphon-config` if you
Builds bindings for Android. (Add `OONI_PSIPHON_TAGS=""` if you
cannot clone private repositories in the https://github.com/ooni namespace.)
The generated bindings are (manually) pushed to the Maven Central package
@ -49,13 +49,13 @@ are published along with the release notes.
## iOS bindings
Make sure you have Python 3.8+ installed, then run:
Make sure you have GNU make installed, then run:
```bash
./make -t ios
./mk ios
```
Builds bindings for iOS. (Add `----disable-embedding-psiphon-config` if you
Builds bindings for iOS. (Add `OONI_PSIPHON_TAGS=""` if you
cannot clone private repositories in the https://github.com/ooni namespace.)
The generated bindings are (manually) added to GitHub releases. The instructions
@ -83,4 +83,5 @@ Create an issue according to [the routine release template](
https://github.com/ooni/probe/blob/master/.github/ISSUE_TEMPLATE/routine-sprint-releases.md)
and perform any item inside the check-list.
We build releases using `./make`, which requires Python3.8+.
We build releases using `./mk`, which requires GNU make. Try
the `./mk help|less` command for detailed usage.