remove checked-in documentation, & sdk generation

Install.rtf

@@ -1,11 +1,9 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf430
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf320
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\})}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid1}
-{\list\listtemplateid2\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\})}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid2}
-{\list\listtemplateid3\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\})}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid3}}
-{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}}
-\vieww9000\viewh8400\viewkind0
+{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\})}{\leveltext\leveltemplateid1\'02\'00);}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid1}
+{\list\listtemplateid2\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\})}{\leveltext\leveltemplateid101\'02\'00);}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid2}}
+{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}}
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
 
 \f0\b\fs24 \cf0 JSON Framework Installation\
@@ -28,38 +26,21 @@ If you run into trouble, check to see if the answers to the {\field{\*\fldinst{H
 {\listtext	3)	}Use '#import "JSON.h"' in  your source files.\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 \cf0 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
-\i If you're upgrading from a previous version, make sure you're deleting the old JSON group first, moving all the files to Trash.\
-
-\i0 \
-
-\b Option 2: Use the iPhone Custom SDK
-\b0 \
-\
-\
-\pard\tx220\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural\pardirnatural
-\ls2\ilvl0\cf0 {\listtext	1)	}Create a directory ~/Library/SDKs/, if it does not already exist.\
-{\listtext	2)	}Copy the SDKs/JSON folder from this disk image into the directory you just created.\
-{\listtext	3)	}In your Project, select your target in the left-hand menu and click the blue Info button (Apple-i) and select the "Build" tab.\
-{\listtext	4)	}Make sure "All Configurations" is selected in the "Configuration" drop-down.\
-{\listtext	5)	}Add the following new line to the "Additional SDKs" option:\uc0\u8232 $HOME/Library/SDKs/JSON/$\{PLATFORM_NAME\}.sdk\
-{\listtext	6)	}Add the following two options to the "Other Linker Flags" option:\uc0\u8232 -ObjC -ljson\
-{\listtext	7)	}Use '#import <JSON/JSON.h>' in your source files.\
+\i \cf0 If you're upgrading from a previous version, make sure you're deleting the old JSON group first, moving all the files to Trash.\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-\cf0 \
 
-\i Creating custom SDKs is not very well documented from Apple, so if this option fails for you, please go with Option 1 and just copy the source into your application.
-\i0 \
-\
+\i0 \cf0 \
 
-\b Option 3: Use the Embedded Framework\
+\b Option 2: Use the Embedded Framework\
 
 \b0 This option will 
 \i not
 \i0  work for iPhone applications! It only works for standard desktop Mac applications.\
 \
 \pard\tx220\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural\pardirnatural
-\ls3\ilvl0\cf0 {\listtext	1)	}If it doesn't already exist, create a directory called ~/Library/Frameworks.\
+\ls2\ilvl0\cf0 {\listtext	1)	}If it doesn't already exist, create a directory called ~/Library/Frameworks.\
 {\listtext	2)	}Copy the JSON.framework directory to ~/Library/Frameworks.\
 {\listtext	3)	}Use the "Add existing file" menu to add ~/Library/Frameworks/JSON.framework to your application. \
 {\listtext	4)	}Add a "Copy files" build phase to copy the framework into your application. This should copy files to the 'Frameworks' folder inside Resources.\

JSON.xcodeproj/project.pbxproj

@@ -23,7 +23,6 @@
 			buildConfigurationList = BCC047190FB651CD00F9F2D3 /* Build configuration list for PBXAggregateTarget "Documentation" */;
 			buildPhases = (
 				BCC047150FB651AF00F9F2D3 /* Install Docset */,
-				BC86E8BD0FB760D600534590 /* Refresh API docs */,
 			);
 			dependencies = (
 			);
@@ -127,7 +126,6 @@
 		BC74B6EB0FC9FAD0000BD3DD /* MaxDepth.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MaxDepth.m; sourceTree = "<group>"; };
 		BC74B7AC0FCA8B89000BD3DD /* ProxyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProxyTest.h; sourceTree = "<group>"; };
 		BC74B7AD0FCA8B89000BD3DD /* ProxyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProxyTest.m; sourceTree = "<group>"; };
-		BC86E8BB0FB75C0200534590 /* RegenerateDocumentation.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = RegenerateDocumentation.sh; sourceTree = "<group>"; };
 		BCC0466A0FB62CA600F9F2D3 /* Install.rtf */ = {isa = PBXFileReference; explicitFileType = text.rtf; path = Install.rtf; sourceTree = "<group>"; };
 		BCC0466C0FB62CF100F9F2D3 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
 		BCC047320FB6584C00F9F2D3 /* InstallDocumentation.sh */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = InstallDocumentation.sh; sourceTree = "<group>"; };
@@ -273,7 +271,6 @@
 		BCC046DF0FB6478C00F9F2D3 /* Scripts */ = {
 			isa = PBXGroup;
 			children = (
-				BC86E8BB0FB75C0200534590 /* RegenerateDocumentation.sh */,
 				BCC047330FB6586100F9F2D3 /* CreateDiskImage.sh */,
 				BCC047320FB6584C00F9F2D3 /* InstallDocumentation.sh */,
 			);
@@ -477,20 +474,6 @@
 			shellPath = /bin/sh;
 			shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
 		};
-		BC86E8BD0FB760D600534590 /* Refresh API docs */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Refresh API docs";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "exec $SOURCE_ROOT/Scripts/RegenerateDocumentation.sh";
-		};
 		BCC046C10FB645F100F9F2D3 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

Scripts/CreateDiskImage.sh

@@ -19,37 +19,14 @@ mkdir -p $DISK_IMAGE
 xcodebuild -target JSON -configuration Release install || exit 1
 cp -p -R /tmp/Frameworks/$PROJECT.framework $DISK_IMAGE
 
-IPHONE_SDK=3.0
-
-# Create the iPhone SDK directly in the disk image folder.
-xcodebuild -target libjson -configuration Release -sdk iphoneos$IPHONE_SDK install \
-    ARCHS=armv6 \
-    DSTROOT=$DISK_IMAGE/SDKs/JSON/iphoneos.sdk || exit 1
-sed -e "s/%PROJECT%/$PROJECT/g" \
-    -e "s/%VERS%/$VERS/g" \
-    -e "s/%IPHONE_SDK%/$IPHONE_SDK/g" \
-    $SOURCE_ROOT/Resources/iphoneos.sdk/SDKSettings.plist > $DISK_IMAGE/SDKs/JSON/iphoneos.sdk/SDKSettings.plist || exit 1
-
-xcodebuild -target libjson -configuration Release -sdk iphonesimulator$IPHONE_SDK install \
-    ARCHS=i386 \
-    DSTROOT=$DISK_IMAGE/SDKs/JSON/iphonesimulator.sdk || exit 1
-sed -e "s/%PROJECT%/$PROJECT/g" \
-    -e "s/%VERS%/$VERS/g" \
-    -e "s/%IPHONE_SDK%/$IPHONE_SDK/g" \
-    $SOURCE_ROOT/Resources/iphonesimulator.sdk/SDKSettings.plist > $DISK_IMAGE/SDKs/JSON/iphonesimulator.sdk/SDKSettings.plist || exit 1    
-
-# Allow linking statically into normal OS X apps
-xcodebuild -target libjson -configuration Release -sdk macosx10.5 install \
-    DSTROOT=$DISK_IMAGE/SDKs/JSON/macosx.sdk || exit 1
-
 # Copy the source verbatim into the disk image.
 cp -p -R $SOURCE_ROOT/Source $DISK_IMAGE/$PROJECT
 rm -rf $DISK_IMAGE/$PROJECT/.svn
 
 # Create the documentation
 xcodebuild -target Documentation -configuration Release install || exit 1
-cp -p -R $INSTALL_DIR/Documentation/html $DISK_IMAGE/Documentation
-rm -rf $DISK_IMAGE/Documentation/.svn
+cp -p -R $INSTALL_DIR/DocSet/html $DISK_IMAGE/Documentation
+rm -rf $DISK_IMAGE/DocSet/.svn
 
 cat <<HTML > $DISK_IMAGE/Documentation.html
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">