Skip to content
This repository
Browse code

Convert dependencies to submodules

  • Loading branch information...
commit 49b1f016aba1b63441eae7e9b6464d33c0c0b349 1 parent 7f97c57
Ryan Petrich rpetrich authored
6 .gitmodules
... ... @@ -0,0 +1,6 @@
  1 +[submodule "TouchJSON"]
  2 + path = TouchJSON
  3 + url = https://github.com/schwa/TouchJSON.git
  4 +[submodule "three20"]
  5 + path = three20
  6 + url = https://github.com/facebook/three20.git
12 README.mdown
Source Rendered
@@ -5,17 +5,9 @@ You'll need to use at least version 4.2 of the iPhone SDK
5 5
6 6 iReddit requires TouchJSON and Three20 to build.
7 7
8   -In the parent directory of the project directory, you can check out the requirements with the following commands:
  8 +In the project directory simply run the following command to retrieve the submodules:
9 9
10   - git clone https://github.com/schwa/TouchJSON.git
11   - git clone https://github.com/facebook/three20.git
12   -
13   -So your directory structure should look like this:
14   -
15   - . <parent directory>
16   - |-- iReddit
17   - |-- three20
18   - '-- TouchJSON
  10 + git submodule update --init
19 11
20 12 You should then be able to build iReddit.
21 13
1  TouchJSON
... ... @@ -0,0 +1 @@
  1 +Subproject commit 0bb94d374e3d269e44df284cb73951c905ad017e
56 iReddit.xcodeproj/project.pbxproj
@@ -620,20 +620,20 @@
620 620 28A0AAE50D9B0CCF005BE974 /* iReddit_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iReddit_Prefix.pch; sourceTree = "<group>"; };
621 621 28AD735F0D9D9599002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainWindow.xib; path = ../MainWindow.xib; sourceTree = "<group>"; };
622 622 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
623   - 3821EF3511CAC98F002CCCE2 /* NSCharacterSet_Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSCharacterSet_Extensions.h; path = ../TouchJSON/Source/Extensions/NSCharacterSet_Extensions.h; sourceTree = SOURCE_ROOT; };
624   - 3821EF3611CAC98F002CCCE2 /* NSCharacterSet_Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSCharacterSet_Extensions.m; path = ../TouchJSON/Source/Extensions/NSCharacterSet_Extensions.m; sourceTree = SOURCE_ROOT; };
625   - 3821EF3711CAC98F002CCCE2 /* CDataScanner_Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDataScanner_Extensions.h; path = ../TouchJSON/Source/Extensions/CDataScanner_Extensions.h; sourceTree = SOURCE_ROOT; };
626   - 3821EF3811CAC98F002CCCE2 /* CDataScanner_Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDataScanner_Extensions.m; path = ../TouchJSON/Source/Extensions/CDataScanner_Extensions.m; sourceTree = SOURCE_ROOT; };
627   - 3821EF3911CAC98F002CCCE2 /* NSDictionary_JSONExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSDictionary_JSONExtensions.h; path = ../TouchJSON/Source/Extensions/NSDictionary_JSONExtensions.h; sourceTree = SOURCE_ROOT; };
628   - 3821EF3A11CAC98F002CCCE2 /* NSDictionary_JSONExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSDictionary_JSONExtensions.m; path = ../TouchJSON/Source/Extensions/NSDictionary_JSONExtensions.m; sourceTree = SOURCE_ROOT; };
629   - 3821EF3C11CAC98F002CCCE2 /* CJSONScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CJSONScanner.h; path = ../TouchJSON/Source/JSON/CJSONScanner.h; sourceTree = SOURCE_ROOT; };
630   - 3821EF3D11CAC98F002CCCE2 /* CJSONScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CJSONScanner.m; path = ../TouchJSON/Source/JSON/CJSONScanner.m; sourceTree = SOURCE_ROOT; };
631   - 3821EF3E11CAC98F002CCCE2 /* CJSONSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CJSONSerializer.h; path = ../TouchJSON/Source/JSON/CJSONSerializer.h; sourceTree = SOURCE_ROOT; };
632   - 3821EF3F11CAC98F002CCCE2 /* CJSONSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CJSONSerializer.m; path = ../TouchJSON/Source/JSON/CJSONSerializer.m; sourceTree = SOURCE_ROOT; };
633   - 3821EF4011CAC98F002CCCE2 /* CJSONDeserializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CJSONDeserializer.h; path = ../TouchJSON/Source/JSON/CJSONDeserializer.h; sourceTree = SOURCE_ROOT; };
634   - 3821EF4111CAC98F002CCCE2 /* CJSONDeserializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CJSONDeserializer.m; path = ../TouchJSON/Source/JSON/CJSONDeserializer.m; sourceTree = SOURCE_ROOT; };
635   - 3821EF4611CAC98F002CCCE2 /* CDataScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDataScanner.h; path = ../TouchJSON/Source/CDataScanner.h; sourceTree = SOURCE_ROOT; };
636   - 3821EF4711CAC990002CCCE2 /* CDataScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDataScanner.m; path = ../TouchJSON/Source/CDataScanner.m; sourceTree = SOURCE_ROOT; };
  623 + 3821EF3511CAC98F002CCCE2 /* NSCharacterSet_Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSCharacterSet_Extensions.h; path = TouchJSON/Source/Extensions/NSCharacterSet_Extensions.h; sourceTree = SOURCE_ROOT; };
  624 + 3821EF3611CAC98F002CCCE2 /* NSCharacterSet_Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSCharacterSet_Extensions.m; path = TouchJSON/Source/Extensions/NSCharacterSet_Extensions.m; sourceTree = SOURCE_ROOT; };
  625 + 3821EF3711CAC98F002CCCE2 /* CDataScanner_Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDataScanner_Extensions.h; path = TouchJSON/Source/Extensions/CDataScanner_Extensions.h; sourceTree = SOURCE_ROOT; };
  626 + 3821EF3811CAC98F002CCCE2 /* CDataScanner_Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDataScanner_Extensions.m; path = TouchJSON/Source/Extensions/CDataScanner_Extensions.m; sourceTree = SOURCE_ROOT; };
  627 + 3821EF3911CAC98F002CCCE2 /* NSDictionary_JSONExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSDictionary_JSONExtensions.h; path = TouchJSON/Source/Extensions/NSDictionary_JSONExtensions.h; sourceTree = SOURCE_ROOT; };
  628 + 3821EF3A11CAC98F002CCCE2 /* NSDictionary_JSONExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSDictionary_JSONExtensions.m; path = TouchJSON/Source/Extensions/NSDictionary_JSONExtensions.m; sourceTree = SOURCE_ROOT; };
  629 + 3821EF3C11CAC98F002CCCE2 /* CJSONScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CJSONScanner.h; path = TouchJSON/Source/JSON/CJSONScanner.h; sourceTree = SOURCE_ROOT; };
  630 + 3821EF3D11CAC98F002CCCE2 /* CJSONScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CJSONScanner.m; path = TouchJSON/Source/JSON/CJSONScanner.m; sourceTree = SOURCE_ROOT; };
  631 + 3821EF3E11CAC98F002CCCE2 /* CJSONSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CJSONSerializer.h; path = TouchJSON/Source/JSON/CJSONSerializer.h; sourceTree = SOURCE_ROOT; };
  632 + 3821EF3F11CAC98F002CCCE2 /* CJSONSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CJSONSerializer.m; path = TouchJSON/Source/JSON/CJSONSerializer.m; sourceTree = SOURCE_ROOT; };
  633 + 3821EF4011CAC98F002CCCE2 /* CJSONDeserializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CJSONDeserializer.h; path = TouchJSON/Source/JSON/CJSONDeserializer.h; sourceTree = SOURCE_ROOT; };
  634 + 3821EF4111CAC98F002CCCE2 /* CJSONDeserializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CJSONDeserializer.m; path = TouchJSON/Source/JSON/CJSONDeserializer.m; sourceTree = SOURCE_ROOT; };
  635 + 3821EF4611CAC98F002CCCE2 /* CDataScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDataScanner.h; path = TouchJSON/Source/CDataScanner.h; sourceTree = SOURCE_ROOT; };
  636 + 3821EF4711CAC990002CCCE2 /* CDataScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDataScanner.m; path = TouchJSON/Source/CDataScanner.m; sourceTree = SOURCE_ROOT; };
637 637 61C35E0F11FF0C85001A2F85 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
638 638 61C35E1011FF0C85001A2F85 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = "<group>"; };
639 639 61C35EF211FF29DB001A2F85 /* back@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back@2x.png"; sourceTree = "<group>"; };
@@ -748,14 +748,14 @@
748 748 ADFB556D0FEACC7A0067CEC1 /* NSDictionary+JSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+JSON.m"; path = "Classes/Extensions/NSDictionary+JSON.m"; sourceTree = SOURCE_ROOT; };
749 749 E566C63212BEF9FB00E3E04E /* iReddit Free.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iReddit Free.app"; sourceTree = BUILT_PRODUCTS_DIR; };
750 750 E566C63412BEF9FC00E3E04E /* iReddit-Free-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "iReddit-Free-Info.plist"; sourceTree = "<group>"; };
751   - E58C0EF912B48A9B004D2070 /* Three20.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Three20.bundle; path = ../three20/src/Three20.bundle; sourceTree = SOURCE_ROOT; };
752   - E58C0EFB12B48AA5004D2070 /* Three20.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20.xcodeproj; path = ../three20/src/Three20/Three20.xcodeproj; sourceTree = SOURCE_ROOT; };
753   - E58C0F3A12B48AB0004D2070 /* Three20Core.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20Core.xcodeproj; path = ../three20/src/Three20Core/Three20Core.xcodeproj; sourceTree = SOURCE_ROOT; };
754   - E58C0F3D12B48AB0004D2070 /* Three20Network.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20Network.xcodeproj; path = ../three20/src/Three20Network/Three20Network.xcodeproj; sourceTree = SOURCE_ROOT; };
755   - E58C0F4012B48AB0004D2070 /* Three20Style.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20Style.xcodeproj; path = ../three20/src/Three20Style/Three20Style.xcodeproj; sourceTree = SOURCE_ROOT; };
756   - E58C0F4312B48AB0004D2070 /* Three20UI.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UI.xcodeproj; path = ../three20/src/Three20UI/Three20UI.xcodeproj; sourceTree = SOURCE_ROOT; };
757   - E58C0F4612B48AB0004D2070 /* Three20UICommon.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UICommon.xcodeproj; path = ../three20/src/Three20UICommon/Three20UICommon.xcodeproj; sourceTree = SOURCE_ROOT; };
758   - E58C0F4912B48AB0004D2070 /* Three20UINavigator.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UINavigator.xcodeproj; path = ../three20/src/Three20UINavigator/Three20UINavigator.xcodeproj; sourceTree = SOURCE_ROOT; };
  751 + E58C0EF912B48A9B004D2070 /* Three20.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Three20.bundle; path = three20/src/Three20.bundle; sourceTree = SOURCE_ROOT; };
  752 + E58C0EFB12B48AA5004D2070 /* Three20.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20.xcodeproj; path = three20/src/Three20/Three20.xcodeproj; sourceTree = SOURCE_ROOT; };
  753 + E58C0F3A12B48AB0004D2070 /* Three20Core.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20Core.xcodeproj; path = three20/src/Three20Core/Three20Core.xcodeproj; sourceTree = SOURCE_ROOT; };
  754 + E58C0F3D12B48AB0004D2070 /* Three20Network.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20Network.xcodeproj; path = three20/src/Three20Network/Three20Network.xcodeproj; sourceTree = SOURCE_ROOT; };
  755 + E58C0F4012B48AB0004D2070 /* Three20Style.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20Style.xcodeproj; path = three20/src/Three20Style/Three20Style.xcodeproj; sourceTree = SOURCE_ROOT; };
  756 + E58C0F4312B48AB0004D2070 /* Three20UI.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UI.xcodeproj; path = three20/src/Three20UI/Three20UI.xcodeproj; sourceTree = SOURCE_ROOT; };
  757 + E58C0F4612B48AB0004D2070 /* Three20UICommon.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UICommon.xcodeproj; path = three20/src/Three20UICommon/Three20UICommon.xcodeproj; sourceTree = SOURCE_ROOT; };
  758 + E58C0F4912B48AB0004D2070 /* Three20UINavigator.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UINavigator.xcodeproj; path = three20/src/Three20UINavigator/Three20UINavigator.xcodeproj; sourceTree = SOURCE_ROOT; };
759 759 E58C100C12B49244004D2070 /* SubredditDataModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubredditDataModel.h; sourceTree = "<group>"; };
760 760 E58C100D12B49244004D2070 /* SubredditDataModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SubredditDataModel.m; sourceTree = "<group>"; };
761 761 E58C109612B4A0DD004D2070 /* RedditWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RedditWindow.h; sourceTree = "<group>"; };
@@ -899,7 +899,7 @@
899 899 3821EF4711CAC990002CCCE2 /* CDataScanner.m */,
900 900 );
901 901 name = TouchJSON;
902   - path = ../TouchJSON/Source;
  902 + path = TouchJSON/Source;
903 903 sourceTree = SOURCE_ROOT;
904 904 };
905 905 3821EF3411CAC98F002CCCE2 /* Extensions */ = {
@@ -913,7 +913,7 @@
913 913 3821EF3A11CAC98F002CCCE2 /* NSDictionary_JSONExtensions.m */,
914 914 );
915 915 name = Extensions;
916   - path = ../TouchJSON/Source/Extensions;
  916 + path = TouchJSON/Source/Extensions;
917 917 sourceTree = SOURCE_ROOT;
918 918 };
919 919 3821EF3B11CAC98F002CCCE2 /* JSON */ = {
@@ -927,7 +927,7 @@
927 927 3821EF4111CAC98F002CCCE2 /* CJSONDeserializer.m */,
928 928 );
929 929 name = JSON;
930   - path = ../TouchJSON/Source/JSON;
  930 + path = TouchJSON/Source/JSON;
931 931 sourceTree = SOURCE_ROOT;
932 932 };
933 933 61C35E0211FF0B67001A2F85 /* XIBs */ = {
@@ -1933,7 +1933,7 @@
1933 1933 GCC_C_LANGUAGE_STANDARD = c99;
1934 1934 GCC_WARN_ABOUT_RETURN_TYPE = YES;
1935 1935 GCC_WARN_UNUSED_VARIABLE = YES;
1936   - HEADER_SEARCH_PATHS = ../three20/Build/Products/three20;
  1936 + HEADER_SEARCH_PATHS = three20/Build/Products/three20;
1937 1937 IPHONEOS_DEPLOYMENT_TARGET = 3.0;
1938 1938 OTHER_LDFLAGS = (
1939 1939 "-all_load",
@@ -1967,7 +1967,7 @@
1967 1967 GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
1968 1968 GCC_WARN_ABOUT_RETURN_TYPE = YES;
1969 1969 GCC_WARN_UNUSED_VARIABLE = YES;
1970   - HEADER_SEARCH_PATHS = ../three20/Build/Products/three20;
  1970 + HEADER_SEARCH_PATHS = three20/Build/Products/three20;
1971 1971 IPHONEOS_DEPLOYMENT_TARGET = 3.0;
1972 1972 OTHER_LDFLAGS = (
1973 1973 "-all_load",
@@ -1987,7 +1987,7 @@
1987 1987 GCC_C_LANGUAGE_STANDARD = c99;
1988 1988 GCC_WARN_ABOUT_RETURN_TYPE = YES;
1989 1989 GCC_WARN_UNUSED_VARIABLE = YES;
1990   - HEADER_SEARCH_PATHS = ../three20/Build/Products/three20;
  1990 + HEADER_SEARCH_PATHS = three20/Build/Products/three20;
1991 1991 IPHONEOS_DEPLOYMENT_TARGET = 3.0;
1992 1992 OTHER_LDFLAGS = (
1993 1993 "-ObjC",
1  three20
... ... @@ -0,0 +1 @@
  1 +Subproject commit b253114c6cfddec28c0f32a0478ffe5283ba7c51

0 comments on commit 49b1f01

Please sign in to comment.
Something went wrong with that request. Please try again.