From ac564204f6d4441eaa79ec08ec7a91e99bdb9a15 Mon Sep 17 00:00:00 2001
From: StevenWdV <stevenwdv@gmail.com>
Date: Wed, 9 Feb 2022 13:18:09 +0100
Subject: Cleanup, update indirect Go packages, support specifying list of
 wrappers to `test-wrappers`

---
 wrappers/java-android/README.md | 11 ++++++-----
 wrappers/php/Makefile           |  4 ++--
 wrappers/swift/README.md        |  5 ++++-
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'wrappers')

diff --git a/wrappers/java-android/README.md b/wrappers/java-android/README.md
index fe2660e..763c8d6 100644
--- a/wrappers/java-android/README.md
+++ b/wrappers/java-android/README.md
@@ -18,9 +18,10 @@ See the [list of Gradle releases](https://github.com/gradle/gradle/releases)
 and [list of Android Gradle plugin releases](https://maven.google.com/web/?q=com.android.tools.build#com.android.tools.build:gradle)
 .
 
-Versions are managed per project by the Gradle wrapper (see `gradle*` files). Run `./gradlew --version` to get the
-project Gradle version. Look at the dependencies in `/build.gradle` for the current Android Gradle plugin version. This
-means that you do not need to install Gradle separately yourself.
+Versions are managed per project by
+the [Gradle wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.html) (see `gradle*` files).
+Run `./gradlew --version` to get the project Gradle version. Look at the dependencies in `/build.gradle` for the current
+Android Gradle plugin version. This means that you do not need to install Gradle separately yourself.
 
 Currently, versions are Gradle 7.0.2 and Android Gradle plugin 7.0.4, which means you have to install a **JDK with a
 version between 11 and 16**. If desired, these can be upgraded to e.g. 7.4 and 7.1.1 respectively without problems, but
@@ -55,8 +56,8 @@ Run Android instrumented tests on a new emulator:
 make android-test
 ```
 
-This uses [Gradle managed virtual devices](https://developer.android.com/studio/preview/features#gmd). This feature is
-enabled in `gradle.properties`. It is normal that tests that pass are not logged.
+This uses [Gradle managed virtual devices](https://developer.android.com/studio/preview/features#gmd). This experimental
+feature is enabled in `gradle.properties`. It is normal that tests that pass are not logged.
 
 Run Android instrumented tests on an already running emulator:
 
diff --git a/wrappers/php/Makefile b/wrappers/php/Makefile
index f24eee7..758cfe3 100644
--- a/wrappers/php/Makefile
+++ b/wrappers/php/Makefile
@@ -9,7 +9,7 @@ export PATH := $(abspath vendor/bin):$(PATH)
 ifeq ($(COPY_LIB),1)
 COPY_LIB_DIR ?= lib
 endif
-ifneq ($(COPY_LIB_DIR),)
+ifdef COPY_LIB_DIR
 override COPY_LIB_DIR := $(COPY_LIB_DIR)/
 endif
 
@@ -27,7 +27,7 @@ install-header: .try-build-lib
 		-e 's/^/#define FFI_LIB "$(subst /,\/,$(COPY_LIB_DIR))$(LIB_FILE)"\n\n/' \
 		\
 		"$(EXPORTS_LIB_SUBFOLDER_PATH)/$(LIB_NAME).h" >src/headers/$(LIB_NAME)_php.h
-ifneq ($(COPY_LIB_DIR),)
+ifdef COPY_LIB_DIR
 	install "$(EXPORTS_LIB_SUBFOLDER_PATH)/$(LIB_FILE)" -Dt "$(COPY_LIB_DIR)"
 endif
 
diff --git a/wrappers/swift/README.md b/wrappers/swift/README.md
index 9b0fdfe..30642c4 100644
--- a/wrappers/swift/README.md
+++ b/wrappers/swift/README.md
@@ -19,7 +19,10 @@ Build `EduVpnCommon` using shared Go library for specified platform, e.g.:
 make GOOS=linux GOARCH=amd64
 ```
 
-When using this library, you will need to make sure that the linker can find the shared Go library.
+When using this library, you will need to make sure that the dynamic linker can find the shared Go library.
+
+Currently, `.dylib`s for multiple architectures generated by cgo are not merged into one. For a pointer on how to do
+this, see [this](https://stackoverflow.com/q/22783453).
 
 <details><summary>Windows</summary><small>
 On Windows, you will also need to generate a .lib import library for the .dll. You can
-- 
cgit v1.2.3