aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-11-04 03:51:50 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2018-11-04 03:51:50 +0100
commit6c40479863c5811c1d958add221c859e72157bbc (patch)
treed90609c80762c33bed22828666b0f24c515cc2e0
parentSettings: anchor logo to bottom (diff)
downloadwireguard-apple-6c40479863c5811c1d958add221c859e72157bbc.tar.xz
wireguard-apple-6c40479863c5811c1d958add221c859e72157bbc.zip
XCode: unify version strings
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--WireGuard/WireGuard.xcodeproj/project.pbxproj8
-rw-r--r--WireGuard/WireGuard/Config/Config.xcconfig2
-rw-r--r--WireGuard/WireGuard/Config/Version.xcconfig2
-rw-r--r--WireGuard/WireGuard/Info.plist4
-rw-r--r--WireGuard/WireGuardNetworkExtension/Info.plist4
5 files changed, 12 insertions, 8 deletions
diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj
index 585fc22..99d65ac 100644
--- a/WireGuard/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj
@@ -122,7 +122,7 @@
6FF4AC1E211EC472002C96EB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
6FF4AC21211EC472002C96EB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
6FF4AC23211EC472002C96EB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- 6FF4AC2B211EC776002C96EB /* Developer.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Developer.xcconfig; path = Config/Developer.xcconfig; sourceTree = "<group>"; };
+ 6FF4AC2B211EC776002C96EB /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Config.xcconfig; path = Config/Config.xcconfig; sourceTree = "<group>"; };
6FF4AC462120B9E0002C96EB /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; };
6FF4AC482120B9E0002C96EB /* WireGuard.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WireGuard.entitlements; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -313,7 +313,7 @@
6FF4AC1E211EC472002C96EB /* Assets.xcassets */,
6FF4AC20211EC472002C96EB /* LaunchScreen.storyboard */,
6FF4AC23211EC472002C96EB /* Info.plist */,
- 6FF4AC2B211EC776002C96EB /* Developer.xcconfig */,
+ 6FF4AC2B211EC776002C96EB /* Config.xcconfig */,
6F689999218043390012E523 /* WireGuard-Bridging-Header.h */,
);
path = WireGuard;
@@ -621,7 +621,7 @@
};
6FF4AC24211EC472002C96EB /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 6FF4AC2B211EC776002C96EB /* Developer.xcconfig */;
+ baseConfigurationReference = 6FF4AC2B211EC776002C96EB /* Config.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
@@ -681,7 +681,7 @@
};
6FF4AC25211EC472002C96EB /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 6FF4AC2B211EC776002C96EB /* Developer.xcconfig */;
+ baseConfigurationReference = 6FF4AC2B211EC776002C96EB /* Config.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
diff --git a/WireGuard/WireGuard/Config/Config.xcconfig b/WireGuard/WireGuard/Config/Config.xcconfig
new file mode 100644
index 0000000..002b7ad
--- /dev/null
+++ b/WireGuard/WireGuard/Config/Config.xcconfig
@@ -0,0 +1,2 @@
+#include "Version.xcconfig"
+#include "Developer.xcconfig"
diff --git a/WireGuard/WireGuard/Config/Version.xcconfig b/WireGuard/WireGuard/Config/Version.xcconfig
new file mode 100644
index 0000000..3e53688
--- /dev/null
+++ b/WireGuard/WireGuard/Config/Version.xcconfig
@@ -0,0 +1,2 @@
+VERSION_NAME = 0.0.20181103
+VERSION_ID = 1
diff --git a/WireGuard/WireGuard/Info.plist b/WireGuard/WireGuard/Info.plist
index db48f6d..d74b477 100644
--- a/WireGuard/WireGuard/Info.plist
+++ b/WireGuard/WireGuard/Info.plist
@@ -53,9 +53,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.0.20181103</string>
+ <string>$(VERSION_NAME)</string>
<key>CFBundleVersion</key>
- <string>1</string>
+ <string>$(VERSION_ID)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>LSSupportsOpeningDocumentsInPlace</key>
diff --git a/WireGuard/WireGuardNetworkExtension/Info.plist b/WireGuard/WireGuardNetworkExtension/Info.plist
index 6c42790..cc71059 100644
--- a/WireGuard/WireGuardNetworkExtension/Info.plist
+++ b/WireGuard/WireGuardNetworkExtension/Info.plist
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
- <string>0.1</string>
+ <string>$(VERSION_NAME)</string>
<key>CFBundleVersion</key>
- <string>1</string>
+ <string>$(VERSION_ID)</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>