trev's repos -- libsimplepgp

trev's repos >> libsimplepgp

commit:	55a5cf3e5a38bff129841397af0e2a33cc822729
author:	mrmekon
committer:	mrmekon
date:	Sat Nov 12 21:24:26 2011 -0500
parents:	50572af345cf9a8d3d9985eff67bf8946fb7f01e

Moved ios-static library downloading logic out into its own script so graphical Xcode can run it

diff --git a/build_ios.sh b/build_ios.sh
line changes: +2/-16
index d4163af..bfce8e6
--- a/build_ios.sh
+++ b/build_ios.sh

@@ -1,21 +1,7 @@
 #!/bin/sh
 
-IOS_LIB_URL="http://ios-static-libraries.googlecode.com/files/ios-libraries-2011-03-10-065803.zip"
-IOS_LIB_FILE="ios-libraries-2011-03-10-065803.zip"
-
-if [ ! -d "Binaries" ]; then
-    wget ${IOS_LIB_URL} > /dev/null
-    if [ ! -e ${IOS_LIB_FILE} ]; then
-	echo "FAILED TO DOWNLOAD IOS LIBRARIES.  CANNOT CONTINUE."
-	exit 1
-    fi
-    unzip ${IOS_LIB_FILE} > /dev/null
-    if [ $? -ne 0 ]; then
-	echo "Unzip failed.  CANNOT CONTINUE."
-	exit 1
-    fi
-fi
-
+sh get_libs.sh
+if [ $? -ne 0 ]; then exit 1; fi;
 
 echo "Building iOS library (armv6)..."
 xcodebuild ARCHS="armv6" -project simplepgp.xcodeproj -alltargets \

diff --git a/get_libs.sh b/get_libs.sh
line changes: +20/-0
index 0000000..0877808
--- /dev/null
+++ b/get_libs.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+IOS_LIB_URL="http://ios-static-libraries.googlecode.com/files/ios-libraries-2011-03-10-065803.zip"
+IOS_LIB_FILE="ios-libraries-2011-03-10-065803.zip"
+
+if [ ! -d "Binaries" ]; then
+    if [ ! -e ${IOS_LIB_FILE} ]; then
+	wget ${IOS_LIB_URL} > /dev/null
+    fi
+    if [ ! -e ${IOS_LIB_FILE} ]; then
+	echo "FAILED TO DOWNLOAD IOS LIBRARIES.  CANNOT CONTINUE."
+	exit 1
+    fi
+    unzip ${IOS_LIB_FILE} > /dev/null
+    if [ $? -ne 0 ]; then
+	echo "Unzip failed.  CANNOT CONTINUE."
+	exit 1
+    fi
+fi
+exit 0 
\ No newline at end of file

diff --git a/simplepgp.xcodeproj/project.pbxproj b/simplepgp.xcodeproj/project.pbxproj
line changes: +17/-0
index 43d097e..7847360
--- a/simplepgp.xcodeproj/project.pbxproj
+++ b/simplepgp.xcodeproj/project.pbxproj

@@ -140,6 +140,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "simplepgp" */;
 			buildPhases = (
+				6926B15A146F611300F69705 /* ShellScript */,
 				D2AAC07A0554694100DB518D /* Headers */,
 				D2AAC07B0554694100DB518D /* Sources */,
 				D2AAC07C0554694100DB518D /* Frameworks */,

@@ -178,6 +179,22 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		6926B15A146F611300F69705 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "./get_libs.sh\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		D2AAC07B0554694100DB518D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;

diff --git a/simplepgp.xcodeproj/trevor.mode1v3 b/simplepgp.xcodeproj/trevor.mode1v3
line changes: +4/-6
index 5235dae..bd29df0
--- a/simplepgp.xcodeproj/trevor.mode1v3
+++ b/simplepgp.xcodeproj/trevor.mode1v3

@@ -273,16 +273,14 @@
 								<string>0867D69AFE84028FC02AAC07</string>
 								<string>1C37FBAC04509CD000000102</string>
 								<string>6926B08A146F4B6600F69705</string>
-								<string>6926B08B146F4B6600F69705</string>
-								<string>6926B08C146F4B6600F69705</string>
-								<string>6926B08D146F4B6600F69705</string>
 								<string>1C37FABC05509CD000000102</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>7</integer>
-									<integer>0</integer>
+									<integer>27</integer>
+									<integer>26</integer>
+									<integer>25</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>

@@ -333,7 +331,7 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>6926B14F146F5EB300F69705</string>
+										<string>6926B15C146F617D00F69705</string>
 										<key>history</key>
 										<array>
 											<string>69868BD91460F468004C5D9B</string>

diff --git a/simplepgp.xcodeproj/trevor.pbxuser b/simplepgp.xcodeproj/trevor.pbxuser
line changes: +22/-0
index 851f3aa..c2301eb
--- a/simplepgp.xcodeproj/trevor.pbxuser
+++ b/simplepgp.xcodeproj/trevor.pbxuser

@@ -427,6 +427,8 @@
 			6926B13C146F5E5F00F69705 /* PBXTextBookmark */ = 6926B13C146F5E5F00F69705 /* PBXTextBookmark */;
 			6926B13F146F5E7F00F69705 /* PBXTextBookmark */ = 6926B13F146F5E7F00F69705 /* PBXTextBookmark */;
 			6926B14F146F5EB300F69705 /* PBXTextBookmark */ = 6926B14F146F5EB300F69705 /* PBXTextBookmark */;
+			6926B15B146F612C00F69705 /* PBXTextBookmark */ = 6926B15B146F612C00F69705 /* PBXTextBookmark */;
+			6926B15C146F617D00F69705 /* PBXTextBookmark */ = 6926B15C146F617D00F69705 /* PBXTextBookmark */;
 			69868BD11460F42D004C5D9B = 69868BD11460F42D004C5D9B /* PBXTextBookmark */;
 			69868BD91460F468004C5D9B = 69868BD91460F468004C5D9B /* PBXTextBookmark */;
 			69868C931460F7C3004C5D9B = 69868C931460F7C3004C5D9B /* PBXTextBookmark */;

@@ -4251,6 +4253,26 @@
 		vrLen = 1231;
 		vrLoc = 0;
 	};
+	6926B15B146F612C00F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926AD00146DC9BD00F69705 /* packet_private.h */;
+		name = "packet_private.h: 14";
+		rLen = 0;
+		rLoc = 361;
+		rType = 0;
+		vrLen = 1231;
+		vrLoc = 0;
+	};
+	6926B15C146F617D00F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926AD00146DC9BD00F69705 /* packet_private.h */;
+		name = "packet_private.h: 14";
+		rLen = 0;
+		rLoc = 361;
+		rType = 0;
+		vrLen = 1231;
+		vrLoc = 0;
+	};
 	69868AD41460E35F004C5D9B /* Source Control */ = {
 		isa = PBXSourceControlManager;
 		fallbackIsa = XCSourceControlManager;