Call cleanUpExpansionDirectory: only in the Mac version

bellroy · May 27, 2011 · a550537 · a550537
1 parent 0a3ed03
commit a550537
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 52 deletions.
diff --git a/ZKDataArchive.m b/ZKDataArchive.m
@@ -148,8 +148,8 @@ - (NSUInteger) inflateInFolder:(NSString *)enclosingFolder withFolderName:(NSStr
 #if ZK_TARGET_OS_MAC
 	if (rfFlag)
 		[self.fileManager zk_combineAppleDoubleInDirectory:expansionDirectory];
-#endif
 	[self cleanUpExpansionDirectory:expansionDirectory];
+#endif
 
 	return zkSucceeded;
 }

diff --git a/ZKFileArchive.m b/ZKFileArchive.m
@@ -239,8 +239,8 @@ - (NSInteger) inflateToDirectory:(NSString *)expansionDirectory usingResourceFor
 #if ZK_TARGET_OS_MAC
 	if (result == zkSucceeded && rfFlag)
 		[self.fileManager zk_combineAppleDoubleInDirectory:expansionDirectory];
-#endif
 	[self cleanUpExpansionDirectory:expansionDirectory];
+#endif
 
 	return result;
 }

diff --git a/ZipKit.xcodeproj/karl.pbxuser b/ZipKit.xcodeproj/karl.pbxuser
@@ -64,12 +64,12 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 300206706;
-			PBXWorkspaceStateSaveDate = 300206706;
+			PBXPerProjectTemplateStateSaveDate = 328204724;
+			PBXWorkspaceStateSaveDate = 328204724;
 		};
 		perUserProjectItems = {
-			CBF0D2A211E4D07B00B81C32 /* PBXTextBookmark */ = CBF0D2A211E4D07B00B81C32 /* PBXTextBookmark */;
-			CBF0D2A311E4D07B00B81C32 /* PBXTextBookmark */ = CBF0D2A311E4D07B00B81C32 /* PBXTextBookmark */;
+			CB5B9114139001D5001D3BF7 /* PBXTextBookmark */ = CB5B9114139001D5001D3BF7 /* PBXTextBookmark */;
+			CB5B9115139001D5001D3BF7 /* PBXTextBookmark */ = CB5B9115139001D5001D3BF7 /* PBXTextBookmark */;
 		};
 		sourceControlManager = CB9B9A1C109F63A8003E3F8B /* Source Control */;
 		userBuildSettings = {
@@ -85,6 +85,26 @@
 	8DC2EF4F0486A6940098B216 /* ZipKit */ = {
 		activeExec = 0;
 	};
+	CB5B9114139001D5001D3BF7 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = CB9B9B42109F64A0003E3F8B /* ZKDefs.m */;
+		name = "ZKDefs.m: 12";
+		rLen = 0;
+		rLoc = 232;
+		rType = 0;
+		vrLen = 1169;
+		vrLoc = 0;
+	};
+	CB5B9115139001D5001D3BF7 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = CB9B9B42109F64A0003E3F8B /* ZKDefs.m */;
+		name = "ZKDefs.m: 12";
+		rLen = 0;
+		rLoc = 232;
+		rType = 0;
+		vrLen = 1169;
+		vrLoc = 0;
+	};
 	CB9B9A1C109F63A8003E3F8B /* Source Control */ = {
 		isa = PBXSourceControlManager;
 		fallbackIsa = XCSourceControlManager;
@@ -227,9 +247,9 @@
 	};
 	CB9B9B40109F64A0003E3F8B /* ZKDataArchive.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1019, 7543}}";
-			sepNavSelRange = "{2870, 0}";
-			sepNavVisRange = "{1856, 1357}";
+			sepNavIntBoundsRect = "{{0, 0}, {1019, 4888}}";
+			sepNavSelRange = "{5552, 0}";
+			sepNavVisRange = "{4718, 2257}";
 		};
 	};
 	CB9B9B41109F64A0003E3F8B /* ZKDefs.h */ = {
@@ -255,9 +275,9 @@
 	};
 	CB9B9B44109F64A0003E3F8B /* ZKFileArchive.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1019, 14022}}";
-			sepNavSelRange = "{20947, 0}";
-			sepNavVisRange = "{19933, 1531}";
+			sepNavIntBoundsRect = "{{0, 0}, {1019, 9243}}";
+			sepNavSelRange = "{9867, 25}";
+			sepNavVisRange = "{8553, 2679}";
 		};
 	};
 	CB9B9B46109F64A0003E3F8B /* ZKLFHeader.m */ = {
@@ -280,24 +300,4 @@
 	CB9B9CED109F6769003E3F8B /* touchzipkit */ = {
 		activeExec = 0;
 	};
-	CBF0D2A211E4D07B00B81C32 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = CB9B9B42109F64A0003E3F8B /* ZKDefs.m */;
-		name = "ZKDefs.m: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1169;
-		vrLoc = 0;
-	};
-	CBF0D2A311E4D07B00B81C32 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = CB9B9B42109F64A0003E3F8B /* ZKDefs.m */;
-		name = "ZKDefs.m: 12";
-		rLen = 0;
-		rLoc = 232;
-		rType = 0;
-		vrLen = 1169;
-		vrLoc = 0;
-	};
 }
diff --git a/ZipKit.xcodeproj/karl.perspectivev3 b/ZipKit.xcodeproj/karl.perspectivev3
@@ -283,15 +283,15 @@
 			<array>
 				<string>XCToolbarPerspectiveControl</string>
 				<string>NSToolbarSeparatorItem</string>
-				<string>action</string>
 				<string>active-combo-popup</string>
-				<string>NSToolbarSpaceItem</string>
-				<string>build</string>
+				<string>action</string>
+				<string>NSToolbarFlexibleSpaceItem</string>
+				<string>debugger-enable-breakpoints</string>
 				<string>build-and-go</string>
-				<string>go</string>
-				<string>clean-target</string>
-				<string>clean</string>
+				<string>com.apple.ide.PBXToolbarStopButton</string>
+				<string>get-info</string>
 				<string>NSToolbarFlexibleSpaceItem</string>
+				<string>com.apple.pbx.toolbar.searchfield</string>
 			</array>
 			<key>ControllerClassBaseName</key>
 			<string></string>
@@ -304,6 +304,8 @@
 			<key>Layout</key>
 			<array>
 				<dict>
+					<key>BecomeActive</key>
+					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -385,8 +387,6 @@
 					<key>Dock</key>
 					<array>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -404,10 +404,10 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>CBF0D2A311E4D07B00B81C32</string>
+										<string>CB5B9115139001D5001D3BF7</string>
 										<key>history</key>
 										<array>
-											<string>CBF0D2A211E4D07B00B81C32</string>
+											<string>CB5B9114139001D5001D3BF7</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -462,7 +462,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{0, 0}, {614, 336}}</string>
+										<string>{{10, 27}, {1080, -27}}</string>
+										<key>RubberWindowFrame</key>
+										<string>297 339 1373 839 0 0 1920 1178 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXProjectFindModule</string>
@@ -500,9 +502,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {1080, -27}}</string>
-										<key>RubberWindowFrame</key>
-										<string>297 339 1373 839 0 0 1920 1178 </string>
+										<string>{{0, 0}, {568, 405}}</string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -530,11 +530,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>CBF0D24C11E4CCD900B81C32</string>
+				<string>CB5B9116139001D5001D3BF7</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>CBF0D24D11E4CCD900B81C32</string>
+				<string>CB5B9117139001D5001D3BF7</string>
 				<string>CB3742AB106A5CEF00AED801</string>
-				<string>CBF0D24E11E4CCD900B81C32</string>
+				<string>CB5B9118139001D5001D3BF7</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -707,11 +707,11 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>300208251.707389</real>
+	<real>328204757.00180697</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
-	<integer>2</integer>
+	<integer>1</integer>
 	<key>ToolbarIsVisible</key>
 	<true/>
 	<key>ToolbarSizeMode</key>
@@ -724,7 +724,7 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>/Users/karl/Projects/zipkit/ZipKit.xcodeproj</string>
+		<string>/Users/karl/Projects/ZipKit/ZipKit.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
 	<string>297 339 1373 839 0 0 1920 1178 </string>

diff --git a/ZipKit.xcodeproj/project.pbxproj b/ZipKit.xcodeproj/project.pbxproj
@@ -508,7 +508,14 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ZipKit" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* ZipKit */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
 			projectDirPath = "";