Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updating iOS project; Adding capacity argument

  • Loading branch information...
commit 684811e30fe1f29056d205b777726531c5b5e68c 1 parent de2ee78
@gabriel authored
Showing with 218 additions and 99 deletions.
  1. +3 −0  Classes/YAJL.h
  2. +24 −0 Classes/YAJLDocument.h
  3. +9 −1 Classes/YAJLDocument.m
  4. +55 −20 Example/TestApp/Frameworks/YAJL.framework/Versions/A/Headers/YAJL.h
  5. +24 −0 Example/TestApp/Frameworks/YAJL.framework/Versions/A/Headers/YAJLDocument.h
  6. +1 −1  Example/TestApp/Frameworks/YAJL.framework/Versions/A/Resources/Info.plist
  7. BIN  Example/TestApp/Frameworks/YAJL.framework/Versions/A/YAJL
  8. +1 −1  Example/TestAppIOS/Classes/TestAppIOSAppDelegate.m
  9. BIN  Example/TestAppIOS/Frameworks/YAJL.framework/Versions/A/YAJL
  10. +0 −1  Example/TestAppIOS/Frameworks/YAJL.framework/YAJL
  11. 0  {Project-IPhone/Libraries/GHUnitIOS.framework → Example/TestAppIOS/Frameworks/YAJLiOS.framework}/Headers
  12. 0  ...ject-IPhone/Libraries/GHUnitIOS.framework → Example/TestAppIOS/Frameworks/YAJLiOS.framework}/Resources
  13. 0  Example/TestAppIOS/Frameworks/{YAJL.framework → YAJLiOS.framework}/Versions/A/Headers/NSBundle+YAJL.h
  14. 0  Example/TestAppIOS/Frameworks/{YAJL.framework → YAJLiOS.framework}/Versions/A/Headers/NSObject+YAJL.h
  15. +3 −0  Example/TestAppIOS/Frameworks/{YAJL.framework → YAJLiOS.framework}/Versions/A/Headers/YAJL.h
  16. +24 −0 Example/TestAppIOS/Frameworks/{YAJL.framework → YAJLiOS.framework}/Versions/A/Headers/YAJLDocument.h
  17. 0  Example/TestAppIOS/Frameworks/{YAJL.framework → YAJLiOS.framework}/Versions/A/Headers/YAJLGen.h
  18. 0  Example/TestAppIOS/Frameworks/{YAJL.framework → YAJLiOS.framework}/Versions/A/Headers/YAJLParser.h
  19. 0  Example/TestAppIOS/Frameworks/{YAJL.framework → YAJLiOS.framework}/Versions/A/Headers/yajl_common.h
  20. +1 −1  Example/TestAppIOS/Frameworks/{YAJL.framework → YAJLiOS.framework}/Versions/A/Headers/yajl_gen.h
  21. +1 −1  Example/TestAppIOS/Frameworks/{YAJL.framework → YAJLiOS.framework}/Versions/A/Headers/yajl_parse.h
  22. +1 −1  Example/TestAppIOS/Frameworks/{YAJL.framework → YAJLiOS.framework}/Versions/A/Headers/yajl_version.h
  23. 0  Example/TestAppIOS/Frameworks/{YAJL.framework → YAJLiOS.framework}/Versions/A/Resources/Info.plist
  24. BIN  Example/TestAppIOS/Frameworks/YAJLiOS.framework/Versions/A/YAJLiOS
  25. 0  ...hone/Libraries/GHUnitIOS.framework → Example/TestAppIOS/Frameworks/YAJLiOS.framework}/Versions/Current
  26. +1 −0  Example/TestAppIOS/Frameworks/YAJLiOS.framework/YAJLiOS
  27. +6 −4 Example/TestAppIOS/TestAppIOS.xcodeproj/project.pbxproj
  28. 0  {Project-IPhone → Project-iOS}/Framework.plist
  29. 0  {Project-IPhone → Project-iOS}/Info.plist
  30. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/GHUnitIOS
  31. 0  {Example/TestAppIOS/Frameworks/YAJL.framework → Project-iOS/Libraries/GHUnitIOS.framework}/Headers
  32. 0  {Example/TestAppIOS/Frameworks/YAJL.framework → Project-iOS/Libraries/GHUnitIOS.framework}/Resources
  33. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/GHUnitIOS
  34. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHAsyncTestCase.h
  35. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHTest+JUnitXML.h
  36. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHTest.h
  37. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHTestCase.h
  38. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHTestGroup+JUnitXML.h
  39. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHTestGroup.h
  40. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHTestMacros.h
  41. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHTestOperation.h
  42. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHTestRunner.h
  43. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHTestSuite.h
  44. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHTesting.h
  45. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHUnit.h
  46. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHUnitIOS.h
  47. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHUnitIPhoneAppDelegate.h
  48. 0  ...hone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHUnitIPhoneTableViewDataSource.h
  49. 0  ...Phone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHUnitIPhoneTestViewController.h
  50. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHUnitIPhoneView.h
  51. 0  ...ct-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHUnitIPhoneViewController.h
  52. 0  ... → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/NSException+GHTestFailureExceptions.h
  53. 0  ...ject-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Headers/NSValue+GHValueFormatter.h
  54. 0  {Project-IPhone → Project-iOS}/Libraries/GHUnitIOS.framework/Versions/A/Resources/Info.plist
  55. 0  ...ple/TestAppIOS/Frameworks/YAJL.framework → Project-iOS/Libraries/GHUnitIOS.framework}/Versions/Current
  56. +3 −3 {Project-IPhone → Project-iOS}/Makefile
  57. 0  {Project-IPhone → Project-iOS}/Tests-Info.plist
  58. 0  {Project-IPhone → Project-iOS}/Tests_Prefix.pch
  59. +48 −50 {Project-IPhone/YAJLIPhone.xcodeproj → Project-iOS/YAJLiOS.xcodeproj}/project.pbxproj
  60. 0  Project-IPhone/YAJLIPhone_Prefix.pch → Project-iOS/YAJLiOS_Prefix.pch
  61. +0 −2  Project/YAJL.xcodeproj/project.pbxproj
  62. +1 −1  Scripts/CombineLibs.sh
  63. +5 −5 Scripts/iPhoneFramework.sh
  64. +2 −2 XCConfig/{Shared-IPhone.xcconfig → Shared-iOS.xcconfig}
  65. +1 −1  XCConfig/Shared.xcconfig
  66. +1 −1  yajl-1.0.11/api/yajl_gen.h
  67. +1 −1  yajl-1.0.11/api/yajl_parse.h
  68. +1 −1  yajl-1.0.11/api/yajl_version.h
  69. +1 −1  yajl-1.0.11/yajl_version.c
View
3  Classes/YAJL.h
@@ -51,7 +51,10 @@
To use the framework (for Mac OS X or iOS):
@code
+ // For Mac OS X
#import <YAJL/YAJL.h>
+ // For iOS
+ #import <YAJLiOS/YAJL.h>
@endcode
@section Examples Examples
View
24 Classes/YAJLDocument.h
@@ -148,6 +148,19 @@ extern NSInteger YAJLDocumentStackCapacity;
- (id)initWithData:(NSData *)data parserOptions:(YAJLParserOptions)parserOptions error:(NSError **)error;
/*!
+ Create document from data.
+ @param data Data to parse
+ @param parserOptions Parse options
+ - YAJLParserOptionsNone: No options
+ - YAJLParserOptionsAllowComments: Javascript style comments will be allowed in the input (both /&asterisk; &asterisk;/ and //)
+ - YAJLParserOptionsCheckUTF8: Invalid UTF8 strings will cause a parse error
+ - YAJLParserOptionsStrictPrecision: If YES will force strict precision and return integer overflow error
+ @param capacity Initial capacity for NSArray and NSDictionary objects (Defaults to 20)
+ @param error Error to set on failure
+ */
+- (id)initWithData:(NSData *)data parserOptions:(YAJLParserOptions)parserOptions capacity:(NSInteger)capacity error:(NSError **)error;
+
+/*!
Create empty document with parser options.
@param parserOptions Parse options
- YAJLParserOptionsNone: No options
@@ -158,6 +171,17 @@ extern NSInteger YAJLDocumentStackCapacity;
- (id)initWithParserOptions:(YAJLParserOptions)parserOptions;
/*!
+ Create empty document with parser options.
+ @param parserOptions Parse options
+ - YAJLParserOptionsNone: No options
+ - YAJLParserOptionsAllowComments: Javascript style comments will be allowed in the input (both /&asterisk; &asterisk;/ and //)
+ - YAJLParserOptionsCheckUTF8: Invalid UTF8 strings will cause a parse error
+ - YAJLParserOptionsStrictPrecision: If YES will force strict precision and return integer overflow error
+ @param capacity Initial capacity for NSArray and NSDictionary objects (Defaults to 20)
+ */
+- (id)initWithParserOptions:(YAJLParserOptions)parserOptions capacity:(NSInteger)capacity;
+
+/*!
Parse data.
@param data Data to parse
@param error Out error to set on failure
View
10 Classes/YAJLDocument.m
@@ -46,6 +46,10 @@ - (id)init {
}
- (id)initWithParserOptions:(YAJLParserOptions)parserOptions {
+ return [self initWithParserOptions:parserOptions capacity:YAJLDocumentStackCapacity];
+}
+
+- (id)initWithParserOptions:(YAJLParserOptions)parserOptions capacity:(NSInteger)capacity {
if ((self = [super init])) {
stack_ = [[NSMutableArray alloc] initWithCapacity:YAJLDocumentStackCapacity];
keyStack_ = [[NSMutableArray alloc] initWithCapacity:YAJLDocumentStackCapacity];
@@ -57,7 +61,11 @@ - (id)initWithParserOptions:(YAJLParserOptions)parserOptions {
}
- (id)initWithData:(NSData *)data parserOptions:(YAJLParserOptions)parserOptions error:(NSError **)error {
- if ((self = [self initWithParserOptions:parserOptions])) {
+ return [self initWithData:data parserOptions:parserOptions capacity:YAJLDocumentStackCapacity error:error];
+}
+
+- (id)initWithData:(NSData *)data parserOptions:(YAJLParserOptions)parserOptions capacity:(NSInteger)capacity error:(NSError **)error {
+ if ((self = [self initWithParserOptions:parserOptions capacity:capacity])) {
[self parse:data error:error];
}
return self;
View
75 Example/TestApp/Frameworks/YAJL.framework/Versions/A/Headers/YAJL.h
@@ -37,56 +37,89 @@
@mainpage YAJL
The YAJL framework is an Objective-C wrapper around the http://lloyd.github.com/yajl/ SAX-style JSON parser.
+
+ @section Links
+
+ Source: http://github.com/gabriel/yajl-objc
+
+ View docs online: http://gabriel.github.com/yajl-objc/
+
+ YAJL C docs: http://lloyd.github.com/yajl/
@section Usage Usage
- To parse JSON from an NSData (or NSString):
+ To use the framework (for Mac OS X or iOS):
+
+ @code
+ // For Mac OS X
+ #import <YAJL/YAJL.h>
+ // For iOS
+ #import <YAJLiOS/YAJL.h>
+ @endcode
+
+ @section Examples Examples
+
+ @subsection Example1 To parse JSON from NSData
@code
NSData *JSONData = [NSData dataWithContentsOfFile:@"example.json"];
NSArray *arrayFromData = [JSONData yajl_JSON];
+ @endcode
+
+ @subsection Example2 To parse JSON from NSString
- NSString *JSONString = @"[\"Test\"]";
+ @code
+ NSString *JSONString = @"[1, 2, 3]";
NSArray *arrayFromString = [JSONString yajl_JSON];
+ @endcode
+
+ @subsection Example2 To parse JSON from NSString with error and comments
+ @code
// With options and out error
+ NSString *JSONString = @"[1, 2, 3] // Allow comments";
NSError *error = nil;
NSArray *arrayFromString = [JSONString yajl_JSONWithOptions:YAJLParserOptionsAllowComments error:&error];
@endcode
- To generate JSON from an object:
+ @subsection Example3 To generate JSON from an object, NSArray, NSDictionary, etc.
@code
NSDictionary *dict = [NSDictionary dictionaryWithObject:@"value" forKey:@"key"];
NSString *JSONString = [dict yajl_JSONString];
+ @endcode
+ @subsection Example4 To generate JSON from an object, beautified with custom indent
+
+ @code
// Beautified with custon indent string
NSArray *array = [NSArray arrayWithObjects:@"value1", @"value2", nil];
NSString *JSONString = [dict yajl_JSONStringWithOptions:YAJLGenOptionsBeautify indentString:@" "];
+ @endcode
- To use the streaming (or SAX style) parser, use YAJLParser. For higher level (document) streaming, see below.
+ @subsection Example5 To use the streaming (or SAX style) parser, use YAJLParser
+ @code
NSData *data = [NSData dataWithContentsOfFile:@"example.json"];
YAJLParser *parser = [[YAJLParser alloc] initWithParserOptions:YAJLParserOptionsAllowComments];
parser.delegate = self;
[parser parse:data];
- if (parser.parserError) {
- NSLog(@"Error:\n%@", parser.parserError);
- }
+ if (parser.parserError)
+ NSLog(@"Error:\n%@", parser.parserError);
parser.delegate = nil;
[parser release];
// Include delegate methods from YAJLParserDelegate
- - (void)parserDidStartDictionary:(YAJLParser *)parser;
- - (void)parserDidEndDictionary:(YAJLParser *)parser;
+ - (void)parserDidStartDictionary:(YAJLParser *)parser { }
+ - (void)parserDidEndDictionary:(YAJLParser *)parser { }
- - (void)parserDidStartArray:(YAJLParser *)parser;
- - (void)parserDidEndArray:(YAJLParser *)parser;
+ - (void)parserDidStartArray:(YAJLParser *)parser { }
+ - (void)parserDidEndArray:(YAJLParser *)parser { }
- - (void)parser:(YAJLParser *)parser didMapKey:(NSString *)key;
- - (void)parser:(YAJLParser *)parser didAdd:(id)value;
+ - (void)parser:(YAJLParser *)parser didMapKey:(NSString *)key { }
+ - (void)parser:(YAJLParser *)parser didAdd:(id)value { }
@endcode
@subsection ParserOptions Parser Options
@@ -97,7 +130,7 @@
- YAJLParserOptionsCheckUTF8: Will verify UTF-8
- YAJLParserOptionsStrictPrecision: Will force strict precision and return integer overflow error, if number is greater than long long.
- @subsection StreamingExample Streaming Example (Parser)
+ @subsection Example6 Parsing as data becomes available
@code
YAJLParser *parser = [[[YAJLParser alloc] init] autorelease];
@@ -106,15 +139,17 @@
// A chunk of data comes...
YAJLParserStatus status = [parser parse:chunk1];
// 'status' should be YAJLParserStatusInsufficientData, if its not finished
- if (parser.parserError) ...;
+ if (parser.parserError)
+ NSLog(@"Error:\n%@", parser.parserError);
// Another chunk of data comes...
YAJLParserStatus status = [parser parse:chunk2];
// 'status' should be YAJLParserStatusOK if its finished
- if (parser.parserError) ...;
- @encode
+ if (parser.parserError)
+ NSLog(@"Error:\n%@", parser.parserError);
+ @endcode
- @subsection UsageDocument Usage (Document-style)
+ @subsection Example7 Document style parsing
To use the document style, use YAJLDocument. Usage should be very similar to NSXMLDocument.
@@ -127,7 +162,7 @@
[document release];
@endcode
- @subsection StreamingExampleDocument Streaming Example (Document)
+ @subsection Example8 Document style parsing as data becomes available
@code
YAJLDocument *document = [[YAJLDocument alloc] init];
@@ -149,7 +184,7 @@
- (void)document:(YAJLDocument *)document didSetObject:(id)object forKey:(id)key inDictionary:(NSDictionary *)dict { }
@endcode
- @section LoadJSONBundle Load JSON from Bundle
+ @subsection Example9 Load JSON from Bundle
@code
id JSONValue = [[NSBundle mainBundle] yajl_JSONFromResource:@"kegs.json"];
View
24 Example/TestApp/Frameworks/YAJL.framework/Versions/A/Headers/YAJLDocument.h
@@ -148,6 +148,19 @@ extern NSInteger YAJLDocumentStackCapacity;
- (id)initWithData:(NSData *)data parserOptions:(YAJLParserOptions)parserOptions error:(NSError **)error;
/*!
+ Create document from data.
+ @param data Data to parse
+ @param parserOptions Parse options
+ - YAJLParserOptionsNone: No options
+ - YAJLParserOptionsAllowComments: Javascript style comments will be allowed in the input (both /&asterisk; &asterisk;/ and //)
+ - YAJLParserOptionsCheckUTF8: Invalid UTF8 strings will cause a parse error
+ - YAJLParserOptionsStrictPrecision: If YES will force strict precision and return integer overflow error
+ @param capacity Initial capacity for NSArray and NSDictionary objects (Defaults to 20)
+ @param error Error to set on failure
+ */
+- (id)initWithData:(NSData *)data parserOptions:(YAJLParserOptions)parserOptions capacity:(NSInteger)capacity error:(NSError **)error;
+
+/*!
Create empty document with parser options.
@param parserOptions Parse options
- YAJLParserOptionsNone: No options
@@ -158,6 +171,17 @@ extern NSInteger YAJLDocumentStackCapacity;
- (id)initWithParserOptions:(YAJLParserOptions)parserOptions;
/*!
+ Create empty document with parser options.
+ @param parserOptions Parse options
+ - YAJLParserOptionsNone: No options
+ - YAJLParserOptionsAllowComments: Javascript style comments will be allowed in the input (both /&asterisk; &asterisk;/ and //)
+ - YAJLParserOptionsCheckUTF8: Invalid UTF8 strings will cause a parse error
+ - YAJLParserOptionsStrictPrecision: If YES will force strict precision and return integer overflow error
+ @param capacity Initial capacity for NSArray and NSDictionary objects (Defaults to 20)
+ */
+- (id)initWithParserOptions:(YAJLParserOptions)parserOptions capacity:(NSInteger)capacity;
+
+/*!
Parse data.
@param data Data to parse
@param error Out error to set on failure
View
2  Example/TestApp/Frameworks/YAJL.framework/Versions/A/Resources/Info.plist
@@ -17,6 +17,6 @@
<key>CFBundleSignature</key>
<string>GABE</string>
<key>CFBundleVersion</key>
- <string>0.2.24</string>
+ <string>0.2.26</string>
</dict>
</plist>
View
BIN  Example/TestApp/Frameworks/YAJL.framework/Versions/A/YAJL
Binary file not shown
View
2  Example/TestAppIOS/Classes/TestAppIOSAppDelegate.m
@@ -9,7 +9,7 @@
#import "TestAppIOSAppDelegate.h"
#import "TestAppIOSViewController.h"
-#import <YAJL/YAJL.h>
+#import <YAJLiOS/YAJL.h>
@implementation TestAppIOSAppDelegate
View
BIN  Example/TestAppIOS/Frameworks/YAJL.framework/Versions/A/YAJL
Binary file not shown
View
1  Example/TestAppIOS/Frameworks/YAJL.framework/YAJL
View
0  Project-IPhone/Libraries/GHUnitIOS.framework/Headers → ...e/TestAppIOS/Frameworks/YAJLiOS.framework/Headers
File renamed without changes
View
0  ...ct-IPhone/Libraries/GHUnitIOS.framework/Resources → ...TestAppIOS/Frameworks/YAJLiOS.framework/Resources
File renamed without changes
View
0  ...YAJL.framework/Versions/A/Headers/NSBundle+YAJL.h → ...LiOS.framework/Versions/A/Headers/NSBundle+YAJL.h
File renamed without changes
View
0  ...YAJL.framework/Versions/A/Headers/NSObject+YAJL.h → ...LiOS.framework/Versions/A/Headers/NSObject+YAJL.h
File renamed without changes
View
3  ...ameworks/YAJL.framework/Versions/A/Headers/YAJL.h → ...works/YAJLiOS.framework/Versions/A/Headers/YAJL.h
@@ -51,7 +51,10 @@
To use the framework (for Mac OS X or iOS):
@code
+ // For Mac OS X
#import <YAJL/YAJL.h>
+ // For iOS
+ #import <YAJLiOS/YAJL.h>
@endcode
@section Examples Examples
View
24 .../YAJL.framework/Versions/A/Headers/YAJLDocument.h → ...JLiOS.framework/Versions/A/Headers/YAJLDocument.h
@@ -148,6 +148,19 @@ extern NSInteger YAJLDocumentStackCapacity;
- (id)initWithData:(NSData *)data parserOptions:(YAJLParserOptions)parserOptions error:(NSError **)error;
/*!
+ Create document from data.
+ @param data Data to parse
+ @param parserOptions Parse options
+ - YAJLParserOptionsNone: No options
+ - YAJLParserOptionsAllowComments: Javascript style comments will be allowed in the input (both /&asterisk; &asterisk;/ and //)
+ - YAJLParserOptionsCheckUTF8: Invalid UTF8 strings will cause a parse error
+ - YAJLParserOptionsStrictPrecision: If YES will force strict precision and return integer overflow error
+ @param capacity Initial capacity for NSArray and NSDictionary objects (Defaults to 20)
+ @param error Error to set on failure
+ */
+- (id)initWithData:(NSData *)data parserOptions:(YAJLParserOptions)parserOptions capacity:(NSInteger)capacity error:(NSError **)error;
+
+/*!
Create empty document with parser options.
@param parserOptions Parse options
- YAJLParserOptionsNone: No options
@@ -158,6 +171,17 @@ extern NSInteger YAJLDocumentStackCapacity;
- (id)initWithParserOptions:(YAJLParserOptions)parserOptions;
/*!
+ Create empty document with parser options.
+ @param parserOptions Parse options
+ - YAJLParserOptionsNone: No options
+ - YAJLParserOptionsAllowComments: Javascript style comments will be allowed in the input (both /&asterisk; &asterisk;/ and //)
+ - YAJLParserOptionsCheckUTF8: Invalid UTF8 strings will cause a parse error
+ - YAJLParserOptionsStrictPrecision: If YES will force strict precision and return integer overflow error
+ @param capacity Initial capacity for NSArray and NSDictionary objects (Defaults to 20)
+ */
+- (id)initWithParserOptions:(YAJLParserOptions)parserOptions capacity:(NSInteger)capacity;
+
+/*!
Parse data.
@param data Data to parse
@param error Out error to set on failure
View
0  ...works/YAJL.framework/Versions/A/Headers/YAJLGen.h → ...ks/YAJLiOS.framework/Versions/A/Headers/YAJLGen.h
File renamed without changes
View
0  ...ks/YAJL.framework/Versions/A/Headers/YAJLParser.h → ...YAJLiOS.framework/Versions/A/Headers/YAJLParser.h
File renamed without changes
View
0  ...s/YAJL.framework/Versions/A/Headers/yajl_common.h → ...AJLiOS.framework/Versions/A/Headers/yajl_common.h
File renamed without changes
View
2  ...orks/YAJL.framework/Versions/A/Headers/yajl_gen.h → ...s/YAJLiOS.framework/Versions/A/Headers/yajl_gen.h
@@ -35,7 +35,7 @@
* Interface to YAJL's JSON generation facilities.
*/
-#include <yajl/yajl_common.h>
+#include "yajl_common.h"
#ifndef __YAJL_GEN_H__
#define __YAJL_GEN_H__
View
2  ...ks/YAJL.framework/Versions/A/Headers/yajl_parse.h → ...YAJLiOS.framework/Versions/A/Headers/yajl_parse.h
@@ -35,7 +35,7 @@
* Interface to YAJL's JSON parsing facilities.
*/
-#include <yajl/yajl_common.h>
+#include "yajl_common.h"
#ifndef __YAJL_PARSE_H__
#define __YAJL_PARSE_H__
View
2  .../YAJL.framework/Versions/A/Headers/yajl_version.h → ...JLiOS.framework/Versions/A/Headers/yajl_version.h
@@ -1,7 +1,7 @@
#ifndef YAJL_VERSION_H_
#define YAJL_VERSION_H_
-#include <yajl/yajl_common.h>
+#include "yajl_common.h"
#define YAJL_MAJOR 1
#define YAJL_MINOR 0
View
0  ...ks/YAJL.framework/Versions/A/Resources/Info.plist → ...YAJLiOS.framework/Versions/A/Resources/Info.plist
File renamed without changes
View
BIN  Example/TestAppIOS/Frameworks/YAJLiOS.framework/Versions/A/YAJLiOS
Binary file not shown
View
0  ...ne/Libraries/GHUnitIOS.framework/Versions/Current → ...IOS/Frameworks/YAJLiOS.framework/Versions/Current
File renamed without changes
View
1  Example/TestAppIOS/Frameworks/YAJLiOS.framework/YAJLiOS
View
10 Example/TestAppIOS/TestAppIOS.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
- 00BDE74A12806BD2005A77AF /* YAJL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00BDE74912806BD2005A77AF /* YAJL.framework */; };
+ 00DB69F213202FDB00AF998E /* YAJLiOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00DB69F113202FDB00AF998E /* YAJLiOS.framework */; };
1D3623260D0F684500981E51 /* TestAppIOSAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* TestAppIOSAppDelegate.m */; };
1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
@@ -19,7 +19,7 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
- 00BDE74912806BD2005A77AF /* YAJL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = YAJL.framework; path = Frameworks/YAJL.framework; sourceTree = "<group>"; };
+ 00DB69F113202FDB00AF998E /* YAJLiOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = YAJLiOS.framework; path = Frameworks/YAJLiOS.framework; sourceTree = "<group>"; };
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1D3623240D0F684500981E51 /* TestAppIOSAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestAppIOSAppDelegate.h; sourceTree = "<group>"; };
1D3623250D0F684500981E51 /* TestAppIOSAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestAppIOSAppDelegate.m; sourceTree = "<group>"; };
@@ -43,7 +43,7 @@
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */,
- 00BDE74A12806BD2005A77AF /* YAJL.framework in Frameworks */,
+ 00DB69F213202FDB00AF998E /* YAJLiOS.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -103,7 +103,7 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
- 00BDE74912806BD2005A77AF /* YAJL.framework */,
+ 00DB69F113202FDB00AF998E /* YAJLiOS.framework */,
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
1D30AB110D05D00D00671497 /* Foundation.framework */,
288765A40DF7441C002DB57D /* CoreGraphics.framework */,
@@ -200,6 +200,7 @@
"-ObjC",
);
PRODUCT_NAME = TestAppIOS;
+ SDKROOT = iphoneos;
};
name = Debug;
};
@@ -216,6 +217,7 @@
GCC_PREFIX_HEADER = TestAppIOS_Prefix.pch;
INFOPLIST_FILE = "TestAppIOS-Info.plist";
PRODUCT_NAME = TestAppIOS;
+ SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
};
name = Release;
View
0  Project-IPhone/Framework.plist → Project-iOS/Framework.plist
File renamed without changes
View
0  Project-IPhone/Info.plist → Project-iOS/Info.plist
File renamed without changes
View
0  ...ct-IPhone/Libraries/GHUnitIOS.framework/GHUnitIOS → Project-iOS/Libraries/GHUnitIOS.framework/GHUnitIOS
File renamed without changes
View
0  Example/TestAppIOS/Frameworks/YAJL.framework/Headers → Project-iOS/Libraries/GHUnitIOS.framework/Headers
File renamed without changes
View
0  ...le/TestAppIOS/Frameworks/YAJL.framework/Resources → Project-iOS/Libraries/GHUnitIOS.framework/Resources
File renamed without changes
View
0  ...ibraries/GHUnitIOS.framework/Versions/A/GHUnitIOS → ...ibraries/GHUnitIOS.framework/Versions/A/GHUnitIOS
File renamed without changes
View
0  ...OS.framework/Versions/A/Headers/GHAsyncTestCase.h → ...OS.framework/Versions/A/Headers/GHAsyncTestCase.h
File renamed without changes
View
0  ...OS.framework/Versions/A/Headers/GHTest+JUnitXML.h → ...OS.framework/Versions/A/Headers/GHTest+JUnitXML.h
File renamed without changes
View
0  ...s/GHUnitIOS.framework/Versions/A/Headers/GHTest.h → ...s/GHUnitIOS.framework/Versions/A/Headers/GHTest.h
File renamed without changes
View
0  ...UnitIOS.framework/Versions/A/Headers/GHTestCase.h → ...UnitIOS.framework/Versions/A/Headers/GHTestCase.h
File renamed without changes
View
0  ...amework/Versions/A/Headers/GHTestGroup+JUnitXML.h → ...amework/Versions/A/Headers/GHTestGroup+JUnitXML.h
File renamed without changes
View
0  ...nitIOS.framework/Versions/A/Headers/GHTestGroup.h → ...nitIOS.framework/Versions/A/Headers/GHTestGroup.h
File renamed without changes
View
0  ...itIOS.framework/Versions/A/Headers/GHTestMacros.h → ...itIOS.framework/Versions/A/Headers/GHTestMacros.h
File renamed without changes
View
0  ...OS.framework/Versions/A/Headers/GHTestOperation.h → ...OS.framework/Versions/A/Headers/GHTestOperation.h
File renamed without changes
View
0  ...itIOS.framework/Versions/A/Headers/GHTestRunner.h → ...itIOS.framework/Versions/A/Headers/GHTestRunner.h
File renamed without changes
View
0  ...nitIOS.framework/Versions/A/Headers/GHTestSuite.h → ...nitIOS.framework/Versions/A/Headers/GHTestSuite.h
File renamed without changes
View
0  ...HUnitIOS.framework/Versions/A/Headers/GHTesting.h → ...HUnitIOS.framework/Versions/A/Headers/GHTesting.h
File renamed without changes
View
0  ...s/GHUnitIOS.framework/Versions/A/Headers/GHUnit.h → ...s/GHUnitIOS.framework/Versions/A/Headers/GHUnit.h
File renamed without changes
View
0  ...HUnitIOS.framework/Versions/A/Headers/GHUnitIOS.h → ...HUnitIOS.framework/Versions/A/Headers/GHUnitIOS.h
File renamed without changes
View
0  ...work/Versions/A/Headers/GHUnitIPhoneAppDelegate.h → ...work/Versions/A/Headers/GHUnitIPhoneAppDelegate.h
File renamed without changes
View
0  ...sions/A/Headers/GHUnitIPhoneTableViewDataSource.h → ...sions/A/Headers/GHUnitIPhoneTableViewDataSource.h
File renamed without changes
View
0  ...rsions/A/Headers/GHUnitIPhoneTestViewController.h → ...rsions/A/Headers/GHUnitIPhoneTestViewController.h
File renamed without changes
View
0  ...S.framework/Versions/A/Headers/GHUnitIPhoneView.h → ...S.framework/Versions/A/Headers/GHUnitIPhoneView.h
File renamed without changes
View
0  ...k/Versions/A/Headers/GHUnitIPhoneViewController.h → ...k/Versions/A/Headers/GHUnitIPhoneViewController.h
File renamed without changes
View
0  ...s/A/Headers/NSException+GHTestFailureExceptions.h → ...s/A/Headers/NSException+GHTestFailureExceptions.h
File renamed without changes
View
0  ...ork/Versions/A/Headers/NSValue+GHValueFormatter.h → ...ork/Versions/A/Headers/NSValue+GHValueFormatter.h
File renamed without changes
View
0  ...UnitIOS.framework/Versions/A/Resources/Info.plist → ...UnitIOS.framework/Versions/A/Resources/Info.plist
File renamed without changes
View
0  ...AppIOS/Frameworks/YAJL.framework/Versions/Current → ...OS/Libraries/GHUnitIOS.framework/Versions/Current
File renamed without changes
View
6 Project-IPhone/Makefile → Project-iOS/Makefile
@@ -1,7 +1,7 @@
default:
- xcodebuild -target "YAJLIPhone (Simulator)" -configuration Release build
- xcodebuild -target "YAJLIPhone (Device)" -configuration Release build
+ xcodebuild -target "YAJLiOS (Simulator)" -configuration Release build -sdk iphonesimulator
+ xcodebuild -target "YAJLiOS (Device)" -configuration Release build -sdk iphoneos
BUILD_DIR="build" BUILD_STYLE="Release" sh ../Scripts/CombineLibs.sh
sh ../Scripts/iPhoneFramework.sh
@@ -10,4 +10,4 @@ clean:
-rm -rf build/*
test:
- GHUNIT_CLI=1 xcodebuild -target Tests -configuration Debug -sdk iphonesimulator4.0 build
+ GHUNIT_CLI=1 xcodebuild -target Tests -configuration Debug -sdk iphonesimulator build
View
0  Project-IPhone/Tests-Info.plist → Project-iOS/Tests-Info.plist
File renamed without changes
View
0  Project-IPhone/Tests_Prefix.pch → Project-iOS/Tests_Prefix.pch
File renamed without changes
View
98 Project-IPhone/YAJLIPhone.xcodeproj/project.pbxproj → Project-iOS/YAJLiOS.xcodeproj/project.pbxproj
@@ -21,7 +21,7 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
- 003DE13411BEF6F4007BD538 /* libYAJLIOSSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 006597AC11BEEF4800E89ABD /* libYAJLIOSSimulator.a */; };
+ 003DE13411BEF6F4007BD538 /* libYAJLiOSSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 006597AC11BEEF4800E89ABD /* libYAJLiOSSimulator.a */; };
00471EFC12263B3700E8A306 /* NSBundle+YAJL.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00C113F412111824009C9B51 /* NSBundle+YAJL.h */; };
0052CD67126EABC10049CF17 /* yajl.c in Sources */ = {isa = PBXBuildFile; fileRef = 0052CD55126EABC10049CF17 /* yajl.c */; };
0052CD68126EABC10049CF17 /* yajl_alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 0052CD56126EABC10049CF17 /* yajl_alloc.c */; };
@@ -62,7 +62,7 @@
005886E41226339500292C90 /* GHUnitIOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 005886E31226339500292C90 /* GHUnitIOS.framework */; };
00588702122634AD00292C90 /* Shared-MacOSX.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 00588701122634AD00292C90 /* Shared-MacOSX.xcconfig */; };
0058870E1226353B00292C90 /* GHUnitIOSTestMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 0058870D1226353B00292C90 /* GHUnitIOSTestMain.m */; };
- 0065975A11BEEF4000E89ABD /* YAJLIPhone_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* YAJLIPhone_Prefix.pch */; };
+ 0065975A11BEEF4000E89ABD /* YAJLiOS_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* YAJLiOS_Prefix.pch */; };
0065975B11BEEF4000E89ABD /* YAJLDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 00C404FE0FE77661003CE908 /* YAJLDocument.h */; };
0065975C11BEEF4000E89ABD /* YAJLParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 00C405000FE77661003CE908 /* YAJLParser.h */; };
0065975D11BEEF4000E89ABD /* NSObject+YAJL.h in Headers */ = {isa = PBXBuildFile; fileRef = 005BF2D110185B3000C35A81 /* NSObject+YAJL.h */; };
@@ -74,7 +74,7 @@
0065976D11BEEF4000E89ABD /* NSObject+YAJL.m in Sources */ = {isa = PBXBuildFile; fileRef = 005BF2D210185B3000C35A81 /* NSObject+YAJL.m */; };
0065976E11BEEF4000E89ABD /* YAJLGen.m in Sources */ = {isa = PBXBuildFile; fileRef = 005BF2D710185B3000C35A81 /* YAJLGen.m */; };
0065976F11BEEF4000E89ABD /* GTMBase64.m in Sources */ = {isa = PBXBuildFile; fileRef = 00AC534B1098F478002B5508 /* GTMBase64.m */; };
- 0065978111BEEF4800E89ABD /* YAJLIPhone_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* YAJLIPhone_Prefix.pch */; };
+ 0065978111BEEF4800E89ABD /* YAJLiOS_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* YAJLiOS_Prefix.pch */; };
0065978211BEEF4800E89ABD /* YAJLDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 00C404FE0FE77661003CE908 /* YAJLDocument.h */; };
0065978311BEEF4800E89ABD /* YAJLParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 00C405000FE77661003CE908 /* YAJLParser.h */; };
0065978411BEEF4800E89ABD /* NSObject+YAJL.h in Headers */ = {isa = PBXBuildFile; fileRef = 005BF2D110185B3000C35A81 /* NSObject+YAJL.h */; };
@@ -145,7 +145,7 @@
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 0065977F11BEEF4800E89ABD;
- remoteInfo = "YAJLIPhone (Simulator-4.0)";
+ remoteInfo = "YAJLiOS (Simulator-4.0)";
};
/* End PBXContainerItemProxy section */
@@ -213,8 +213,8 @@
005BF30210185B7600C35A81 /* object_expected_array.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = object_expected_array.json; sourceTree = "<group>"; };
005BF35B10185F7E00C35A81 /* stream_array1.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stream_array1.json; sourceTree = "<group>"; };
005BF35C10185F7E00C35A81 /* stream_array2.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stream_array2.json; sourceTree = "<group>"; };
- 0065977C11BEEF4000E89ABD /* libYAJLIOSDevice.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libYAJLIOSDevice.a; sourceTree = BUILT_PRODUCTS_DIR; };
- 006597AC11BEEF4800E89ABD /* libYAJLIOSSimulator.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libYAJLIOSSimulator.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ 0065977C11BEEF4000E89ABD /* libYAJLiOSDevice.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libYAJLiOSDevice.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ 006597AC11BEEF4800E89ABD /* libYAJLiOSSimulator.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libYAJLiOSSimulator.a; sourceTree = BUILT_PRODUCTS_DIR; };
006597EA11BEEF5400E89ABD /* Tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
0066FE7F12262CF7009247B0 /* NSBundleTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSBundleTest.m; sourceTree = "<group>"; };
00A59CE9109014550032BD92 /* error2.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = error2.json; sourceTree = "<group>"; };
@@ -248,7 +248,7 @@
00C405010FE77661003CE908 /* YAJLParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YAJLParser.m; sourceTree = "<group>"; };
00C4052C0FE77688003CE908 /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
00C4052D0FE77688003CE908 /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
- 00C4052E0FE77688003CE908 /* Shared-IPhone.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Shared-IPhone.xcconfig"; sourceTree = "<group>"; };
+ 00C4052E0FE77688003CE908 /* Shared-iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Shared-iOS.xcconfig"; sourceTree = "<group>"; };
00C4052F0FE77688003CE908 /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
00C4054F0FE77760003CE908 /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
00C4056F0FE777B4003CE908 /* comments.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = comments.json; sourceTree = "<group>"; };
@@ -260,7 +260,7 @@
00C405850FE7780E003CE908 /* Tests_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tests_Prefix.pch; sourceTree = "<group>"; };
00C406000FE77A81003CE908 /* CombineLibs.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = CombineLibs.sh; sourceTree = "<group>"; };
00C406470FE77C51003CE908 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = SOURCE_ROOT; };
- AA747D9E0F9514B9006C5449 /* YAJLIPhone_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YAJLIPhone_Prefix.pch; sourceTree = SOURCE_ROOT; };
+ AA747D9E0F9514B9006C5449 /* YAJLiOS_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YAJLiOS_Prefix.pch; sourceTree = SOURCE_ROOT; };
AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */
@@ -284,7 +284,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 003DE13411BEF6F4007BD538 /* libYAJLIOSSimulator.a in Frameworks */,
+ 003DE13411BEF6F4007BD538 /* libYAJLiOSSimulator.a in Frameworks */,
005886AB1226333300292C90 /* CoreGraphics.framework in Frameworks */,
005886B21226334500292C90 /* UIKit.framework in Frameworks */,
005886C81226337500292C90 /* Foundation.framework in Frameworks */,
@@ -396,7 +396,7 @@
children = (
00C4052F0FE77688003CE908 /* Shared.xcconfig */,
00588701122634AD00292C90 /* Shared-MacOSX.xcconfig */,
- 00C4052E0FE77688003CE908 /* Shared-IPhone.xcconfig */,
+ 00C4052E0FE77688003CE908 /* Shared-iOS.xcconfig */,
00C4052C0FE77688003CE908 /* Debug.xcconfig */,
00C4052D0FE77688003CE908 /* Release.xcconfig */,
);
@@ -404,12 +404,12 @@
path = ../XCConfig;
sourceTree = SOURCE_ROOT;
};
- 00C405550FE77784003CE908 /* Libraries (iPhone) */ = {
+ 00C405550FE77784003CE908 /* Libraries (iOS) */ = {
isa = PBXGroup;
children = (
005886E31226339500292C90 /* GHUnitIOS.framework */,
);
- name = "Libraries (iPhone)";
+ name = "Libraries (iOS)";
path = Libraries;
sourceTree = "<group>";
};
@@ -475,14 +475,14 @@
034768DFFF38A50411DB9C8B /* Products */ = {
isa = PBXGroup;
children = (
- 0065977C11BEEF4000E89ABD /* libYAJLIOSDevice.a */,
- 006597AC11BEEF4800E89ABD /* libYAJLIOSSimulator.a */,
+ 0065977C11BEEF4000E89ABD /* libYAJLiOSDevice.a */,
+ 006597AC11BEEF4800E89ABD /* libYAJLiOSSimulator.a */,
006597EA11BEEF5400E89ABD /* Tests.app */,
);
name = Products;
sourceTree = "<group>";
};
- 0867D691FE84028FC02AAC07 /* YAJLIPhone */ = {
+ 0867D691FE84028FC02AAC07 /* YAJLiOS */ = {
isa = PBXGroup;
children = (
0046C19011779AB80092DA2A /* Makefile */,
@@ -490,7 +490,7 @@
00C406470FE77C51003CE908 /* README.md */,
0052CD4F126EABC10049CF17 /* yajl-1.0.11 */,
00C404FD0FE77661003CE908 /* Classes */,
- 00C405550FE77784003CE908 /* Libraries (iPhone) */,
+ 00C405550FE77784003CE908 /* Libraries (iOS) */,
00AC53481098F478002B5508 /* Libraries */,
32C88DFF0371C24200C91783 /* Other Sources */,
00C4052B0FE77688003CE908 /* XCConfig */,
@@ -504,7 +504,7 @@
005886B11226334500292C90 /* UIKit.framework */,
005886C71226337500292C90 /* Foundation.framework */,
);
- name = YAJLIPhone;
+ name = YAJLiOS;
sourceTree = "<group>";
};
0867D69AFE84028FC02AAC07 /* Frameworks */ = {
@@ -518,7 +518,7 @@
32C88DFF0371C24200C91783 /* Other Sources */ = {
isa = PBXGroup;
children = (
- AA747D9E0F9514B9006C5449 /* YAJLIPhone_Prefix.pch */,
+ AA747D9E0F9514B9006C5449 /* YAJLiOS_Prefix.pch */,
00C405850FE7780E003CE908 /* Tests_Prefix.pch */,
);
name = "Other Sources";
@@ -531,7 +531,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
- 0065975A11BEEF4000E89ABD /* YAJLIPhone_Prefix.pch in Headers */,
+ 0065975A11BEEF4000E89ABD /* YAJLiOS_Prefix.pch in Headers */,
0065975B11BEEF4000E89ABD /* YAJLDocument.h in Headers */,
0065975C11BEEF4000E89ABD /* YAJLParser.h in Headers */,
0065975D11BEEF4000E89ABD /* NSObject+YAJL.h in Headers */,
@@ -557,7 +557,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
- 0065978111BEEF4800E89ABD /* YAJLIPhone_Prefix.pch in Headers */,
+ 0065978111BEEF4800E89ABD /* YAJLiOS_Prefix.pch in Headers */,
0065978211BEEF4800E89ABD /* YAJLDocument.h in Headers */,
0065978311BEEF4800E89ABD /* YAJLParser.h in Headers */,
0065978411BEEF4800E89ABD /* NSObject+YAJL.h in Headers */,
@@ -582,9 +582,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
- 0065975811BEEF4000E89ABD /* YAJLIPhone (Device) */ = {
+ 0065975811BEEF4000E89ABD /* YAJLiOS (Device) */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 0065977911BEEF4000E89ABD /* Build configuration list for PBXNativeTarget "YAJLIPhone (Device)" */;
+ buildConfigurationList = 0065977911BEEF4000E89ABD /* Build configuration list for PBXNativeTarget "YAJLiOS (Device)" */;
buildPhases = (
0065975911BEEF4000E89ABD /* Headers */,
0065976A11BEEF4000E89ABD /* Sources */,
@@ -594,14 +594,14 @@
);
dependencies = (
);
- name = "YAJLIPhone (Device)";
- productName = YAJLIPhone;
- productReference = 0065977C11BEEF4000E89ABD /* libYAJLIOSDevice.a */;
+ name = "YAJLiOS (Device)";
+ productName = YAJLiOS;
+ productReference = 0065977C11BEEF4000E89ABD /* libYAJLiOSDevice.a */;
productType = "com.apple.product-type.library.static";
};
- 0065977F11BEEF4800E89ABD /* YAJLIPhone (Simulator) */ = {
+ 0065977F11BEEF4800E89ABD /* YAJLiOS (Simulator) */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 006597A911BEEF4800E89ABD /* Build configuration list for PBXNativeTarget "YAJLIPhone (Simulator)" */;
+ buildConfigurationList = 006597A911BEEF4800E89ABD /* Build configuration list for PBXNativeTarget "YAJLiOS (Simulator)" */;
buildPhases = (
0065978011BEEF4800E89ABD /* Headers */,
0065979111BEEF4800E89ABD /* Sources */,
@@ -613,9 +613,9 @@
);
dependencies = (
);
- name = "YAJLIPhone (Simulator)";
- productName = YAJLIPhone;
- productReference = 006597AC11BEEF4800E89ABD /* libYAJLIOSSimulator.a */;
+ name = "YAJLiOS (Simulator)";
+ productName = YAJLiOS;
+ productReference = 006597AC11BEEF4800E89ABD /* libYAJLiOSSimulator.a */;
productType = "com.apple.product-type.library.static";
};
006597AE11BEEF5400E89ABD /* Tests */ = {
@@ -642,7 +642,7 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
- buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "YAJLIPhone" */;
+ buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "YAJLiOS" */;
compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
hasScannedForEncodings = 1;
@@ -652,13 +652,13 @@
French,
German,
);
- mainGroup = 0867D691FE84028FC02AAC07 /* YAJLIPhone */;
+ mainGroup = 0867D691FE84028FC02AAC07 /* YAJLiOS */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
- 0065975811BEEF4000E89ABD /* YAJLIPhone (Device) */,
- 0065977F11BEEF4800E89ABD /* YAJLIPhone (Simulator) */,
+ 0065975811BEEF4000E89ABD /* YAJLiOS (Device) */,
+ 0065977F11BEEF4800E89ABD /* YAJLiOS (Simulator) */,
006597AE11BEEF5400E89ABD /* Tests */,
005887351226360800292C90 /* Run make to build framework */,
);
@@ -812,7 +812,7 @@
/* Begin PBXTargetDependency section */
006597EE11BEEF6900E89ABD /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = 0065977F11BEEF4800E89ABD /* YAJLIPhone (Simulator) */;
+ target = 0065977F11BEEF4800E89ABD /* YAJLiOS (Simulator) */;
targetProxy = 006597ED11BEEF6900E89ABD /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@@ -841,42 +841,40 @@
};
0065977A11BEEF4000E89ABD /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 00C4052E0FE77688003CE908 /* Shared-IPhone.xcconfig */;
+ baseConfigurationReference = 00C4052E0FE77688003CE908 /* Shared-iOS.xcconfig */;
buildSettings = {
- PRODUCT_NAME = YAJLIOSDevice;
+ PRODUCT_NAME = YAJLiOSDevice;
};
name = Debug;
};
0065977B11BEEF4000E89ABD /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 00C4052E0FE77688003CE908 /* Shared-IPhone.xcconfig */;
+ baseConfigurationReference = 00C4052E0FE77688003CE908 /* Shared-iOS.xcconfig */;
buildSettings = {
- PRODUCT_NAME = YAJLIOSDevice;
+ PRODUCT_NAME = YAJLiOSDevice;
};
name = Release;
};
006597AA11BEEF4800E89ABD /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 00C4052E0FE77688003CE908 /* Shared-IPhone.xcconfig */;
+ baseConfigurationReference = 00C4052E0FE77688003CE908 /* Shared-iOS.xcconfig */;
buildSettings = {
INFOPLIST_FILE = "Info copy.plist";
- PRODUCT_NAME = YAJLIOSSimulator;
- SDKROOT = iphonesimulator4.1;
+ PRODUCT_NAME = YAJLiOSSimulator;
};
name = Debug;
};
006597AB11BEEF4800E89ABD /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 00C4052E0FE77688003CE908 /* Shared-IPhone.xcconfig */;
+ baseConfigurationReference = 00C4052E0FE77688003CE908 /* Shared-iOS.xcconfig */;
buildSettings = {
- PRODUCT_NAME = YAJLIOSSimulator;
- SDKROOT = iphonesimulator4.1;
+ PRODUCT_NAME = YAJLiOSSimulator;
};
name = Release;
};
006597E811BEEF5400E89ABD /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 00C4052E0FE77688003CE908 /* Shared-IPhone.xcconfig */;
+ baseConfigurationReference = 00C4052E0FE77688003CE908 /* Shared-iOS.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -906,7 +904,7 @@
};
006597E911BEEF5400E89ABD /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 00C4052E0FE77688003CE908 /* Shared-IPhone.xcconfig */;
+ baseConfigurationReference = 00C4052E0FE77688003CE908 /* Shared-iOS.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -974,7 +972,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 0065977911BEEF4000E89ABD /* Build configuration list for PBXNativeTarget "YAJLIPhone (Device)" */ = {
+ 0065977911BEEF4000E89ABD /* Build configuration list for PBXNativeTarget "YAJLiOS (Device)" */ = {
isa = XCConfigurationList;
buildConfigurations = (
0065977A11BEEF4000E89ABD /* Debug */,
@@ -983,7 +981,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 006597A911BEEF4800E89ABD /* Build configuration list for PBXNativeTarget "YAJLIPhone (Simulator)" */ = {
+ 006597A911BEEF4800E89ABD /* Build configuration list for PBXNativeTarget "YAJLiOS (Simulator)" */ = {
isa = XCConfigurationList;
buildConfigurations = (
006597AA11BEEF4800E89ABD /* Debug */,
@@ -1001,7 +999,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "YAJLIPhone" */ = {
+ 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "YAJLiOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB922308733DC00010E9CD /* Debug */,
View
0  Project-IPhone/YAJLIPhone_Prefix.pch → Project-iOS/YAJLiOS_Prefix.pch
File renamed without changes
View
2  Project/YAJL.xcodeproj/project.pbxproj
@@ -194,7 +194,6 @@
00C404910FE77552003CE908 /* YAJLParserTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YAJLParserTest.m; sourceTree = "<group>"; };
00C4049D0FE77562003CE908 /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
00C4049E0FE77562003CE908 /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
- 00C4049F0FE77562003CE908 /* Shared-IPhone.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Shared-IPhone.xcconfig"; sourceTree = "<group>"; };
00C404A00FE77562003CE908 /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
00C6F19310D2EFFC00A63AF1 /* overflow_longlong.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = overflow_longlong.json; sourceTree = "<group>"; };
00E5DDF80F5B6E3E00C11F1D /* Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -396,7 +395,6 @@
children = (
00C4049D0FE77562003CE908 /* Debug.xcconfig */,
00C4049E0FE77562003CE908 /* Release.xcconfig */,
- 00C4049F0FE77562003CE908 /* Shared-IPhone.xcconfig */,
00C404A00FE77562003CE908 /* Shared.xcconfig */,
);
name = XCConfig;
View
2  Scripts/CombineLibs.sh
@@ -5,7 +5,7 @@ set -e
FLAVOR=""
VERSION=`cat ../XCConfig/Shared.xcconfig | grep "YAJL_VERSION =" | cut -d '=' -f 2 | tr -d " "`
-NAME=libYAJLIOS
+NAME=libYAJLiOS
OUTPUT_DIR=${BUILD_DIR}/Combined${BUILD_STYLE}${FLAVOR}
OUTPUT_FILE=${NAME}${FLAVOR}.a
ZIP_DIR=${BUILD_DIR}/Zip
View
10 Scripts/iPhoneFramework.sh
@@ -7,8 +7,8 @@
set -e
# Define these to suit your nefarious purposes
- FRAMEWORK_NAME=YAJL
- LIB_NAME=libYAJLIOS
+ FRAMEWORK_NAME=YAJLiOS
+ LIB_NAME=libYAJLiOS
FRAMEWORK_VERSION=A
BUILD_TYPE=Release
@@ -66,6 +66,6 @@ lipo \
# Now copy the final assets over: your library
# header files and the plist file
echo "Framework: Copying assets into current version..."
-cp ../Classes/*.h $FRAMEWORK_DIR/Headers/
-cp ../yajl-1.0.11/api/*.h $FRAMEWORK_DIR/Headers/
-cp Framework.plist $FRAMEWORK_DIR/Resources/Info.plist
+cp -v ../Classes/*.h $FRAMEWORK_DIR/Headers/
+cp -v ../yajl-1.0.11/api/*.h $FRAMEWORK_DIR/Headers/
+cp -v Framework.plist $FRAMEWORK_DIR/Resources/Info.plist
View
4 XCConfig/Shared-IPhone.xcconfig → XCConfig/Shared-iOS.xcconfig
@@ -7,8 +7,8 @@ GCC_DYNAMIC_NO_PIC = NO
// stripped.
STRIP_STYLE = debugging
-GCC_PREFIX_HEADER = YAJLIPhone_Prefix.pch
+GCC_PREFIX_HEADER = YAJLiOS_Prefix.pch
IPHONEOS_DEPLOYMENT_TARGET = 3.0
-SDKROOT = iphoneos4.1
+SDKROOT = iphoneos
View
2  XCConfig/Shared.xcconfig
@@ -1,4 +1,4 @@
-YAJL_VERSION = 0.2.25
+YAJL_VERSION = 0.2.26
YAJL_GENERAL_OTHER_CFLAGS = -Wdiv-by-zero -Wbad-function-cast -Wnested-externs -Wold-style-definition
View
2  yajl-1.0.11/api/yajl_gen.h
@@ -35,7 +35,7 @@
* Interface to YAJL's JSON generation facilities.
*/
-#include <yajl/yajl_common.h>
+#include "yajl_common.h"
#ifndef __YAJL_GEN_H__
#define __YAJL_GEN_H__
View
2  yajl-1.0.11/api/yajl_parse.h
@@ -35,7 +35,7 @@
* Interface to YAJL's JSON parsing facilities.
*/
-#include <yajl/yajl_common.h>
+#include "yajl_common.h"
#ifndef __YAJL_PARSE_H__
#define __YAJL_PARSE_H__
View
2  yajl-1.0.11/api/yajl_version.h
@@ -1,7 +1,7 @@
#ifndef YAJL_VERSION_H_
#define YAJL_VERSION_H_
-#include <yajl/yajl_common.h>
+#include "yajl_common.h"
#define YAJL_MAJOR 1
#define YAJL_MINOR 0
View
2  yajl-1.0.11/yajl_version.c
@@ -1,4 +1,4 @@
-#include <yajl/yajl_version.h>
+#include "yajl_version.h"
int yajl_version(void)
{
Please sign in to comment.
Something went wrong with that request. Please try again.