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

chore: merge probe-engine into probe-cli (#201)

Browse source 
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
This commit is contained in:
Simone Basso 2021-02-02 12:05:47 +01:00 • committed by GitHub
commit d57c78bc71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
535 changed files with 66182 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/engine/MOBILE/README.md Normal file
View file

@ -0,0 +1,3 @@
# Directory github.com/ooni/probe-engine/MOBILE
This directory is used for building for Android and iOS.

13
internal/engine/MOBILE/template.podspec Normal file
View file

@ -0,0 +1,13 @@
Pod::Spec.new do |s|
s.name = "oonimkall"
s.version = "@VERSION@"
s.summary = "OONI Probe Engine for iOS"
s.author = "Simone Basso"
s.homepage = "https://github.com/ooni/probe-engine"
s.license = { :type => "BSD" }
s.source = {
:http => "https://dl.bintray.com/ooni/ios/oonimkall-@VERSION@.framework.zip"
}
s.platform = :ios, "9.0"
s.ios.vendored_frameworks = "oonimkall.framework"
end

33
internal/engine/MOBILE/template.pom Normal file
View file

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.ooni</groupId>
<artifactId>oonimkall</artifactId>
<version>@VERSION@</version>
<packaging>aar</packaging>
<name>oonimkall</name>
<description>OONI Probe Engine for Android</description>
<url>https://github.com/ooni/probe-engine</url>
<licenses>
<license>
<name>The 3-Clause BSD License</name>
<url>https://opensource.org/licenses/BSD-3-Clause</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<url>https://github.com/ooni/probe-engine</url>
<connection>https://github.com/ooni/probe-engine.git</connection>
</scm>
<developers>
<developer>
<name>Simone Basso</name>
<email>simone@openobservatory.org</email>
<roles>
<role>developer</role>
</roles>
<timezone>Europe/Rome</timezone>
</developer>
</developers>
</project>