Contributed Logic / changeset

     1.1 --- a/tunblick/Sparkle.xcodeproj/default.pbxuser	Wed Jul 29 11:23:17 2009 +0200
     1.2 +++ b/tunblick/Sparkle.xcodeproj/default.pbxuser	Wed Jul 29 11:28:31 2009 +0200
     1.3 @@ -1,23 +1,70 @@
     1.4  // !$*UTF8*$!
     1.5  {
     1.6  	0867D690FE84028FC02AAC07 /* Project object */ = {
     1.7 -		activeArchitecture = i386;
     1.8 -		activeBuildConfigurationName = Debug;
     1.9 +		activeBuildConfigurationName = Release;
    1.10  		activeExecutable = FAEC981A0D94C8750008EDA9 /* Sparkle Test App */;
    1.11 -		activeTarget = 61B5F90109C4CEE200B25A18 /* Sparkle Test App */;
    1.12 +		activeTarget = 8DC2EF4F0486A6940098B216 /* Sparkle */;
    1.13  		codeSenseManager = FAEC98240D94C8760008EDA9 /* Code sense */;
    1.14  		executables = (
    1.15  			FAEC981A0D94C8750008EDA9 /* Sparkle Test App */,
    1.16  			FAEC981B0D94C8750008EDA9 /* Relaunch Tool */,
    1.17 +			A86A4DB0101DFA8A002BFDFC /* relaunch tool */,
    1.18  		);
    1.19  		perUserDictionary = {
    1.20 -			PBXPerProjectTemplateStateSaveDate = 227854453;
    1.21 -			PBXWorkspaceStateSaveDate = 227854453;
    1.22 +			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
    1.23 +				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
    1.24 +				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
    1.25 +				PBXFileTableDataSourceColumnWidthsKey = (
    1.26 +					20,
    1.27 +					364,
    1.28 +					20,
    1.29 +					48,
    1.30 +					43,
    1.31 +					43,
    1.32 +					20,
    1.33 +				);
    1.34 +				PBXFileTableDataSourceColumnsKey = (
    1.35 +					PBXFileDataSource_FiletypeID,
    1.36 +					PBXFileDataSource_Filename_ColumnID,
    1.37 +					PBXFileDataSource_Built_ColumnID,
    1.38 +					PBXFileDataSource_ObjectSize_ColumnID,
    1.39 +					PBXFileDataSource_Errors_ColumnID,
    1.40 +					PBXFileDataSource_Warnings_ColumnID,
    1.41 +					PBXFileDataSource_Target_ColumnID,
    1.42 +				);
    1.43 +			};
    1.44 +			PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
    1.45 +				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
    1.46 +				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
    1.47 +				PBXFileTableDataSourceColumnWidthsKey = (
    1.48 +					20,
    1.49 +					324,
    1.50 +					60,
    1.51 +					20,
    1.52 +					48,
    1.53 +					43,
    1.54 +					43,
    1.55 +				);
    1.56 +				PBXFileTableDataSourceColumnsKey = (
    1.57 +					PBXFileDataSource_FiletypeID,
    1.58 +					PBXFileDataSource_Filename_ColumnID,
    1.59 +					PBXTargetDataSource_PrimaryAttribute,
    1.60 +					PBXFileDataSource_Built_ColumnID,
    1.61 +					PBXFileDataSource_ObjectSize_ColumnID,
    1.62 +					PBXFileDataSource_Errors_ColumnID,
    1.63 +					PBXFileDataSource_Warnings_ColumnID,
    1.64 +				);
    1.65 +			};
    1.66 +			PBXPerProjectTemplateStateSaveDate = 270492760;
    1.67 +			PBXWorkspaceStateSaveDate = 270492760;
    1.68  		};
    1.69  		sourceControlManager = FAEC98230D94C8760008EDA9 /* Source Control */;
    1.70  		userBuildSettings = {
    1.71  		};
    1.72  	};
    1.73 +	612279D80DB5470200AB99EA /* Sparkle Unit Tests */ = {
    1.74 +		activeExec = 0;
    1.75 +	};
    1.76  	61B5F90109C4CEE200B25A18 /* Sparkle Test App */ = {
    1.77  		activeExec = 0;
    1.78  		executables = (
    1.79 @@ -27,10 +74,33 @@
    1.80  	8DC2EF4F0486A6940098B216 /* Sparkle */ = {
    1.81  		activeExec = 0;
    1.82  	};
    1.83 -	D1E42C2E0CE754AE00F50EB9 /* Relaunch Tool */ = {
    1.84 +	A86A4DB0101DFA8A002BFDFC /* relaunch tool */ = {
    1.85 +		isa = PBXExecutable;
    1.86 +		activeArgIndices = (
    1.87 +		);
    1.88 +		argumentStrings = (
    1.89 +		);
    1.90 +		autoAttachOnCrash = 1;
    1.91 +		breakpointsEnabled = 1;
    1.92 +		configStateDict = {
    1.93 +		};
    1.94 +		customDataFormattersEnabled = 1;
    1.95 +		debuggerPlugin = GDBDebugging;
    1.96 +		disassemblyDisplayState = 0;
    1.97 +		enableDebugStr = 1;
    1.98 +		environmentEntries = (
    1.99 +		);
   1.100 +		executableSystemSymbolLevel = 0;
   1.101 +		executableUserSymbolLevel = 0;
   1.102 +		libgmallocEnabled = 0;
   1.103 +		name = "relaunch tool";
   1.104 +		sourceDirectories = (
   1.105 +		);
   1.106 +	};
   1.107 +	DAAEFC950DA571DF0051E0D0 /* relaunch tool */ = {
   1.108  		activeExec = 0;
   1.109  		executables = (
   1.110 -			FAEC981B0D94C8750008EDA9 /* Relaunch Tool */,
   1.111 +			A86A4DB0101DFA8A002BFDFC /* relaunch tool */,
   1.112  		);
   1.113  	};
   1.114  	FAEC981A0D94C8750008EDA9 /* Sparkle Test App */ = {

     2.1 --- a/tunblick/Sparkle.xcodeproj/project.pbxproj	Wed Jul 29 11:23:17 2009 +0200
     2.2 +++ b/tunblick/Sparkle.xcodeproj/project.pbxproj	Wed Jul 29 11:28:31 2009 +0200
     2.3 @@ -3,7 +3,7 @@
     2.4  	archiveVersion = 1;
     2.5  	classes = {
     2.6  	};
     2.7 -	objectVersion = 44;
     2.8 +	objectVersion = 45;
     2.9  	objects = {
    2.10  
    2.11  /* Begin PBXBuildFile section */
    2.12 @@ -675,7 +675,7 @@
    2.13  		0867D690FE84028FC02AAC07 /* Project object */ = {
    2.14  			isa = PBXProject;
    2.15  			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Sparkle" */;
    2.16 -			compatibilityVersion = "Xcode 3.0";
    2.17 +			compatibilityVersion = "Xcode 3.1";
    2.18  			hasScannedForEncodings = 1;
    2.19  			knownRegions = (
    2.20  				English,
    2.21 @@ -976,6 +976,8 @@
    2.22  			isa = XCBuildConfiguration;
    2.23  			baseConfigurationReference = FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */;
    2.24  			buildSettings = {
    2.25 +				ARCHS = "$(NATIVE_ARCH)";
    2.26 +				SDKROOT = "";
    2.27  			};
    2.28  			name = Debug;
    2.29  		};
    2.30 @@ -983,13 +985,16 @@
    2.31  			isa = XCBuildConfiguration;
    2.32  			baseConfigurationReference = FA1941D50D94A70100DD942E /* ConfigFrameworkRelease.xcconfig */;
    2.33  			buildSettings = {
    2.34 +				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
    2.35  				GCC_DEBUGGING_SYMBOLS = full;
    2.36 +				SDKROOT = macosx10.5;
    2.37  			};
    2.38  			name = Release;
    2.39  		};
    2.40  		1DEB91B208733DA50010E9CD /* Debug */ = {
    2.41  			isa = XCBuildConfiguration;
    2.42  			buildSettings = {
    2.43 +				ARCHS = "$(NATIVE_ARCH)";
    2.44  				WARNING_CFLAGS = "-Wundeclared-selector";
    2.45  			};
    2.46  			name = Debug;
    2.47 @@ -997,6 +1002,8 @@
    2.48  		1DEB91B308733DA50010E9CD /* Release */ = {
    2.49  			isa = XCBuildConfiguration;
    2.50  			buildSettings = {
    2.51 +				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
    2.52 +				SDKROOT = macosx10.5;
    2.53  				WARNING_CFLAGS = "-Wundeclared-selector";
    2.54  			};
    2.55  			name = Release;
    2.56 @@ -1004,7 +1011,8 @@
    2.57  		61072EAD0DF263BD008FE88B /* Release (GC dual-mode; 10.5-only) */ = {
    2.58  			isa = XCBuildConfiguration;
    2.59  			buildSettings = {
    2.60 -				GCC_VERSION = "";
    2.61 +				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
    2.62 +				SDKROOT = macosx10.5;
    2.63  				WARNING_CFLAGS = "-Wundeclared-selector";
    2.64  			};
    2.65  			name = "Release (GC dual-mode; 10.5-only)";
    2.66 @@ -1013,7 +1021,9 @@
    2.67  			isa = XCBuildConfiguration;
    2.68  			baseConfigurationReference = 61072EB20DF2640C008FE88B /* ConfigFrameworkReleaseGCSupport.xcconfig */;
    2.69  			buildSettings = {
    2.70 +				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
    2.71  				INSTALL_PATH = "@loader_path/../Frameworks";
    2.72 +				SDKROOT = macosx10.5;
    2.73  			};
    2.74  			name = "Release (GC dual-mode; 10.5-only)";
    2.75  		};
    2.76 @@ -1021,6 +1031,8 @@
    2.77  			isa = XCBuildConfiguration;
    2.78  			baseConfigurationReference = FA1941D20D94A70100DD942E /* ConfigTestAppRelease.xcconfig */;
    2.79  			buildSettings = {
    2.80 +				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
    2.81 +				SDKROOT = macosx10.5;
    2.82  			};
    2.83  			name = "Release (GC dual-mode; 10.5-only)";
    2.84  		};
    2.85 @@ -1028,6 +1040,8 @@
    2.86  			isa = XCBuildConfiguration;
    2.87  			baseConfigurationReference = FA1941D40D94A70100DD942E /* ConfigRelaunchRelease.xcconfig */;
    2.88  			buildSettings = {
    2.89 +				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
    2.90 +				SDKROOT = macosx10.5;
    2.91  			};
    2.92  			name = "Release (GC dual-mode; 10.5-only)";
    2.93  		};
    2.94 @@ -1035,7 +1049,7 @@
    2.95  			isa = XCBuildConfiguration;
    2.96  			buildSettings = {
    2.97  				ALWAYS_SEARCH_USER_PATHS = NO;
    2.98 -				ARCHS = "$(NATIVE_ARCH)";
    2.99 +				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
   2.100  				COPY_PHASE_STRIP = YES;
   2.101  				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
   2.102  				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
   2.103 @@ -1063,7 +1077,7 @@
   2.104  			isa = XCBuildConfiguration;
   2.105  			buildSettings = {
   2.106  				ALWAYS_SEARCH_USER_PATHS = NO;
   2.107 -				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
   2.108 +				ARCHS = "$(NATIVE_ARCH)";
   2.109  				COPY_PHASE_STRIP = NO;
   2.110  				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
   2.111  				GCC_DYNAMIC_NO_PIC = NO;
   2.112 @@ -1083,6 +1097,7 @@
   2.113  				);
   2.114  				PREBINDING = NO;
   2.115  				PRODUCT_NAME = "Sparkle Unit Tests";
   2.116 +				SDKROOT = "";
   2.117  				WRAPPER_EXTENSION = octest;
   2.118  				ZERO_LINK = NO;
   2.119  			};
   2.120 @@ -1092,7 +1107,7 @@
   2.121  			isa = XCBuildConfiguration;
   2.122  			buildSettings = {
   2.123  				ALWAYS_SEARCH_USER_PATHS = NO;
   2.124 -				ARCHS = "$(NATIVE_ARCH)";
   2.125 +				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
   2.126  				COPY_PHASE_STRIP = YES;
   2.127  				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
   2.128  				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
   2.129 @@ -1120,6 +1135,8 @@
   2.130  			isa = XCBuildConfiguration;
   2.131  			baseConfigurationReference = FA1941CB0D94A70100DD942E /* ConfigTestAppDebug.xcconfig */;
   2.132  			buildSettings = {
   2.133 +				ARCHS = "$(NATIVE_ARCH)";
   2.134 +				SDKROOT = "";
   2.135  			};
   2.136  			name = Debug;
   2.137  		};
   2.138 @@ -1127,6 +1144,8 @@
   2.139  			isa = XCBuildConfiguration;
   2.140  			baseConfigurationReference = FA1941D20D94A70100DD942E /* ConfigTestAppRelease.xcconfig */;
   2.141  			buildSettings = {
   2.142 +				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
   2.143 +				SDKROOT = macosx10.5;
   2.144  			};
   2.145  			name = Release;
   2.146  		};
   2.147 @@ -1134,6 +1153,8 @@
   2.148  			isa = XCBuildConfiguration;
   2.149  			baseConfigurationReference = FA1941D30D94A70100DD942E /* ConfigRelaunchDebug.xcconfig */;
   2.150  			buildSettings = {
   2.151 +				ARCHS = "$(NATIVE_ARCH)";
   2.152 +				SDKROOT = "";
   2.153  			};
   2.154  			name = Debug;
   2.155  		};
   2.156 @@ -1141,6 +1162,8 @@
   2.157  			isa = XCBuildConfiguration;
   2.158  			baseConfigurationReference = FA1941D40D94A70100DD942E /* ConfigRelaunchRelease.xcconfig */;
   2.159  			buildSettings = {
   2.160 +				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
   2.161 +				SDKROOT = macosx10.5;
   2.162  			};
   2.163  			name = Release;
   2.164  		};

     3.1 --- a/tunblick/Tunnelblick.xcodeproj/project.pbxproj	Wed Jul 29 11:23:17 2009 +0200
     3.2 +++ b/tunblick/Tunnelblick.xcodeproj/project.pbxproj	Wed Jul 29 11:28:31 2009 +0200
     3.3 @@ -3,7 +3,7 @@
     3.4  	archiveVersion = 1;
     3.5  	classes = {
     3.6  	};
     3.7 -	objectVersion = 44;
     3.8 +	objectVersion = 45;
     3.9  	objects = {
    3.10  
    3.11  /* Begin PBXBuildFile section */
    3.12 @@ -422,7 +422,7 @@
    3.13  		29B97313FDCFA39411CA2CEA /* Project object */ = {
    3.14  			isa = PBXProject;
    3.15  			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Tunnelblick" */;
    3.16 -			compatibilityVersion = "Xcode 3.0";
    3.17 +			compatibilityVersion = "Xcode 3.1";
    3.18  			hasScannedForEncodings = 1;
    3.19  			knownRegions = (
    3.20  				English,
    3.21 @@ -672,21 +672,17 @@
    3.22  				GCC_WARN_ABOUT_RETURN_TYPE = YES;
    3.23  				GCC_WARN_UNUSED_VARIABLE = YES;
    3.24  				PREBINDING = NO;
    3.25 -				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
    3.26  			};
    3.27  			name = Debug;
    3.28  		};
    3.29  		C01FCF5008A954540054247B /* Release */ = {
    3.30  			isa = XCBuildConfiguration;
    3.31  			buildSettings = {
    3.32 -				ARCHS = (
    3.33 -					ppc,
    3.34 -					i386,
    3.35 -				);
    3.36 +				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
    3.37  				GCC_WARN_ABOUT_RETURN_TYPE = YES;
    3.38  				GCC_WARN_UNUSED_VARIABLE = YES;
    3.39  				PREBINDING = NO;
    3.40 -				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
    3.41 +				SDKROOT = macosx10.5;
    3.42  			};
    3.43  			name = Release;
    3.44  		};