Skip to content
This repository has been archived by the owner on Jan 13, 2022. It is now read-only.

Development #465

Closed
wants to merge 18 commits into from
Closed

Development #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
34b3388
Add TouchCode Library
Mar 10, 2011
75fefde
Added TouchJSON library
Mar 10, 2011
374c709
Removed the NSLog output
Mar 10, 2011
9c14795
Changed dealloc of the rootObject in TTURLJSONResponse for TouchJSON
Mar 11, 2011
f30d641
Removed TouchJSON
Mar 20, 2011
bc1e92b
Added touchJSON submodule
Mar 20, 2011
502fe8e
Changed file source for the TouchJSON code. Added it as submodule in …
Mar 20, 2011
370d530
Added the git submodules to the repository
Mar 20, 2011
9c6d4b4
Edited submodules file
DominicBoettger Mar 20, 2011
57dd0f8
Changes to TouchJSON config and added JSONKit as submodule
Apr 10, 2011
1332808
Added JSONKit to extThree20JSON
Apr 10, 2011
aba7b3e
Changed a wrong variable in the configuration for JSONKit and it's Re…
May 16, 2011
41bdb73
Merge pull request #616 from facebook/development
jwang Jul 21, 2011
1ea39c5
Merged latest three20 changes to version 1.0.7
Jul 21, 2011
8ca44fc
Changes for version 1.0.7
Jul 21, 2011
763294a
lvm changes
Jul 21, 2011
b3e4dee
Xcode4 changes
Jul 22, 2011
da64dd4
Changes for submitting the App to the AppStore. Changes in three20 to…
Aug 1, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitmodules
View file
Open in desktop
@@ -0,0 +1,6 @@
[submodule "src/extThree20JSON/Vendors/TouchJSON"]
path = src/extThree20JSON/Vendors/TouchJSON
url = git://github.com/TouchCode/TouchJSON.git
[submodule "src/extThree20JSON/Vendors/JSONKit"]
path = src/extThree20JSON/Vendors/JSONKit
url = git://github.com/johnezang/JSONKit.git
30 changes: 15 additions & 15 deletions src/Three20/Three20.xcodeproj/project.pbxproj
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 45;
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -455,9 +455,10 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 0410;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Three20" */;
compatibilityVersion = "Xcode 3.1";
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
Expand Down Expand Up @@ -754,8 +755,8 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
name = Internal;
};
Expand All @@ -769,7 +770,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
PREBINDING = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
PRODUCT_NAME = "$(BASE_PRODUCT_NAME)";
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = iphoneos;
Expand All @@ -782,14 +783,14 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
PREBINDING = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
PRODUCT_NAME = "$(BASE_PRODUCT_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
WRAPPER_EXTENSION = octest;
};
name = Internal;
Expand All @@ -802,7 +803,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
PREBINDING = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
PRODUCT_NAME = "$(BASE_PRODUCT_NAME)";
SDKROOT = iphoneos;
};
Expand All @@ -814,8 +815,7 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
PREBINDING = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
PRODUCT_NAME = "$(BASE_PRODUCT_NAME)";
SDKROOT = iphoneos;
ZERO_LINK = NO;
Expand All @@ -830,8 +830,8 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
name = Debug;
};
Expand All @@ -843,8 +843,8 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
name = Release;
};
Expand All @@ -854,14 +854,14 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
PREBINDING = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
PRODUCT_NAME = "$(BASE_PRODUCT_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
WRAPPER_EXTENSION = octest;
};
name = Debug;
Expand All @@ -872,12 +872,12 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
PREBINDING = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
PRODUCT_NAME = "$(BASE_PRODUCT_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
WRAPPER_EXTENSION = octest;
ZERO_LINK = NO;
};
Expand Down
30 changes: 15 additions & 15 deletions src/Three20Core/Three20Core.xcodeproj/project.pbxproj
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 45;
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -399,9 +399,10 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 0410;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Three20Core" */;
compatibilityVersion = "Xcode 3.1";
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
Expand Down Expand Up @@ -531,8 +532,8 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
name = Internal;
};
Expand All @@ -546,7 +547,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
PREBINDING = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = iphoneos;
};
Expand All @@ -558,13 +559,13 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
PREBINDING = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
};
name = Internal;
};
Expand All @@ -576,7 +577,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
PREBINDING = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
SDKROOT = iphoneos;
};
name = Debug;
Expand All @@ -587,8 +588,7 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
PREBINDING = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
SDKROOT = iphoneos;
ZERO_LINK = NO;
};
Expand All @@ -602,8 +602,8 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
name = Debug;
};
Expand All @@ -616,8 +616,8 @@
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
name = Release;
};
Expand All @@ -627,13 +627,13 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
PREBINDING = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
};
name = Debug;
};
Expand All @@ -643,11 +643,11 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
PREBINDING = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
ZERO_LINK = NO;
};
name = Release;
Expand Down