Skip to content

Commit d9b40aa

Browse files
klazukaklazuka
committed
Significant changes to how Kal is built.
- Refactored the project structure into 2 Xcode projects: one that builds the static library and one that builds an example app using Kal. - Switched over to the iOS 4.0 SDK (in preparation for EventKit demo and Retina Display support).
1 parent aa77ca4 commit d9b40aa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+990
-836
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
src/build/
2+
Examples/Holiday/build/
3+

‎HolidaysDemo/Holiday.h ‎Examples/Holiday/Classes/Holiday.h

File renamed without changes.

‎HolidaysDemo/Holiday.m ‎Examples/Holiday/Classes/Holiday.m

File renamed without changes.

‎HolidaysDemo/HolidayAppDelegate.h ‎Examples/Holiday/Classes/HolidayAppDelegate.h

File renamed without changes.

‎HolidaysDemo/HolidayAppDelegate.m ‎Examples/Holiday/Classes/HolidayAppDelegate.m

File renamed without changes.

‎HolidaysDemo/HolidayJSONDataSource.h ‎Examples/Holiday/Classes/HolidayJSONDataSource.h

File renamed without changes.

‎HolidaysDemo/HolidayJSONDataSource.m ‎Examples/Holiday/Classes/HolidayJSONDataSource.m

File renamed without changes.

‎HolidaysDemo/HolidaySqliteDataSource.h ‎Examples/Holiday/Classes/HolidaySqliteDataSource.h

File renamed without changes.

‎HolidaysDemo/HolidaySqliteDataSource.m ‎Examples/Holiday/Classes/HolidaySqliteDataSource.m

File renamed without changes.

‎HolidaysDemo/HolidaysDetailViewController.h ‎Examples/Holiday/Classes/HolidaysDetailViewController.h

File renamed without changes.

‎HolidaysDemo/HolidaysDetailViewController.m ‎Examples/Holiday/Classes/HolidaysDetailViewController.m

File renamed without changes.

‎HolidaysDemo/Holiday-Info.plist ‎Examples/Holiday/Holiday-Info.plist

File renamed without changes.

‎Examples/Holiday/Holiday.xcodeproj/project.pbxproj

+395
Large diffs are not rendered by default.

‎Examples/Holiday/Holiday_Prefix.pch

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
//
2+
// Prefix header for all source files of the 'Holiday' target in the 'Holiday' project
3+
//
4+
5+
#ifdef __OBJC__
6+
#import <Foundation/Foundation.h>
7+
#import <UIKit/UIKit.h>
8+
#endif

‎HolidaysDemo/JSON/JSON.h ‎Examples/Holiday/JSON/JSON.h

File renamed without changes.

‎HolidaysDemo/JSON/NSObject+SBJSON.h ‎Examples/Holiday/JSON/NSObject+SBJSON.h

File renamed without changes.

‎HolidaysDemo/JSON/NSObject+SBJSON.m ‎Examples/Holiday/JSON/NSObject+SBJSON.m

File renamed without changes.

‎HolidaysDemo/JSON/NSString+SBJSON.h ‎Examples/Holiday/JSON/NSString+SBJSON.h

File renamed without changes.

‎HolidaysDemo/JSON/NSString+SBJSON.m ‎Examples/Holiday/JSON/NSString+SBJSON.m

File renamed without changes.

‎HolidaysDemo/JSON/SBJSON.h ‎Examples/Holiday/JSON/SBJSON.h

File renamed without changes.

‎HolidaysDemo/JSON/SBJSON.m ‎Examples/Holiday/JSON/SBJSON.m

File renamed without changes.

‎HolidaysDemo/JSON/SBJsonBase.h ‎Examples/Holiday/JSON/SBJsonBase.h

File renamed without changes.

‎HolidaysDemo/JSON/SBJsonBase.m ‎Examples/Holiday/JSON/SBJsonBase.m

File renamed without changes.

‎HolidaysDemo/JSON/SBJsonParser.h ‎Examples/Holiday/JSON/SBJsonParser.h

File renamed without changes.

‎HolidaysDemo/JSON/SBJsonParser.m ‎Examples/Holiday/JSON/SBJsonParser.m

File renamed without changes.

‎HolidaysDemo/JSON/SBJsonWriter.h ‎Examples/Holiday/JSON/SBJsonWriter.h

File renamed without changes.

‎HolidaysDemo/JSON/SBJsonWriter.m ‎Examples/Holiday/JSON/SBJsonWriter.m

File renamed without changes.

‎Examples/Holiday/MainWindow.xib

+198
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
3+
<data>
4+
<int key="IBDocument.SystemTarget">800</int>
5+
<string key="IBDocument.SystemVersion">10D540</string>
6+
<string key="IBDocument.InterfaceBuilderVersion">760</string>
7+
<string key="IBDocument.AppKitVersion">1038.29</string>
8+
<string key="IBDocument.HIToolboxVersion">460.00</string>
9+
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
10+
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
11+
<string key="NS.object.0">81</string>
12+
</object>
13+
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
14+
<bool key="EncodedWithXMLCoder">YES</bool>
15+
<integer value="2"/>
16+
</object>
17+
<object class="NSArray" key="IBDocument.PluginDependencies">
18+
<bool key="EncodedWithXMLCoder">YES</bool>
19+
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
20+
</object>
21+
<object class="NSMutableDictionary" key="IBDocument.Metadata">
22+
<bool key="EncodedWithXMLCoder">YES</bool>
23+
<object class="NSArray" key="dict.sortedKeys" id="0">
24+
<bool key="EncodedWithXMLCoder">YES</bool>
25+
</object>
26+
<object class="NSMutableArray" key="dict.values">
27+
<bool key="EncodedWithXMLCoder">YES</bool>
28+
</object>
29+
</object>
30+
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
31+
<bool key="EncodedWithXMLCoder">YES</bool>
32+
<object class="IBProxyObject" id="841351856">
33+
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
34+
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
35+
</object>
36+
<object class="IBProxyObject" id="427554174">
37+
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
38+
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
39+
</object>
40+
<object class="IBUICustomObject" id="664661524">
41+
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
42+
</object>
43+
<object class="IBUIWindow" id="380026005">
44+
<reference key="NSNextResponder"/>
45+
<int key="NSvFlags">1316</int>
46+
<object class="NSPSMatrix" key="NSFrameMatrix"/>
47+
<string key="NSFrameSize">{320, 480}</string>
48+
<reference key="NSSuperview"/>
49+
<object class="NSColor" key="IBUIBackgroundColor">
50+
<int key="NSColorSpace">1</int>
51+
<bytes key="NSRGB">MSAxIDEAA</bytes>
52+
</object>
53+
<bool key="IBUIOpaque">NO</bool>
54+
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
55+
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
56+
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
57+
<bool key="IBUIResizesToFullScreen">YES</bool>
58+
</object>
59+
</object>
60+
<object class="IBObjectContainer" key="IBDocument.Objects">
61+
<object class="NSMutableArray" key="connectionRecords">
62+
<bool key="EncodedWithXMLCoder">YES</bool>
63+
<object class="IBConnectionRecord">
64+
<object class="IBCocoaTouchOutletConnection" key="connection">
65+
<string key="label">delegate</string>
66+
<reference key="source" ref="841351856"/>
67+
<reference key="destination" ref="664661524"/>
68+
</object>
69+
<int key="connectionID">4</int>
70+
</object>
71+
<object class="IBConnectionRecord">
72+
<object class="IBCocoaTouchOutletConnection" key="connection">
73+
<string key="label">window</string>
74+
<reference key="source" ref="664661524"/>
75+
<reference key="destination" ref="380026005"/>
76+
</object>
77+
<int key="connectionID">5</int>
78+
</object>
79+
</object>
80+
<object class="IBMutableOrderedSet" key="objectRecords">
81+
<object class="NSArray" key="orderedObjects">
82+
<bool key="EncodedWithXMLCoder">YES</bool>
83+
<object class="IBObjectRecord">
84+
<int key="objectID">0</int>
85+
<reference key="object" ref="0"/>
86+
<reference key="children" ref="1000"/>
87+
<nil key="parent"/>
88+
</object>
89+
<object class="IBObjectRecord">
90+
<int key="objectID">2</int>
91+
<reference key="object" ref="380026005"/>
92+
<object class="NSMutableArray" key="children">
93+
<bool key="EncodedWithXMLCoder">YES</bool>
94+
</object>
95+
<reference key="parent" ref="0"/>
96+
</object>
97+
<object class="IBObjectRecord">
98+
<int key="objectID">-1</int>
99+
<reference key="object" ref="841351856"/>
100+
<reference key="parent" ref="0"/>
101+
<string key="objectName">File's Owner</string>
102+
</object>
103+
<object class="IBObjectRecord">
104+
<int key="objectID">3</int>
105+
<reference key="object" ref="664661524"/>
106+
<reference key="parent" ref="0"/>
107+
</object>
108+
<object class="IBObjectRecord">
109+
<int key="objectID">-2</int>
110+
<reference key="object" ref="427554174"/>
111+
<reference key="parent" ref="0"/>
112+
</object>
113+
</object>
114+
</object>
115+
<object class="NSMutableDictionary" key="flattenedProperties">
116+
<bool key="EncodedWithXMLCoder">YES</bool>
117+
<object class="NSArray" key="dict.sortedKeys">
118+
<bool key="EncodedWithXMLCoder">YES</bool>
119+
<string>-1.CustomClassName</string>
120+
<string>-2.CustomClassName</string>
121+
<string>2.IBAttributePlaceholdersKey</string>
122+
<string>2.IBEditorWindowLastContentRect</string>
123+
<string>2.IBPluginDependency</string>
124+
<string>3.CustomClassName</string>
125+
<string>3.IBPluginDependency</string>
126+
</object>
127+
<object class="NSMutableArray" key="dict.values">
128+
<bool key="EncodedWithXMLCoder">YES</bool>
129+
<string>UIApplication</string>
130+
<string>UIResponder</string>
131+
<object class="NSMutableDictionary">
132+
<bool key="EncodedWithXMLCoder">YES</bool>
133+
<reference key="dict.sortedKeys" ref="0"/>
134+
<object class="NSMutableArray" key="dict.values">
135+
<bool key="EncodedWithXMLCoder">YES</bool>
136+
</object>
137+
</object>
138+
<string>{{198, 376}, {320, 480}}</string>
139+
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
140+
<string>HolidayAppDelegate</string>
141+
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
142+
</object>
143+
</object>
144+
<object class="NSMutableDictionary" key="unlocalizedProperties">
145+
<bool key="EncodedWithXMLCoder">YES</bool>
146+
<reference key="dict.sortedKeys" ref="0"/>
147+
<object class="NSMutableArray" key="dict.values">
148+
<bool key="EncodedWithXMLCoder">YES</bool>
149+
</object>
150+
</object>
151+
<nil key="activeLocalization"/>
152+
<object class="NSMutableDictionary" key="localizations">
153+
<bool key="EncodedWithXMLCoder">YES</bool>
154+
<reference key="dict.sortedKeys" ref="0"/>
155+
<object class="NSMutableArray" key="dict.values">
156+
<bool key="EncodedWithXMLCoder">YES</bool>
157+
</object>
158+
</object>
159+
<nil key="sourceID"/>
160+
<int key="maxID">9</int>
161+
</object>
162+
<object class="IBClassDescriber" key="IBDocument.Classes">
163+
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
164+
<bool key="EncodedWithXMLCoder">YES</bool>
165+
<object class="IBPartialClassDescription">
166+
<string key="className">HolidayAppDelegate</string>
167+
<string key="superclassName">NSObject</string>
168+
<object class="NSMutableDictionary" key="outlets">
169+
<string key="NS.key.0">window</string>
170+
<string key="NS.object.0">UIWindow</string>
171+
</object>
172+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
173+
<string key="majorKey">IBProjectSource</string>
174+
<string key="minorKey">Classes/HolidayAppDelegate.h</string>
175+
</object>
176+
</object>
177+
<object class="IBPartialClassDescription">
178+
<string key="className">HolidayAppDelegate</string>
179+
<string key="superclassName">NSObject</string>
180+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
181+
<string key="majorKey">IBUserSource</string>
182+
<string key="minorKey"/>
183+
</object>
184+
</object>
185+
</object>
186+
</object>
187+
<int key="IBDocument.localizationMode">0</int>
188+
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
189+
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
190+
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
191+
<integer value="3100" key="NS.object.0"/>
192+
</object>
193+
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
194+
<string key="IBDocument.LastKnownRelativeProjectPath">Holiday.xcodeproj</string>
195+
<int key="IBDocument.defaultPropertyAccessControl">3</int>
196+
<string key="IBCocoaTouchPluginVersion">81</string>
197+
</data>
198+
</archive>

‎HolidaysDemo/flags/China.gif ‎Examples/Holiday/flags/China.gif

File renamed without changes.

‎HolidaysDemo/flags/France.gif ‎Examples/Holiday/flags/France.gif

File renamed without changes.

‎HolidaysDemo/flags/India.gif ‎Examples/Holiday/flags/India.gif

File renamed without changes.

‎HolidaysDemo/flags/Italy.gif ‎Examples/Holiday/flags/Italy.gif

File renamed without changes.

‎HolidaysDemo/flags/Japan.gif ‎Examples/Holiday/flags/Japan.gif

File renamed without changes.

‎HolidaysDemo/flags/Singapore.gif ‎Examples/Holiday/flags/Singapore.gif

File renamed without changes.

‎HolidaysDemo/flags/South Africa.gif ‎Examples/Holiday/flags/South Africa.gif

File renamed without changes.

‎HolidaysDemo/flags/UK.gif ‎Examples/Holiday/flags/UK.gif

File renamed without changes.

‎HolidaysDemo/flags/USA.gif ‎Examples/Holiday/flags/USA.gif

File renamed without changes.

‎HolidaysDemo/holidays.db ‎Examples/Holiday/holidays.db

File renamed without changes.

‎HolidaysDemo/main.m ‎Examples/Holiday/main.m

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1+
//
2+
// main.m
3+
// Holiday
4+
//
5+
// Created by Keith Lazuka on 7/5/10.
6+
// Copyright __MyCompanyName__ 2010. All rights reserved.
7+
//
18

29
#import <UIKit/UIKit.h>
310

4-
int main(int argc, char *argv[])
5-
{
11+
int main(int argc, char *argv[]) {
12+
613
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
714
int retVal = UIApplicationMain(argc, argv, nil, nil);
815
[pool release];

‎HolidaysDemo/holidays.json ‎Examples/Holiday/support/holidays.json

File renamed without changes.

‎HolidaysDemo/holidays.txt ‎Examples/Holiday/support/holidays.txt

File renamed without changes.

‎HolidaysDemo/holidays_preprocessor.py ‎Examples/Holiday/support/holidays_preprocessor.py

File renamed without changes.

‎HolidaysDemo/holidays_setup.sql ‎Examples/Holiday/support/holidays_setup.sql

File renamed without changes.

‎HolidaysDemo/Holiday_Prefix.pch

-5
This file was deleted.

0 commit comments

Comments
 (0)