From a47513aeeb728b6316ba6765afdd7e5adbf4f2e3 Mon Sep 17 00:00:00 2001
From: StevenWdV <stevenwdv@gmail.com>
Date: Fri, 17 Dec 2021 15:21:53 +0100
Subject: Add PHP wrapper, use header for right platform for PHP & Swift,
 simplify Swift Windows fix

---
 wrappers/swift/.gitignore                          |  1 +
 .../Sources/CEduVpnCommon/module.modulemap         |  2 +-
 wrappers/swift/Makefile                            | 30 ++++++++++------------
 wrappers/swift/fix-path.cmd                        |  6 -----
 wrappers/swift/swift.cmd                           |  9 +++++++
 5 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 wrappers/swift/fix-path.cmd
 create mode 100755 wrappers/swift/swift.cmd

(limited to 'wrappers/swift')

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/fix-path.cmd
deleted file mode 100644
index d8a1e42..0000000
--- a/wrappers/swift/fix-path.cmd
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-:: Rename PATH -> Path
-set _p=%PATH%
-set PATH=
-set Path=%_p%
-set _p=
diff --git a/wrappers/swift/swift.cmd b/wrappers/swift/swift.cmd
new file mode 100755
index 0000000..87fba4b
--- /dev/null
+++ b/wrappers/swift/swift.cmd
@@ -0,0 +1,9 @@
+@echo off
+
+:: Rename PATH -> Path
+set _p=%PATH%
+set PATH=
+set Path=%_p%
+set _p=
+
+swift.exe %*
-- 
cgit v1.2.3