* macosx/Wish.xcodeproj/project.pbxproj: extract build settings that

	* macosx/Wish.xcodeproj/default.pbxuser:   were common to multiple
	* macosx/Wish-Common.xcconfig (new file):  configurations into external
	* macosx/Wish-Debug.xcconfig (new file):   xcconfig files; add extra
	* macosx/Wish-Release.xcconfig (new file): configurations for building
	with SDKs; convert legacy jam-based 'Tk' target to native target with
	single script phase; correct syntax of build setting references to use
	$() throughout; remove unused tcltest sources from 'tktest' target.

	* macosx/README: document new Wish.xcodeproj configurations; other
	minor updates/corrections.

	* generic/tk.h: update location of version numbers in macosx files.

	* macosx/Wish.xcode/project.pbxproj: restore 'tktest' target to working
	* macosx/Wish.xcode/default.pbxuser: order by replicating applicable
	changes to Wish.xcodeproj since 2006-07-20.

1 files changed, 13 insertions, 21 deletions

diff --git a/macosx/Wish.xcodeproj/default.pbxuser b/macosx/Wish.xcodeproj/default.pbxuser
index 3625a77..eb4e7cd 100644
--- a/macosx/Wish.xcodeproj/default.pbxuser
+++ b/macosx/Wish.xcodeproj/default.pbxuser
@@ -6,11 +6,11 @@
 		activeTarget = F9E61D16090A3E94002B3151 /* Tk */;
 		codeSenseManager = F944EB9D08F798180049FDD4 /* Code sense */;
 		executables = (
-			F944EB8F08F798100049FDD4 /* tktest */,
 			F9E61D1C090A4282002B3151 /* Wish */,
+			F944EB8F08F798100049FDD4 /* tktest */,
 		);
 		perUserDictionary = {
-			com.apple.ide.smrt.PBXUserSmartGroupsKey.Rev10 = <040b747970656473747265616d8103e88401408484840e4e534d757461626c654172726179008484074e534172726179008484084e534f626a65637400858401690192848484134e534d757461626c6544696374696f6e6172790084840c4e5344696374696f6e6172790095960792848484084e53537472696e67019584012b146162736f6c75746550617468546f42756e646c658692849a9a008692849a9a046e616d658692849a9a14496d706c656d656e746174696f6e2046696c65738692849a9a03636c7a8692849a9a1550425846696c656e616d65536d61727447726f75708692849a9a0b6465736372697074696f6e8692849a9a103c6e6f206465736372697074696f6e3e8692849a9a08676c6f62616c49448692849a9a183143433045413430303433353045463930303434343130428692849a9a195042585472616e7369656e744c6f636174696f6e4174546f708692849a9a06626f74746f6d8692849a9a0b707265666572656e63657386928497960892849a9a1250425850726f6a65637453636f70654b65798692849a9a035945538692849a9a05696d6167658692849a9a0b536d617274466f6c6465728692849a9a0763616e536176658692848484084e534e756d626572008484074e5356616c7565009584012a849696018692849a9a0572656765788692849a9a225c2e28637c6370707c437c4350507c6d7c6d6d7c6a6176617c73687c7363707429248692849a9a04726f6f748692849a9a093c50524f4a4543543e8692849a9a097265637572736976658692ad92849a9a0669734c656166869284ae9db096008692849a9a07666e6d617463688692849a9a0086868686>;
+			com.apple.ide.smrt.PBXUserSmartGroupsKey.Rev10 = <040b73747265616d747970656481e8038401408484840e4e534d757461626c654172726179008484074e534172726179008484084e534f626a65637400858401690192848484134e534d757461626c6544696374696f6e6172790084840c4e5344696374696f6e6172790095960792848484084e53537472696e67019584012b146162736f6c75746550617468546f42756e646c658692849a9a008692849a9a046e616d658692849a9a14496d706c656d656e746174696f6e2046696c65738692849a9a03636c7a8692849a9a1550425846696c656e616d65536d61727447726f75708692849a9a0b6465736372697074696f6e8692849a9a103c6e6f206465736372697074696f6e3e8692849a9a08676c6f62616c49448692849a9a183143433045413430303433353045463930303434343130428692849a9a195042585472616e7369656e744c6f636174696f6e4174546f708692849a9a06626f74746f6d8692849a9a0b707265666572656e63657386928497960892849a9a1250425850726f6a65637453636f70654b65798692849a9a035945538692849a9a05696d6167658692849a9a0b536d617274466f6c6465728692849a9a0763616e536176658692848484084e534e756d626572008484074e5356616c7565009584012a849696018692849a9a0572656765788692849a9a225c2e28637c6370707c437c4350507c6d7c6d6d7c6a6176617c73687c7363707429248692849a9a04726f6f748692849a9a093c50524f4a4543543e8692849a9a097265637572736976658692ad92849a9a0669734c656166869284ae9db096008692849a9a07666e6d617463688692849a9a0086868686>;
 		};
 		sourceControlManager = F944EB9C08F798180049FDD4 /* Source Control */;
 		userBuildSettings = {
@@ -35,7 +35,7 @@
 		);
 		argumentStrings = (
 			"${SRCROOT}/../../tk/library/demos/widget",
-			"${SRCROOT}/../../tcl/tests/all.tcl",
+			"${SRCROOT}/../../tk/library/demos/ttk_demo.tcl",
 			"${SRCROOT}/../../tk/tests/all.tcl",
 			"-singleproc 1",
 			"-verbose \"bet\"",
@@ -87,6 +87,11 @@
 				value = /Library/Tcl;
 			},
 			{
+				active = YES;
+				name = MallocBadFreeAbort;
+				value = 1;
+			},
+			{
 				active = NO;
 				name = DYLD_PRINT_LIBRARIES;
 			},
@@ -116,15 +121,20 @@
 	};
 	F9E61D16090A3E94002B3151 /* Tk */ = {
 		activeExec = 0;
+		executables = (
+			F9E61D1C090A4282002B3151 /* Wish */,
+		);
 	};
 	F9E61D1C090A4282002B3151 /* Wish */ = {
 		isa = PBXExecutable;
 		activeArgIndex = 0;
 		activeArgIndices = (
 			YES,
+			NO,
 		);
 		argumentStrings = (
 			"${SRCROOT}/../../tk/library/demos/widget",
+			"${SRCROOT}/../../tk/library/demos/ttk_demo.tcl",
 		);
 		autoAttachOnCrash = 1;
 		configStateDict = {
@@ -158,23 +168,12 @@
 		enableDebugStr = 0;
 		environmentEntries = (
 			{
-				active = YES;
-				name = DYLD_FRAMEWORK_PATH;
-				value = "${SYMROOT}";
-			},
-			{
-				active = YES;
-				name = DYLD_LIBRARY_PATH;
-				value = "${SYMROOT}";
-			},
-			{
 				active = NO;
 				name = DYLD_PRINT_LIBRARIES;
 			},
 		);
 		executableSystemSymbolLevel = 0;
 		executableUserSymbolLevel = 0;
-		launchableReference = F9E61D1D090A4282002B3151 /* Wish.app */;
 		libgmallocEnabled = 0;
 		name = Wish;
 		savedGlobals = {
@@ -182,11 +181,4 @@
 		sourceDirectories = (
 		);
 	};
-	F9E61D1D090A4282002B3151 /* Wish.app */ = {
-		isa = PBXFileReference;
-		explicitFileType = wrapper.application;
-		name = Wish.app;
-		path = ../Wish.app;
-		sourceTree = BUILT_PRODUCTS_DIR;
-	};
 }