Commit d0e2a085 authored by Tobias's avatar Tobias

replace hard coded group- and keychain-identifiers with user-defined build settings

based on patch by Filipe Cabecinhas <vlc@filcab.net>
parent 858488ac
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string> <string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
<key>keychain-access-groups</key> <key>keychain-access-groups</key>
<array> <array>
<string>$(AppIdentifierPrefix)org.videolan.vlc-ios</string> <string>$(KEYCHAIN_ACCESS_GROUP)</string>
</array> </array>
</dict> </dict>
</plist> </plist>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#define kVLCVersionCodename @"All Along the Watchtower" #define kVLCVersionCodename @"All Along the Watchtower"
#define kVLCApplicationGroupIdentifier @"group.org.videolan.vlc-ios" #define kVLCApplicationGroupIdentifier GROUP_IDENTIFIER
#define kVLCRecentURLs @"recent-urls" #define kVLCRecentURLs @"recent-urls"
#define kVLCStoreDropboxCredentials @"kVLCStoreDropboxCredentials" #define kVLCStoreDropboxCredentials @"kVLCStoreDropboxCredentials"
......
...@@ -15,3 +15,8 @@ ...@@ -15,3 +15,8 @@
// Using com.example leads to com.example.vlc-ios for the iOS target. // Using com.example leads to com.example.vlc-ios for the iOS target.
BUNDLE_IDENTIFIER_PREFIX=com.example BUNDLE_IDENTIFIER_PREFIX=com.example
GROUP_IDENTIFIER=group.$(BUNDLE_IDENTIFIER_PREFIX).vlc-ios
KEYCHAIN_ACCESS_GROUP=$(AppIdentifierPrefix)$(BUNDLE_IDENTIFIER_PREFIX).vlc-ios
GCC_PREPROCESSOR_DEFINITIONS = "GROUP_IDENTIFIER=@\"$(GROUP_IDENTIFIER)\"";
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#define kVLCVersionCodename @"All Along the Watchtower" #define kVLCVersionCodename @"All Along the Watchtower"
#define kVLCApplicationGroupIdentifier @"group.org.videolan.vlc-ios" #define kVLCApplicationGroupIdentifier GROUP_IDENTIFIER
#define kVLCSettingPasscodeKey @"Passcode" #define kVLCSettingPasscodeKey @"Passcode"
#define kVLCSettingPasscodeOnKey @"PasscodeProtection" #define kVLCSettingPasscodeOnKey @"PasscodeProtection"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<dict> <dict>
<key>com.apple.security.application-groups</key> <key>com.apple.security.application-groups</key>
<array> <array>
<string>group.org.videolan.vlc-ios</string> <string>$(GROUP_IDENTIFIER)</string>
</array> </array>
</dict> </dict>
</plist> </plist>
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<dict> <dict>
<key>com.apple.security.application-groups</key> <key>com.apple.security.application-groups</key>
<array> <array>
<string>group.org.videolan.vlc-ios</string> <string>$(GROUP_IDENTIFIER)</string>
</array> </array>
</dict> </dict>
</plist> </plist>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<key>NSExtensionAttributes</key> <key>NSExtensionAttributes</key>
<dict> <dict>
<key>WKAppBundleIdentifier</key> <key>WKAppBundleIdentifier</key>
<string>org.videolan.vlc-ios.watchkitapp</string> <string>$(BUNDLE_IDENTIFIER_PREFIX).vlc-ios.watchkitapp</string>
</dict> </dict>
<key>NSExtensionPointIdentifier</key> <key>NSExtensionPointIdentifier</key>
<string>com.apple.watchkit</string> <string>com.apple.watchkit</string>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<string>UIInterfaceOrientationPortraitUpsideDown</string> <string>UIInterfaceOrientationPortraitUpsideDown</string>
</array> </array>
<key>WKCompanionAppBundleIdentifier</key> <key>WKCompanionAppBundleIdentifier</key>
<string>org.videolan.vlc-ios</string> <string>$(BUNDLE_IDENTIFIER_PREFIX).vlc-ios</string>
<key>WKWatchKitApp</key> <key>WKWatchKitApp</key>
<true/> <true/>
</dict> </dict>
......
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string> <string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
<key>com.apple.security.application-groups</key> <key>com.apple.security.application-groups</key>
<array> <array>
<string>group.org.videolan.vlc-ios</string> <string>$(GROUP_IDENTIFIER)</string>
</array> </array>
<key>keychain-access-groups</key> <key>keychain-access-groups</key>
<array> <array>
<string>$(AppIdentifierPrefix)org.videolan.vlc-ios</string> <string>$(KEYCHAIN_ACCESS_GROUP)</string>
</array> </array>
</dict> </dict>
</plist> </plist>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment