d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
27 lines
835 B
Bash
Executable File
27 lines
835 B
Bash
Executable File
#!/bin/bash
|
|
set -e
|
|
cd $(dirname $0)
|
|
case $1 in
|
|
darwin)
|
|
set -x
|
|
go build -ldflags '-s -w' -buildmode=c-shared -o libooniffi.so .
|
|
clang++ -std=c++11 -Wall -Wextra -I. -L. -o ffirun -looniffi ./testdata/ffirun.cpp
|
|
./ffirun testdata/webconnectivity.json
|
|
;;
|
|
linux)
|
|
set -x
|
|
go build -ldflags '-s -w' -buildmode=c-shared -o libooniffi.so .
|
|
g++ -std=c++11 -Wall -Wextra -I. -L. -o ffirun ./testdata/ffirun.cpp -looniffi
|
|
LD_LIBRARY_PATH=. ./ffirun testdata/webconnectivity.json
|
|
;;
|
|
windows)
|
|
set -x
|
|
go build -ldflags '-s -w' -buildmode=c-shared -o libooniffi.dll .
|
|
x86_64-w64-mingw32-g++ -std=c++11 -Wall -Wextra -I. -L. -o ffirun.exe -looniffi ./testdata/ffirun.cpp
|
|
./ffirun.exe testdata/webconnectivity.json
|
|
;;
|
|
*)
|
|
echo "usage: $0 darwin|linux|windows" 1>&2
|
|
exit 1
|
|
esac
|