Update PLCR to commit 273a7e7cd4b77485

This commit is contained in:
Andreas Linde 2015-06-19 12:22:10 +02:00
parent 5681b7791f
commit ee91a1cbf4
5 changed files with 67 additions and 7 deletions

View File

@ -0,0 +1,48 @@
/*
* Author: Landon Fuller <landonf@plausiblelabs.com>
*
* Copyright (c) 2013 Plausible Labs Cooperative, Inc.
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef PLCRASH_CONSTANTS_H
#define PLCRASH_CONSTANTS_H
#if defined(__cplusplus)
# define PLCR_EXPORT extern "C"
# define PLCR_C_BEGIN_DECLS extern "C" {
# define PLCR_C_END_DECLS }
#else
# define PLCR_EXPORT extern
# define PLCR_C_BEGIN_DECLS
# define PLCR_C_END_DECLS
#endif
#ifdef __clang__
# define PLCR_PRAGMA_CLANG(_p) _Pragma(_p)
#else
# define PLCR_PRAGMA_CLANG(_p)
#endif
#endif /* PLCRASH_CONSTANTS_H */

View File

@ -35,10 +35,14 @@
/** Application version */
NSString *_applicationVersion;
/** Application marketing version */
NSString *_applicationMarketingVersion;
}
- (id) initWithApplicationIdentifier: (NSString *) applicationIdentifier
applicationVersion: (NSString *) applicationVersion;
applicationVersion: (NSString *) applicationVersion
applicationMarketingVersion: (NSString *) applicationMarketingVersion;
/**
* The application identifier. This is usually the application's CFBundleIdentifier value.
@ -50,4 +54,9 @@
*/
@property(nonatomic, readonly) NSString *applicationVersion;
/**
* The application marketing version. This is usually the application's CFBundleShortVersionString value if available. May be nil.
*/
@property(nonatomic, readonly) NSString *applicationMarketingVersion;
@end

View File

@ -102,6 +102,9 @@ typedef struct PLCrashReporterCallbacks {
/** Application version */
NSString *_applicationVersion;
/** Application marketing version */
NSString *_applicationMarketingVersion;
/** Path to the crash reporter internal data directory */
NSString *_crashReportDirectory;

View File

@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>13D65</string>
<string>14D136</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
@ -23,16 +23,16 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>5B1008</string>
<string>6D2105</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>13C64</string>
<string>14D125</string>
<key>DTSDKName</key>
<string>macosx10.9</string>
<string>macosx10.10</string>
<key>DTXcode</key>
<string>0511</string>
<string>0632</string>
<key>DTXcodeBuild</key>
<string>5B1008</string>
<string>6D2105</string>
</dict>
</plist>