-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
187 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| node_modules | ||
| .idea | ||
| .task | ||
| .vs/ | ||
| .vscode | ||
| *.DS_Store | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| version: '3' | ||
|
|
||
| includes: | ||
| client:tun2socks: ./client/src/tun2socks/Taskfile.yml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| version: '3' | ||
|
|
||
| run: when_changed | ||
|
|
||
| vars: | ||
| # This needs to be updated if the file moves. | ||
| # TODO: Output to $REPO_ROOT/output/client/tun2socks instead. | ||
| OUT_DIR: | ||
| sh: "readlink -f '{{.TASKFILE_DIR}}/../../output/build'" | ||
| BIN_DIR: "{{.OUT_DIR}}/build" | ||
| VERSION: "v1.16.11" | ||
| # -w disable DWARF generation | ||
| LD_FLAGS: "-static -w -X main.version={{.VERSION}}" | ||
| ELECTRON_MAIN_PKG: "{{.TASKFILE_DIR}}/outline/electron" | ||
| MOBILE_PKG: "{{.TASKFILE_DIR}}/outline/tun2socks" | ||
| GOMOBILE_BIND_CMD: "env PATH=\"{{.BIN_DIR}}:${PATH}\" '{{.BIN_DIR}}/gomobile' bind -ldflags '-w'" | ||
|
|
||
| tasks: | ||
| windows: | ||
| desc: "Build tun2socks binary for Windows" | ||
| vars: | ||
| TARGET_DIR: "{{.OUT_DIR}}/windows" | ||
| cmds: | ||
| - rm -rf "{{.TARGET_DIR}}" && mkdir -p "{{.TARGET_DIR}}" | ||
| - GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC='zig cc -target x86_64-windows' go build -trimpath -ldflags=--extldflags='{{.LD_FLAGS}}' -o '{{.TARGET_DIR}}/tun2socks.exe' '{{.ELECTRON_MAIN_PKG}}' | ||
|
|
||
| linux: | ||
| desc: "Build the tun2socks binary for Linux" | ||
| vars: | ||
| TARGET_DIR: '{{.OUT_DIR}}/linux' | ||
| cmds: | ||
| - rm -rf "{{.TARGET_DIR}}" && mkdir -p "{{.TARGET_DIR}}" | ||
| - GOOS=linux GOARCH=amd64 CGO_ENABLED=1 CC='zig cc -target x86_64-linux' go build -trimpath -ldflags=--extldflags='{{.LD_FLAGS}}' -o '{{.TARGET_DIR}}/tun2socks' '{{.ELECTRON_MAIN_PKG}}' | ||
|
|
||
| android: | ||
| desc: "Build the tun2socks.aar library for Android" | ||
| vars: | ||
| TARGET_DIR: "{{.OUT_DIR}}/android" | ||
| cmds: | ||
| - rm -rf "{{.TARGET_DIR}}" && mkdir -p "{{.TARGET_DIR}}" | ||
| # -androidapi should match the minSdkVersion that the Android client supports. | ||
| - "{{.GOMOBILE_BIND_CMD}} -target=android -androidapi 22 -o '{{.TARGET_DIR}}/tun2socks.aar' '{{.TASKFILE_DIR}}/outline/tun2socks' '{{.TASKFILE_DIR}}/outline/shadowsocks'" | ||
| deps: ["gomobile"] | ||
|
|
||
| ios: | ||
| desc: "Build the Tun2socks.xcframework library for iOS" | ||
| vars: | ||
| TARGET_DIR: '{{.OUT_DIR}}/ios' | ||
| cmds: | ||
| - rm -rf "{{.TARGET_DIR}}" && mkdir -p "{{.TARGET_DIR}}" | ||
| # -iosversion should match the target version that the iOS client supports. | ||
| - "{{.GOMOBILE_BIND_CMD}} -target=ios,iossimulator -iosversion=12.0 -bundleid org.outline.tun2socks -o '{{.TARGET_DIR}}/Tun2socks.xcframework' '{{.TASKFILE_DIR}}/outline/tun2socks' '{{.TASKFILE_DIR}}/outline/shadowsocks'" | ||
| deps: ["gomobile"] | ||
|
|
||
| macos: | ||
| desc: "Build the Tun2socks.xcframework library for macOS" | ||
| vars: | ||
| TARGET_DIR: '{{.OUT_DIR}}/macos' | ||
| cmds: | ||
| - rm -rf "{{.TARGET_DIR}}" && mkdir -p "{{.TARGET_DIR}}" | ||
| # MACOSX_DEPLOYMENT_TARGET and -iosversion should match the versions that the macOS client supports. | ||
| - export MACOSX_DEPLOYMENT_TARGET=10.14; {{.GOMOBILE_BIND_CMD}} -target=macos,maccatalyst -iosversion=13.1 -bundleid org.outline.tun2socks -o '{{.TARGET_DIR}}/Tun2socks.xcframework' '{{.TASKFILE_DIR}}/outline/tun2socks' '{{.TASKFILE_DIR}}/outline/shadowsocks' | ||
| deps: ["gomobile"] | ||
|
|
||
| apple: | ||
| desc: "Build combined Tun2socks.xcframework library for Apple platforms" | ||
| vars: | ||
| TARGET_DIR: '{{.OUT_DIR}}/apple' | ||
| cmds: | ||
| - rm -rf "{{.TARGET_DIR}}" && mkdir -p "{{.TARGET_DIR}}" | ||
| - | | ||
| find '{{.OUT_DIR}}/macos/Tun2socks.xcframework' '{{.OUT_DIR}}/ios/Tun2socks.xcframework' -name "Tun2socks.framework" -type d | | ||
| xargs -I {} echo " -framework {} " | | ||
| xargs xcrun xcodebuild -create-xcframework -output '{{.TARGET_DIR}}/Tun2socks.xcframework' | ||
| deps: ["ios", "macos"] | ||
|
|
||
| gomobile: | ||
| desc: "Build Go Mobile" | ||
| cmds: | ||
| - mkdir -p "{{.BIN_DIR}}" | ||
| - go build -o "{{.BIN_DIR}}" golang.org/x/mobile/cmd/gomobile golang.org/x/mobile/cmd/gobind | ||
| sources: ["{{.REPO_ROOT}}/go.sum"] | ||
| generates: ["{{.BIN_DIR}}/gomobile", "{{.BIN_DIR}}/gobind"] | ||
|
|
||
| clean: | ||
| cmds: | ||
| - rm -r "{{.REPO_ROOT}}/output/client/tun2socks" .task | ||
| - go clean -i -r '{{.TASKFILE_DIR}}/outline/tun2socks' '{{.TASKFILE_DIR}}/outline/shadowsocks' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,44 @@ | ||
| module github.com/Jigsaw-Code/outline-apps | ||
|
|
||
| go 1.20 | ||
| go 1.21 | ||
|
|
||
| toolchain go1.22.1 | ||
|
|
||
| require ( | ||
| github.com/Jigsaw-Code/outline-sdk v0.0.14-0.20240216220040-f741c57bf854 | ||
| github.com/Jigsaw-Code/outline-sdk/x v0.0.0-20240223000159-142376ee10ea | ||
| github.com/crazy-max/xgo v0.30.0 | ||
| github.com/eycorsican/go-tun2socks v1.16.11 | ||
| github.com/stretchr/testify v1.8.2 | ||
| github.com/go-task/task/v3 v3.36.0 | ||
| github.com/stretchr/testify v1.9.0 | ||
| golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a | ||
| golang.org/x/sys v0.15.0 | ||
| golang.org/x/sys v0.19.0 | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/Masterminds/semver/v3 v3.2.1 // indirect | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/fatih/color v1.16.0 // indirect | ||
| github.com/go-task/slim-sprig/v3 v3.0.0 // indirect | ||
| github.com/joho/godotenv v1.5.1 // indirect | ||
| github.com/klauspost/cpuid/v2 v2.0.9 // indirect | ||
| github.com/mattn/go-colorable v0.1.13 // indirect | ||
| github.com/mattn/go-isatty v0.0.20 // indirect | ||
| github.com/mattn/go-zglob v0.0.4 // indirect | ||
| github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect | ||
| github.com/pmezard/go-difflib v1.0.0 // indirect | ||
| github.com/radovskyb/watcher v1.0.7 // indirect | ||
| github.com/sajari/fuzzy v1.0.0 // indirect | ||
| github.com/shadowsocks/go-shadowsocks2 v0.1.5 // indirect | ||
| github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 // indirect | ||
| golang.org/x/crypto v0.17.0 // indirect | ||
| github.com/spf13/pflag v1.0.5 // indirect | ||
| github.com/zeebo/xxh3 v1.0.2 // indirect | ||
| golang.org/x/crypto v0.18.0 // indirect | ||
| golang.org/x/mod v0.14.0 // indirect | ||
| golang.org/x/net v0.19.0 // indirect | ||
| golang.org/x/sync v0.5.0 // indirect | ||
| golang.org/x/tools v0.16.0 // indirect | ||
| golang.org/x/net v0.20.0 // indirect | ||
| golang.org/x/sync v0.7.0 // indirect | ||
| golang.org/x/term v0.19.0 // indirect | ||
| golang.org/x/tools v0.17.0 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| mvdan.cc/sh/v3 v3.8.0 // indirect | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters