passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WireGuardApp: Remove backend version call in Logger.swift & extract wireguard-go version script from network extension targets 

Signed-off-by: Andrej Mihajlov <and@mullvad.net>
This commit is contained in:
Andrej Mihajlov 2020-12-04 11:01:36 +01:00
parent d440a91b0e
commit b4ebe2440f
3 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Sources/Shared/Logging/Logger.swift
View File

@ -49,7 +49,8 @@ public class Logger {
if let appBuild = Bundle.main.infoDictionary?["CFBundleVersion"] as? String { if let appBuild = Bundle.main.infoDictionary?["CFBundleVersion"] as? String {
appVersion += " (\(appBuild))" appVersion += " (\(appBuild))"
} }
Logger.global?.log(message: "App version: \(appVersion); Go backend version: \(WIREGUARD_GO_VERSION)")
Logger.global?.log(message: "App version: \(appVersion)")
} }
} }

1
Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h
View File

@ -1,4 +1,3 @@
#include "../WireGuardKitC/WireGuardKitC.h" #include "../WireGuardKitC/WireGuardKitC.h"
#include "../WireGuardKitGo/wireguard.h" #include "../WireGuardKitGo/wireguard.h"
#include "wireguard-go-version.h"
#include "ringlogger.h" #include "ringlogger.h"

38
WireGuard.xcodeproj/project.pbxproj
View File

@ -839,7 +839,6 @@
buildConfigurationList = 6F5D0C25218352EF000F85AD /* Build configuration list for PBXNativeTarget "WireGuardNetworkExtensioniOS" */; buildConfigurationList = 6F5D0C25218352EF000F85AD /* Build configuration list for PBXNativeTarget "WireGuardNetworkExtensioniOS" */;
buildPhases = ( buildPhases = (
5F45417B21C0906F00994C13 /* Swiftlint */, 5F45417B21C0906F00994C13 /* Swiftlint */,
58BA78EC2577FBDB006FAEA0 /* Extract wireguard-go Version */,
6F5D0C16218352EF000F85AD /* Sources */, 6F5D0C16218352EF000F85AD /* Sources */,
6F5D0C17218352EF000F85AD /* Frameworks */, 6F5D0C17218352EF000F85AD /* Frameworks */,
6F5D0C18218352EF000F85AD /* Resources */, 6F5D0C18218352EF000F85AD /* Resources */,
@ -902,7 +901,6 @@
buildConfigurationList = 6FB1BD9C21D4BFE700A991BF /* Build configuration list for PBXNativeTarget "WireGuardNetworkExtensionmacOS" */; buildConfigurationList = 6FB1BD9C21D4BFE700A991BF /* Build configuration list for PBXNativeTarget "WireGuardNetworkExtensionmacOS" */;
buildPhases = ( buildPhases = (
6FB1BDB421D4F5CF00A991BF /* Swiftlint */, 6FB1BDB421D4F5CF00A991BF /* Swiftlint */,
58BA78ED2577FBF4006FAEA0 /* Extract wireguard-go Version */,
6FB1BD8D21D4BFE600A991BF /* Sources */, 6FB1BD8D21D4BFE600A991BF /* Sources */,
6FB1BD8E21D4BFE600A991BF /* Frameworks */, 6FB1BD8E21D4BFE600A991BF /* Frameworks */,
6FB1BD8F21D4BFE600A991BF /* Resources */, 6FB1BD8F21D4BFE600A991BF /* Resources */,
@ -1116,42 +1114,6 @@
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "exec make -C \"$PROJECT_DIR/Sources/WireGuardKitGo\" version-header\n"; shellScript = "exec make -C \"$PROJECT_DIR/Sources/WireGuardKitGo\" version-header\n";
}; };
58BA78EC2577FBDB006FAEA0 /* Extract wireguard-go Version */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Extract wireguard-go Version";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "exec make -C \"$PROJECT_DIR/Sources/WireGuardKitGo\" version-header\n";
};
58BA78ED2577FBF4006FAEA0 /* Extract wireguard-go Version */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Extract wireguard-go Version";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "exec make -C \"$PROJECT_DIR/Sources/WireGuardKitGo\" version-header\n";
};
5F45417A21C0902400994C13 /* Swiftlint */ = { 5F45417A21C0902400994C13 /* Swiftlint */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;