diff options
| author | StevenWdV <stevenwdv@gmail.com> | 2021-12-17 15:21:53 +0100 |
|---|---|---|
| committer | StevenWdV <stevenwdv@gmail.com> | 2021-12-17 15:24:59 +0100 |
| commit | a47513aeeb728b6316ba6765afdd7e5adbf4f2e3 (patch) | |
| tree | 2ebb3a6936af606b0276f67d4cebb446d60cc610 /wrappers/swift | |
| parent | a4d394a8794a254a102b8fa3bf311d4c59f9e9b5 (diff) | |
Add PHP wrapper, use header for right platform for PHP & Swift, simplify Swift Windows fix
Diffstat (limited to 'wrappers/swift')
| -rw-r--r-- | wrappers/swift/.gitignore | 1 | ||||
| -rw-r--r-- | wrappers/swift/CEduVpnCommon/Sources/CEduVpnCommon/module.modulemap | 2 | ||||
| -rw-r--r-- | wrappers/swift/Makefile | 30 | ||||
| -rwxr-xr-x[-rw-r--r--] | wrappers/swift/swift.cmd (renamed from wrappers/swift/fix-path.cmd) | 3 |
4 files changed, 18 insertions, 18 deletions
diff --git a/wrappers/swift/.gitignore b/wrappers/swift/.gitignore index 6481577..32d8b26 100644 --- a/wrappers/swift/.gitignore +++ b/wrappers/swift/.gitignore @@ -5,3 +5,4 @@ Packages/ xcuserdata/ DerivedData/ *.xcworkspacedata +*.h diff --git a/wrappers/swift/CEduVpnCommon/Sources/CEduVpnCommon/module.modulemap b/wrappers/swift/CEduVpnCommon/Sources/CEduVpnCommon/module.modulemap index f0f47a7..c85e48f 100644 --- a/wrappers/swift/CEduVpnCommon/Sources/CEduVpnCommon/module.modulemap +++ b/wrappers/swift/CEduVpnCommon/Sources/CEduVpnCommon/module.modulemap @@ -1,5 +1,5 @@ module CEduVpnCommon { - header "../../../../../exports/eduvpn_verify.h" + header "Headers/eduvpn_verify.h" link "eduvpn_verify" export * } diff --git a/wrappers/swift/Makefile b/wrappers/swift/Makefile index cf117f3..826dde3 100644 --- a/wrappers/swift/Makefile +++ b/wrappers/swift/Makefile @@ -5,27 +5,23 @@ GOOS != go env GOHOSTOS GOARCH != go env GOHOSTARCH ifeq (Windows_NT,$(OS)) -export PATH := $(PATH):$(abspath ../../exports/$(GOOS)/$(GOARCH)) +SWIFT = ./swift.cmd +export PATH := $(abspath ../../exports/$(GOOS)/$(GOARCH)):$(PATH) else -export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(abspath ../../exports/$(GOOS)/$(GOARCH)) +SWIFT = swift +export LD_LIBRARY_PATH := $(abspath ../../exports/$(GOOS)/$(GOARCH)):$(LD_LIBRARY_PATH) endif endif -build: - $(MAKE) -C ../../exports -ifeq (Windows_NT,$(OS)) - "$(COMSPEC)" /c "\".\\fix-path.cmd & swift build --configuration release -Xlinker -L^\"../../exports/$(GOOS)/$(GOARCH)^\"\"" -else - swift build --configuration release -Xlinker -L"../../exports/$(GOOS)/$(GOARCH)" -endif +build: .build_lib + $(SWIFT) build --configuration release -Xlinker -L"../../exports/$(GOOS)/$(GOARCH)" -test: - $(MAKE) -C ../../exports -ifeq (Windows_NT,$(OS)) - "$(COMSPEC)" /c "\".\\fix-path.cmd & swift test --parallel -Xlinker -L^\"../../exports/$(GOOS)/$(GOARCH)^\"\"" -else - swift test --parallel -Xlinker -L"../../exports/$(GOOS)/$(GOARCH)" -endif +test: .build_lib + $(SWIFT) test --parallel -Xlinker -L"../../exports/$(GOOS)/$(GOARCH)" clean: - rm -rf .build/ + rm -rf .build/ CEduVpnCommon/Sources/CEduVpnCommon/Headers/*.h + +.build_lib: + $(MAKE) -C ../../exports + install "../../exports/$(GOOS)/$(GOARCH)/eduvpn_verify.h" -Dt CEduVpnCommon/Sources/CEduVpnCommon/Headers diff --git a/wrappers/swift/fix-path.cmd b/wrappers/swift/swift.cmd index d8a1e42..87fba4b 100644..100755 --- a/wrappers/swift/fix-path.cmd +++ b/wrappers/swift/swift.cmd @@ -1,6 +1,9 @@ @echo off + :: Rename PATH -> Path set _p=%PATH% set PATH= set Path=%_p% set _p= + +swift.exe %* |