* unix/tcl.m4 (Darwin): add 64bit support, check for Tiger copyfile(),

	add CFLAGS to SHLIB_LD to support passing -isysroot in env(CFLAGS) to
	configure (flag can't be present twice, so can't be in both CFLAGS and
	LDFLAGS during configure), don't use -prebind when deploying on 10.4,
	define TCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING (rdar://3171542).
	(SC_ENABLE_LANGINFO, SC_TIME_HANDLER): add/fix caching, fix obsolete
	autoconf macros. Sync with tk/unix/tcl.m4.

	* unix/configure.in: fix obsolete autoconf macros, sync gratuitous
	formatting/ordering differences with tk/unix/configure.in.

	* unix/Makefile.in: add CFLAGS to tclsh/tcltest link to make executable
	linking the same as during configure (needed to avoid loosing any linker
	relevant flags in CFLAGS, in particular flags that can't be in LDFLAGS).
	Avoid concurrent linking of tclsh and compiling of tclTestInit.o or
	xtTestInit.o during parallel make.
	(checkstubs, checkdoc, checkexports): dependency and Darwin fixes
	(dist): add new macosx files.

	* unix/tclLoadDyld.c (TclpDlopen): use NSADDIMAGE_OPTION_WITH_SEARCHING
	on second NSAddImage only. [Bug 1204237]
	(TclGuessPackageName): should not be MODULE_SCOPE.
	(TclpLoadMemory): ppc64 and endian (i386) fixes, add support for loading
	universal (fat) bundles from memory.

	* unix/tclUnixFCmd.c:
	* macosx/tclMacOSXFCmd.c: ppc64 and endian (i386) fixes.
	(TclMacOSXCopyFileAttributes): add support for new Tiger copyfile() API
	to enable copying of xattrs & ACLs by [file copy].

	* generic/tcl.h: add Darwin specifc configure overrides for TCL_WIDE
	defines to support fat compiles of ppc and ppc64 at the same time,
	(replaces Darwin CVS fix by emoy, rdar://3693001).
	add/correct location of version numbers in macosx files.

	* generic/tclInt.h: clarify fat compile comment.

	* unix/tclUnixPort.h: add Darwin specifc configure overrides to support
	fat compiles, where configure runs only once for multiple architectures
	(replaces Darwin CVS fix by emoy, rdar://3693001).

	* macosx/tclMacOSXBundle.c:
	* macosx/tclMacOSXNotify.c:
	* unix/tclUnixNotfy.c:
	* unix/tclUnixPort.h: fix #include order to support compile time
	override of HAVE_COREFOUNDATION in tclUnixPort.h when building for ppc64

	* macosx/Tcl.pbproj/default.pbxuser (new file):
	* macosx/Tcl.pbproj/jingham.pbxuser:
	* macosx/Tcl.pbproj/project.pbxproj:
	* macosx/Tcl.xcode/default.pbxuser (new file):
	* macosx/Tcl.xcode/project.pbxproj (new file):
	* macosx/Tcl.xcodeproj/default.pbxuser (new file):
	* macosx/Tcl.xcodeproj/project.pbxproj (new file): new/updated projects
	for Xcode 2.2 on 10.4, Xcode 1.5 on 10.3 & ProjectBuilder on 10.2, with
	native tcltest targets and support for universal (fat) compiles.

	* macosx/README: clarification/cleanup, document new Xcode projects and
	universal (fat) builds via CFLAGS (i.e. all of ppc ppc64 i386 at once).

	* unix/Makefile.in:
	* unix/aclocal.m4:
	* unix/configure.in:
	* unix/dltest/Makefile.in:
	* macosx/configure.ac (new file): add support for inclusion of
	unix/configure.in by macosx/configure.ac, allows generation of a config
	headers enabled configure script in macosx (required by Xcode projects).

	* macosx/GNUmakefile: rename from Makefile to avoid overwriting by
	configure run in tcl/macosx, add support for reusing configure cache,
	build target fixes, remove GENERIC_FLAGS override now handled by tcl.m4.

	* generic/tcl.decls: add Tcl_Main declaration as comment to avoid
	'checkstubs' target complaining about it missing from stubs.

	* generic/regex.h:
	* generic/tclDate.c:
	* generic/tclEnv.c:
	* generic/tclGetDate.y:
	* generic/tclIOUtil.c:
	* generic/tclObj.c:
	* generic/tclStubInit.c:
	* generic/tclStubLib.c:
	* generic/tclPathObj.c:
	* generic/tclThreadAlloc.c:
	* generic/tclThreadStorage.c:
	* generic/tclTrace.c:
	* generic/tclVar.c:
	* generic/tommath.h:
	* tools/fix_tommath_h.tcl:
	* unix/tclUnixFCmd.c: ensure externally visible symbols not contained in
	stubs table are declared as MODULE_SCOPE (or as static if not used
	outside of own source file). These changes allow 'make checkstubs' to
	complete without error on Darwin with gcc 4.

	* generic/rege_dfa.c (getvacant):
	* generic/regexec.c (cfind):
	* generic/tclCompExpr.c (CompileSubExpr):
	* generic/tclNamesp.c (NamespaceEnsembleCmd):
	* unix/tclUnixChan.c (TclUnixWaitForFile): initialise variables to
	silence gcc 4 warnings.

	* generic/tclExecute.c (TclExecuteByteCode): fix unused variable warning
	when NO_WIDE_TYPE is defined.

	* generic/regguts.h: only #define NDEBUG if not already #defined.

	* unix/tclUnixNotfy.c:
	* macosx/tclMacOSXNotify.c: sync whitespace & comments.

	* unix/tclUnixPort.h:
	* win/tclWinPort.h: remove declaration of obsolete&unused TclpMutex API.

	* unix/configure:
	* unix/tclConfig.h.in: regen.

3 files changed, 615 insertions, 94 deletions

diff --git a/macosx/Tcl.pbproj/default.pbxuser b/macosx/Tcl.pbproj/default.pbxuser
new file mode 100644
index 0000000..2472114
--- /dev/null
+++ b/macosx/Tcl.pbproj/default.pbxuser
@@ -0,0 +1,173 @@
+// !$*UTF8*$!
+{
+	00E2F845016E82EB0ACA28DC = {
+		activeBuildStyle = 00E2F847016E82EB0ACA28DC;
+		activeExecutable = F594E5F1030774B1016F146B;
+		activeTarget = 00E2F84C016E8B780ACA28DC;
+		addToTargets = (
+		);
+		codeSenseManager = F9D167E40610239A0027C147;
+		executables = (
+			F53ACC52031D9AFE016F146B,
+			F594E5F1030774B1016F146B,
+		);
+		sourceControlManager = F9D167E30610239A0027C147;
+		userBuildSettings = {
+			SYMROOT = "${SRCROOT}/../../build/tcl";
+		};
+	};
+	00E2F84C016E8B780ACA28DC = {
+		activeExec = 0;
+	};
+	F53ACC52031D9AFE016F146B = {
+		activeArgIndex = 2147483647;
+		activeArgIndices = (
+			NO,
+			NO,
+		);
+		argumentStrings = (
+			"${SRCROOT}/../../tcl/tests/all.tcl",
+			"-verbose \"\"",
+		);
+		configStateDict = {
+			"PBXLSLaunchAction-0" = {
+				PBXLSLaunchAction = 0;
+				PBXLSLaunchStartAction = 1;
+				PBXLSLaunchStdioStyle = 2;
+				PBXLSLaunchStyle = 0;
+				class = PBXLSRunLaunchConfig;
+				displayName = "Executable Runner";
+				identifier = com.apple.Xcode.launch.runConfig;
+				remoteHostInfo = "";
+				startActionInfo = "";
+			};
+			"PBXLSLaunchAction-1" = {
+				PBXLSLaunchAction = 1;
+				PBXLSLaunchStartAction = 1;
+				PBXLSLaunchStdioStyle = 2;
+				PBXLSLaunchStyle = 0;
+				class = PBXGDB_LaunchConfig;
+				displayName = GDB;
+				identifier = com.apple.Xcode.launch.GDBMI_Config;
+				remoteHostInfo = "";
+				startActionInfo = "";
+			};
+		};
+		cppStopOnCatchEnabled = 0;
+		cppStopOnThrowEnabled = 0;
+		customDataFormattersEnabled = 1;
+		debuggerPlugin = GDBDebugging;
+		disassemblyDisplayState = 0;
+		dylibVariantSuffix = _debug;
+		enableDebugStr = 0;
+		environmentEntries = (
+			{
+				active = YES;
+				name = TCL_LIBRARY;
+				value = "${SRCROOT}/../../tcl/library";
+			},
+			{
+				active = NO;
+				name = DYLD_PRINT_LIBRARIES;
+			},
+		);
+		isa = PBXExecutable;
+		launchableReference = F5C37CF303D5BEDF016F146B;
+		libgmallocEnabled = 0;
+		name = tcltest;
+		shlibInfoDictList = (
+		);
+		sourceDirectories = (
+		);
+		startupPath = "<<ProductDirectory>>";
+	};
+	F594E5F1030774B1016F146B = {
+		activeArgIndex = 2147483647;
+		activeArgIndices = (
+		);
+		argumentStrings = (
+		);
+		configStateDict = {
+			"PBXLSLaunchAction-0" = {
+				PBXLSLaunchAction = 0;
+				PBXLSLaunchStartAction = 1;
+				PBXLSLaunchStdioStyle = 2;
+				PBXLSLaunchStyle = 0;
+				class = PBXLSRunLaunchConfig;
+				displayName = "Executable Runner";
+				identifier = com.apple.Xcode.launch.runConfig;
+				remoteHostInfo = "";
+				startActionInfo = "";
+			};
+			"PBXLSLaunchAction-1" = {
+				PBXLSLaunchAction = 1;
+				PBXLSLaunchStartAction = 1;
+				PBXLSLaunchStdioStyle = 2;
+				PBXLSLaunchStyle = 0;
+				class = PBXGDB_LaunchConfig;
+				displayName = GDB;
+				identifier = com.apple.Xcode.launch.GDBMI_Config;
+				remoteHostInfo = "";
+				startActionInfo = "";
+			};
+		};
+		cppStopOnCatchEnabled = 0;
+		cppStopOnThrowEnabled = 0;
+		customDataFormattersEnabled = 1;
+		debuggerPlugin = GDBDebugging;
+		disassemblyDisplayState = 0;
+		dylibVariantSuffix = _debug;
+		enableDebugStr = 0;
+		environmentEntries = (
+			{
+				active = NO;
+				name = DYLD_PRINT_LIBRARIES;
+			},
+		);
+		isa = PBXExecutable;
+		launchableReference = F98F02E608E7EF9A00D0320A;
+		libgmallocEnabled = 0;
+		name = tclsh;
+		shlibInfoDictList = (
+		);
+		sourceDirectories = (
+		);
+		startupPath = "<<ProductDirectory>>";
+	};
+	F5C37CF303D5BEDF016F146B = {
+		isa = PBXFileReference;
+		lastKnownFileType = "compiled.mach-o.executable";
+		path = tcltest;
+		refType = 3;
+		sourceTree = BUILT_PRODUCTS_DIR;
+	};
+	F98F02E608E7EF9A00D0320A = {
+		isa = PBXFileReference;
+		lastKnownFileType = "compiled.mach-o.executable";
+		path = tclsh8.5;
+		refType = 3;
+		sourceTree = BUILT_PRODUCTS_DIR;
+	};
+	F9D167E30610239A0027C147 = {
+		fallbackIsa = XCSourceControlManager;
+		isSCMEnabled = 0;
+		isa = PBXSourceControlManager;
+		scmConfiguration = {
+		};
+		scmType = scm.cvs;
+	};
+	F9D167E40610239A0027C147 = {
+		indexTemplatePath = "";
+		isa = PBXCodeSenseManager;
+		usesDefaults = 1;
+		wantsCodeCompletion = 1;
+		wantsCodeCompletionAutoSuggestions = 1;
+		wantsCodeCompletionCaseSensitivity = 1;
+		wantsCodeCompletionListAlways = 1;
+		wantsCodeCompletionOnlyMatchingItems = 1;
+		wantsCodeCompletionParametersIncluded = 1;
+		wantsCodeCompletionPlaceholdersInserted = 1;
+		wantsCodeCompletionTabCompletes = 1;
+		wantsIndex = 1;
+	};
+}
diff --git a/macosx/Tcl.pbproj/jingham.pbxuser b/macosx/Tcl.pbproj/jingham.pbxuser
index 10f0b57..2472114 100644
--- a/macosx/Tcl.pbproj/jingham.pbxuser
+++ b/macosx/Tcl.pbproj/jingham.pbxuser
@@ -2,78 +2,172 @@
 {
 	00E2F845016E82EB0ACA28DC = {
 		activeBuildStyle = 00E2F847016E82EB0ACA28DC;
-		activeExecutable = F9A61CCE04C2B5A8006F5A0B;
+		activeExecutable = F594E5F1030774B1016F146B;
 		activeTarget = 00E2F84C016E8B780ACA28DC;
-		breakpoints = (
+		addToTargets = (
 		);
+		codeSenseManager = F9D167E40610239A0027C147;
 		executables = (
-			F9A61CCE04C2B5A8006F5A0B,
-			F973FC3204852E75006F146B,
+			F53ACC52031D9AFE016F146B,
+			F594E5F1030774B1016F146B,
 		);
-		perUserDictionary = {
-			PBXPerProjectTemplateStateSaveDate = 79872121;
-		};
-		projectwideBuildSettings = {
+		sourceControlManager = F9D167E30610239A0027C147;
+		userBuildSettings = {
 			SYMROOT = "${SRCROOT}/../../build/tcl";
 		};
-		wantsIndex = 1;
-		wantsSCM = -1;
 	};
 	00E2F84C016E8B780ACA28DC = {
 		activeExec = 0;
 	};
-	F973FC3204852E75006F146B = {
+	F53ACC52031D9AFE016F146B = {
 		activeArgIndex = 2147483647;
 		activeArgIndices = (
+			NO,
+			NO,
 		);
 		argumentStrings = (
+			"${SRCROOT}/../../tcl/tests/all.tcl",
+			"-verbose \"\"",
 		);
 		configStateDict = {
+			"PBXLSLaunchAction-0" = {
+				PBXLSLaunchAction = 0;
+				PBXLSLaunchStartAction = 1;
+				PBXLSLaunchStdioStyle = 2;
+				PBXLSLaunchStyle = 0;
+				class = PBXLSRunLaunchConfig;
+				displayName = "Executable Runner";
+				identifier = com.apple.Xcode.launch.runConfig;
+				remoteHostInfo = "";
+				startActionInfo = "";
+			};
+			"PBXLSLaunchAction-1" = {
+				PBXLSLaunchAction = 1;
+				PBXLSLaunchStartAction = 1;
+				PBXLSLaunchStdioStyle = 2;
+				PBXLSLaunchStyle = 0;
+				class = PBXGDB_LaunchConfig;
+				displayName = GDB;
+				identifier = com.apple.Xcode.launch.GDBMI_Config;
+				remoteHostInfo = "";
+				startActionInfo = "";
+			};
 		};
+		cppStopOnCatchEnabled = 0;
+		cppStopOnThrowEnabled = 0;
+		customDataFormattersEnabled = 1;
 		debuggerPlugin = GDBDebugging;
-		dylibVariantSuffix = "";
-		enableDebugStr = 1;
+		disassemblyDisplayState = 0;
+		dylibVariantSuffix = _debug;
+		enableDebugStr = 0;
 		environmentEntries = (
+			{
+				active = YES;
+				name = TCL_LIBRARY;
+				value = "${SRCROOT}/../../tcl/library";
+			},
+			{
+				active = NO;
+				name = DYLD_PRINT_LIBRARIES;
+			},
 		);
 		isa = PBXExecutable;
-		launchableReference = F9A61CCD04C2B5A5006F5A0B;
-		name = tclsh8.4;
+		launchableReference = F5C37CF303D5BEDF016F146B;
+		libgmallocEnabled = 0;
+		name = tcltest;
 		shlibInfoDictList = (
 		);
 		sourceDirectories = (
 		);
+		startupPath = "<<ProductDirectory>>";
 	};
-	F9A61CCD04C2B5A5006F5A0B = {
-		isa = PBXFileReference;
-		name = tclsh8.4;
-		path = ../../build/tcl/tclsh8.4;
-		refType = 4;
-	};
-	F9A61CCE04C2B5A8006F5A0B = {
+	F594E5F1030774B1016F146B = {
 		activeArgIndex = 2147483647;
 		activeArgIndices = (
 		);
 		argumentStrings = (
 		);
 		configStateDict = {
+			"PBXLSLaunchAction-0" = {
+				PBXLSLaunchAction = 0;
+				PBXLSLaunchStartAction = 1;
+				PBXLSLaunchStdioStyle = 2;
+				PBXLSLaunchStyle = 0;
+				class = PBXLSRunLaunchConfig;
+				displayName = "Executable Runner";
+				identifier = com.apple.Xcode.launch.runConfig;
+				remoteHostInfo = "";
+				startActionInfo = "";
+			};
+			"PBXLSLaunchAction-1" = {
+				PBXLSLaunchAction = 1;
+				PBXLSLaunchStartAction = 1;
+				PBXLSLaunchStdioStyle = 2;
+				PBXLSLaunchStyle = 0;
+				class = PBXGDB_LaunchConfig;
+				displayName = GDB;
+				identifier = com.apple.Xcode.launch.GDBMI_Config;
+				remoteHostInfo = "";
+				startActionInfo = "";
+			};
 		};
+		cppStopOnCatchEnabled = 0;
+		cppStopOnThrowEnabled = 0;
+		customDataFormattersEnabled = 1;
 		debuggerPlugin = GDBDebugging;
-		dylibVariantSuffix = "";
-		enableDebugStr = 1;
+		disassemblyDisplayState = 0;
+		dylibVariantSuffix = _debug;
+		enableDebugStr = 0;
 		environmentEntries = (
+			{
+				active = NO;
+				name = DYLD_PRINT_LIBRARIES;
+			},
 		);
 		isa = PBXExecutable;
-		launchableReference = F9A61CD104C2B5B4006F5A0B;
-		name = tcltest;
+		launchableReference = F98F02E608E7EF9A00D0320A;
+		libgmallocEnabled = 0;
+		name = tclsh;
 		shlibInfoDictList = (
 		);
 		sourceDirectories = (
 		);
+		startupPath = "<<ProductDirectory>>";
 	};
-	F9A61CD104C2B5B4006F5A0B = {
+	F5C37CF303D5BEDF016F146B = {
 		isa = PBXFileReference;
-		name = tcltest;
-		path = ../../build/tcl/tcltest;
-		refType = 4;
+		lastKnownFileType = "compiled.mach-o.executable";
+		path = tcltest;
+		refType = 3;
+		sourceTree = BUILT_PRODUCTS_DIR;
+	};
+	F98F02E608E7EF9A00D0320A = {
+		isa = PBXFileReference;
+		lastKnownFileType = "compiled.mach-o.executable";
+		path = tclsh8.5;
+		refType = 3;
+		sourceTree = BUILT_PRODUCTS_DIR;
+	};
+	F9D167E30610239A0027C147 = {
+		fallbackIsa = XCSourceControlManager;
+		isSCMEnabled = 0;
+		isa = PBXSourceControlManager;
+		scmConfiguration = {
+		};
+		scmType = scm.cvs;
+	};
+	F9D167E40610239A0027C147 = {
+		indexTemplatePath = "";
+		isa = PBXCodeSenseManager;
+		usesDefaults = 1;
+		wantsCodeCompletion = 1;
+		wantsCodeCompletionAutoSuggestions = 1;
+		wantsCodeCompletionCaseSensitivity = 1;
+		wantsCodeCompletionListAlways = 1;
+		wantsCodeCompletionOnlyMatchingItems = 1;
+		wantsCodeCompletionParametersIncluded = 1;
+		wantsCodeCompletionPlaceholdersInserted = 1;
+		wantsCodeCompletionTabCompletes = 1;
+		wantsIndex = 1;
 	};
 }
diff --git a/macosx/Tcl.pbproj/project.pbxproj b/macosx/Tcl.pbproj/project.pbxproj
index 3635cbb..8cd58dc 100644
--- a/macosx/Tcl.pbproj/project.pbxproj
+++ b/macosx/Tcl.pbproj/project.pbxproj
@@ -3,9 +3,11 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 38;
+	objectVersion = 39;
 	objects = {
 		00E2F845016E82EB0ACA28DC = {
+			buildSettings = {
+			};
 			buildStyles = (
 				00E2F847016E82EB0ACA28DC,
 				00E2F848016E82EB0ACA28DC,
@@ -32,10 +34,9 @@
 			);
 			isa = PBXGroup;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		00E2F847016E82EB0ACA28DC = {
-			buildRules = (
-			);
 			buildSettings = {
 				MAKE_TARGET = develop;
 			};
@@ -43,8 +44,6 @@
 			name = Development;
 		};
 		00E2F848016E82EB0ACA28DC = {
-			buildRules = (
-			);
 			buildSettings = {
 				MAKE_TARGET = deploy;
 			};
@@ -53,38 +52,37 @@
 		};
 		00E2F84A016E8A830ACA28DC = {
 			children = (
-				F9A61C9D04C2B4E3006F5A0B,
-				F53ACC5C031D9D11016F146B,
 				F53ACC73031DA405016F146B,
+				F53ACC5C031D9D11016F146B,
+				F9A61C9D04C2B4E3006F5A0B,
 			);
 			isa = PBXGroup;
 			name = Products;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		00E2F84C016E8B780ACA28DC = {
-			buildArgumentsString = "-c \"if [ \\\"${ACTION}\\\" != \\\"clean\\\" ]; then if [ \\\"${ACTION}\\\" = \\\"install\\\" ]; then MAKE_ACTION=\"install-\"; fi; else MAKE_ACTION=\"distclean-\"; fi; gnumake \\${MAKE_ACTION:-}${MAKE_TARGET}";
+			buildArgumentsString = "-c \"cd \\\"${TCL_SRCROOT}/macosx\\\" && ACTION=${ACTION} && CFLAGS=\\\"${CFLAGS}\\\" gnumake \\${ACTION:+\\${ACTION/clean/distclean}-}${MAKE_TARGET} INSTALL_ROOT=\\\"${DSTROOT}\\\" INSTALL_PATH=\\\"${INSTALL_PATH}\\\" PREFIX=\\\"${PREFIX}\\\" BINDIR=\\\"${BINDIR}\\\" MANDIR=\\\"${MANDIR}\\\" \\${EXTRA_MAKE_FLAGS} ${ALL_SETTINGS}\"";
 			buildPhases = (
 			);
 			buildSettings = {
-				EXTRA_CONFIGURE_ARGS = "";
-				EXTRA_MAKE_ARGS = "";
+				BINDIR = "${PREFIX}/bin";
+				CFLAGS = "";
 				INSTALL_PATH = /Library/Frameworks;
-				INSTALL_ROOT = "${DSTROOT}";
-				PREFIX = /usr;
+				MANDIR = "${PREFIX}/man";
+				PREFIX = /usr/local;
 				PRODUCT_NAME = Tcl;
-				SYMROOT = "${SRCROOT}/../../build/tcl";
+				TCL_SRCROOT = "${SRCROOT}/../../tcl";
+				TEMP_DIR = "${PROJECT_TEMP_DIR}";
 			};
-			buildToolPath = /bin/sh;
+			buildToolPath = /bin/bash;
 			buildWorkingDirectory = "${SRCROOT}";
 			dependencies = (
 			);
 			isa = PBXLegacyTarget;
 			name = Tcl;
-			passBuildSettingsInEnvironment = 1;
+			passBuildSettingsInEnvironment = 0;
 			productName = Tcl;
-			settingsToExpand = 6;
-			settingsToPassInEnvironment = 287;
-			settingsToPassOnCommandLine = 280;
 		};
 		00E2F854016E922C0ACA28DC = {
 			children = (
@@ -169,6 +167,7 @@
 			name = Sources;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		00E2F855016E922C0ACA28DC = {
 			children = (
@@ -178,6 +177,7 @@
 			isa = PBXGroup;
 			name = generic;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		00E2F856016E92B00ACA28DC = {
 			children = (
@@ -187,12 +187,10 @@
 				F5F24F6E016ECAA401DC9062,
 				F5F24F6F016ECAA401DC9062,
 				F5F24F70016ECAA401DC9062,
-				F5F24F71016ECAA401DC9062,
 				F5F24F72016ECAA401DC9062,
 				F5F24F73016ECAA401DC9062,
 				F5F24F74016ECAA401DC9062,
 				F5F24F75016ECAA401DC9062,
-				F5F24F76016ECAA401DC9062,
 				F5F24F77016ECAA401DC9062,
 				F5F24F78016ECAA401DC9062,
 				F5F24FD1016ECB1E01DC9062,
@@ -201,6 +199,7 @@
 			isa = PBXGroup;
 			name = Headers;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		00E2F857016E92B00ACA28DC = {
 			children = (
@@ -210,6 +209,7 @@
 			isa = PBXGroup;
 			name = macosx;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		00E2F858016E92B00ACA28DC = {
 			children = (
@@ -217,6 +217,7 @@
 			isa = PBXGroup;
 			name = Headers;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		00E2F859016E92B00ACA28DC = {
 			children = (
@@ -226,6 +227,7 @@
 			isa = PBXGroup;
 			name = Sources;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		00E2F85A016E92B00ACA28DC = {
 			children = (
@@ -235,6 +237,7 @@
 			isa = PBXGroup;
 			name = unix;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		00E2F85B016E92B00ACA28DC = {
 			children = (
@@ -244,6 +247,7 @@
 			isa = PBXGroup;
 			name = Headers;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		00E2F85C016E92B00ACA28DC = {
 			children = (
@@ -266,6 +270,7 @@
 			isa = PBXGroup;
 			name = Sources;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //000
 //001
@@ -286,51 +291,64 @@
 			isa = PBXGroup;
 			name = "Build System";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5306CA003CAC9AE016F146B = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = ChangeLog;
 			path = ../ChangeLog;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5306CA103CAC9DE016F146B = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = text.script.sh;
 			name = configure.in;
 			path = ../unix/configure.in;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5306CA203CAC9DE016F146B = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = Makefile.in;
 			path = ../unix/Makefile.in;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5306CA303CAC9DE016F146B = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = tcl.m4;
 			path = ../unix/tcl.m4;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53ACC5C031D9D11016F146B = {
-			isa = PBXExecutableFileReference;
-			name = tclsh8.5;
-			path = ../../build/tcl/tclsh8.5;
-			refType = 2;
+			isa = PBXFileReference;
+			lastKnownFileType = "compiled.mach-o.executable";
+			path = tclsh8.5;
+			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		F53ACC73031DA405016F146B = {
-			isa = PBXExecutableFileReference;
-			name = tcltest;
-			path = ../../build/tcl/tcltest;
-			refType = 2;
+			isa = PBXFileReference;
+			lastKnownFileType = "compiled.mach-o.executable";
+			path = tcltest;
+			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		F5A1836F018242A501DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tclMacOSXBundle.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5C88655017D604601DC9062 = {
 			children = (
@@ -341,780 +359,985 @@
 			isa = PBXGroup;
 			name = "Header Tools";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5C88656017D604601DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = genStubs.tcl;
 			path = ../tools/genStubs.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5C88657017D60C901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = tcl.decls;
 			path = ../generic/tcl.decls;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5C88658017D60C901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = tclInt.decls;
 			path = ../generic/tclInt.decls;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F6B016ECAA401DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = regcustom.h;
 			path = ../generic/regcustom.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F6C016ECAA401DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = regerrs.h;
 			path = ../generic/regerrs.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F6D016ECAA401DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = regguts.h;
 			path = ../generic/regguts.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F6E016ECAA401DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tcl.h;
 			path = ../generic/tcl.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F6F016ECAA401DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tclCompile.h;
 			path = ../generic/tclCompile.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F70016ECAA401DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tclDecls.h;
 			path = ../generic/tclDecls.h;
 			refType = 2;
-		};
-		F5F24F71016ECAA401DC9062 = {
-			fileEncoding = 5;
-			isa = PBXFileReference;
-			name = tclInitScript.h;
-			path = ../generic/tclInitScript.h;
-			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F72016ECAA401DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tclInt.h;
 			path = ../generic/tclInt.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F73016ECAA401DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tclIntDecls.h;
 			path = ../generic/tclIntDecls.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F74016ECAA401DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tclIntPlatDecls.h;
 			path = ../generic/tclIntPlatDecls.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F75016ECAA401DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tclIO.h;
 			path = ../generic/tclIO.h;
 			refType = 2;
-		};
-		F5F24F76016ECAA401DC9062 = {
-			fileEncoding = 5;
-			isa = PBXFileReference;
-			name = tclMath.h;
-			path = ../generic/tclMath.h;
-			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F77016ECAA401DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tclPlatDecls.h;
 			path = ../generic/tclPlatDecls.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F78016ECAA401DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tclRegexp.h;
 			path = ../generic/tclRegexp.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F87016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = regc_color.c;
 			path = ../generic/regc_color.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F88016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = regc_cvec.c;
 			path = ../generic/regc_cvec.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F89016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = regc_lex.c;
 			path = ../generic/regc_lex.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F8A016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = regc_locale.c;
 			path = ../generic/regc_locale.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F8B016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = regc_nfa.c;
 			path = ../generic/regc_nfa.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F8C016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = regcomp.c;
 			path = ../generic/regcomp.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F8D016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = rege_dfa.c;
 			path = ../generic/rege_dfa.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F8E016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = regerror.c;
 			path = ../generic/regerror.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F8F016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = regexec.c;
 			path = ../generic/regexec.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F90016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = regfree.c;
 			path = ../generic/regfree.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F91016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = regfronts.c;
 			path = ../generic/regfronts.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F92016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclAlloc.c;
 			path = ../generic/tclAlloc.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F93016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclAsync.c;
 			path = ../generic/tclAsync.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F94016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclBasic.c;
 			path = ../generic/tclBasic.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F95016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclBinary.c;
 			path = ../generic/tclBinary.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F96016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclCkalloc.c;
 			path = ../generic/tclCkalloc.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F97016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclClock.c;
 			path = ../generic/tclClock.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F98016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclCmdAH.c;
 			path = ../generic/tclCmdAH.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F99016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclCmdIL.c;
 			path = ../generic/tclCmdIL.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F9A016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclCmdMZ.c;
 			path = ../generic/tclCmdMZ.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F9B016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclCompCmds.c;
 			path = ../generic/tclCompCmds.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F9C016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclCompExpr.c;
 			path = ../generic/tclCompExpr.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F9D016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclCompile.c;
 			path = ../generic/tclCompile.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F9E016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclDate.c;
 			path = ../generic/tclDate.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24F9F016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclEncoding.c;
 			path = ../generic/tclEncoding.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FA0016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclEnv.c;
 			path = ../generic/tclEnv.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FA1016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclEvent.c;
 			path = ../generic/tclEvent.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FA2016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclExecute.c;
 			path = ../generic/tclExecute.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FA3016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclFCmd.c;
 			path = ../generic/tclFCmd.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FA4016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclFileName.c;
 			path = ../generic/tclFileName.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FA5016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclGet.c;
 			path = ../generic/tclGet.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FA6016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclHash.c;
 			path = ../generic/tclHash.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FA7016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclHistory.c;
 			path = ../generic/tclHistory.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FA8016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclIndexObj.c;
 			path = ../generic/tclIndexObj.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FA9016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclInterp.c;
 			path = ../generic/tclInterp.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FAA016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclIO.c;
 			path = ../generic/tclIO.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FAB016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclIOCmd.c;
 			path = ../generic/tclIOCmd.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FAC016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclIOGT.c;
 			path = ../generic/tclIOGT.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FAD016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclIOSock.c;
 			path = ../generic/tclIOSock.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FAE016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclIOUtil.c;
 			path = ../generic/tclIOUtil.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FAF016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclLink.c;
 			path = ../generic/tclLink.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FB0016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclListObj.c;
 			path = ../generic/tclListObj.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FB1016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclLiteral.c;
 			path = ../generic/tclLiteral.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FB2016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclLoad.c;
 			path = ../generic/tclLoad.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FB3016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclLoadNone.c;
 			path = ../generic/tclLoadNone.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FB4016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclMain.c;
 			path = ../generic/tclMain.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FB5016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclNamesp.c;
 			path = ../generic/tclNamesp.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FB6016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclNotify.c;
 			path = ../generic/tclNotify.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FB7016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclObj.c;
 			path = ../generic/tclObj.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FB8016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclPanic.c;
 			path = ../generic/tclPanic.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FB9016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclParse.c;
 			path = ../generic/tclParse.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FBA016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclParseExpr.c;
 			path = ../generic/tclParseExpr.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FBB016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclPipe.c;
 			path = ../generic/tclPipe.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FBC016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclPosixStr.c;
 			path = ../generic/tclPosixStr.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FBD016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclPreserve.c;
 			path = ../generic/tclPreserve.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FBE016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclProc.c;
 			path = ../generic/tclProc.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FBF016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclRegexp.c;
 			path = ../generic/tclRegexp.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FC0016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclResolve.c;
 			path = ../generic/tclResolve.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FC1016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclResult.c;
 			path = ../generic/tclResult.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FC2016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclScan.c;
 			path = ../generic/tclScan.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FC3016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclStringObj.c;
 			path = ../generic/tclStringObj.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FC4016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclStubInit.c;
 			path = ../generic/tclStubInit.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FC5016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclStubLib.c;
 			path = ../generic/tclStubLib.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FC6016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclTest.c;
 			path = ../generic/tclTest.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FC7016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclTestObj.c;
 			path = ../generic/tclTestObj.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FC8016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclTestProcBodyObj.c;
 			path = ../generic/tclTestProcBodyObj.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FC9016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclThread.c;
 			path = ../generic/tclThread.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FCA016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclThreadJoin.c;
 			path = ../generic/tclThreadJoin.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FCB016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclThreadTest.c;
 			path = ../generic/tclThreadTest.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FCC016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclTimer.c;
 			path = ../generic/tclTimer.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FCD016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclUniData.c;
 			path = ../generic/tclUniData.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FCE016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclUtf.c;
 			path = ../generic/tclUtf.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FCF016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclUtil.c;
 			path = ../generic/tclUtil.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FD0016ECAFC01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclVar.c;
 			path = ../generic/tclVar.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FD1016ECB1E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = regex.h;
 			path = ../generic/regex.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FD2016ECB1E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tclPort.h;
 			path = ../generic/tclPort.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FD3016ECB4901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclPkg.c;
 			path = ../generic/tclPkg.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FD6016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tclUnixPort.h;
 			path = ../unix/tclUnixPort.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FD7016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tclUnixThrd.h;
 			path = ../unix/tclUnixThrd.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FD8016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclAppInit.c;
 			path = ../unix/tclAppInit.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FD9016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclLoadDyld.c;
 			path = ../unix/tclLoadDyld.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FDB016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclUnixChan.c;
 			path = ../unix/tclUnixChan.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FDC016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclUnixEvent.c;
 			path = ../unix/tclUnixEvent.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FDD016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclUnixFCmd.c;
 			path = ../unix/tclUnixFCmd.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FDE016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclUnixFile.c;
 			path = ../unix/tclUnixFile.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FDF016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclUnixInit.c;
 			path = ../unix/tclUnixInit.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FE0016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclUnixNotfy.c;
 			path = ../unix/tclUnixNotfy.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FE1016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclUnixPipe.c;
 			path = ../unix/tclUnixPipe.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FE2016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclUnixSock.c;
 			path = ../unix/tclUnixSock.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FE3016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclUnixTest.c;
 			path = ../unix/tclUnixTest.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FE4016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclUnixThrd.c;
 			path = ../unix/tclUnixThrd.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FE5016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclUnixTime.c;
 			path = ../unix/tclUnixTime.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FE6016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclXtNotify.c;
 			path = ../unix/tclXtNotify.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FE7016ECC0F01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclXtTest.c;
 			path = ../unix/tclXtTest.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FEE016ED0DF01DC9062 = {
 			children = (
@@ -1125,7 +1348,6 @@
 				F5F24FF5016ED0DF01DC9062,
 				F5F24FF6016ED0DF01DC9062,
 				F5F24FFA016ED0DF01DC9062,
-				F5F24FFB016ED0DF01DC9062,
 				F5F24FFC016ED0DF01DC9062,
 				F5F24FFE016ED0DF01DC9062,
 				F5F25001016ED0DF01DC9062,
@@ -1139,117 +1361,144 @@
 			isa = PBXGroup;
 			name = Scripts;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5F24FEF016ED0DF01DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = auto.tcl;
 			path = ../library/auto.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FF0016ED0DF01DC9062 = {
 			includeInIndex = 0;
-			isa = PBXFolderReference;
+			isa = PBXFileReference;
+			lastKnownFileType = folder;
 			name = dde;
 			path = ../library/dde;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FF3016ED0DF01DC9062 = {
 			includeInIndex = 0;
-			isa = PBXFolderReference;
+			isa = PBXFileReference;
+			lastKnownFileType = folder;
 			name = encoding;
 			path = ../library/encoding;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FF4016ED0DF01DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = history.tcl;
 			path = ../library/history.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FF5016ED0DF01DC9062 = {
 			includeInIndex = 0;
-			isa = PBXFolderReference;
+			isa = PBXFileReference;
+			lastKnownFileType = folder;
 			name = http;
 			path = ../library/http;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FF6016ED0DF01DC9062 = {
 			includeInIndex = 0;
-			isa = PBXFolderReference;
+			isa = PBXFileReference;
+			lastKnownFileType = folder;
 			name = http1.0;
 			path = ../library/http1.0;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FFA016ED0DF01DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = init.tcl;
 			path = ../library/init.tcl;
 			refType = 2;
-		};
-		F5F24FFB016ED0DF01DC9062 = {
-			isa = PBXFileReference;
-			name = ldAout.tcl;
-			path = ../library/ldAout.tcl;
-			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FFC016ED0DF01DC9062 = {
 			includeInIndex = 0;
-			isa = PBXFolderReference;
+			isa = PBXFileReference;
+			lastKnownFileType = folder;
 			name = msgcat;
 			path = ../library/msgcat;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F24FFE016ED0DF01DC9062 = {
 			includeInIndex = 0;
-			isa = PBXFolderReference;
+			isa = PBXFileReference;
+			lastKnownFileType = folder;
 			name = opt;
 			path = ../library/opt;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F25001016ED0DF01DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = package.tcl;
 			path = ../library/package.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F25002016ED0DF01DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = parray.tcl;
 			path = ../library/parray.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F25003016ED0DF01DC9062 = {
 			includeInIndex = 0;
-			isa = PBXFolderReference;
+			isa = PBXFileReference;
+			lastKnownFileType = folder;
 			name = reg;
 			path = ../library/reg;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F25005016ED0DF01DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = safe.tcl;
 			path = ../library/safe.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F25007016ED0DF01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = tclIndex;
 			path = ../library/tclIndex;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F25008016ED0DF01DC9062 = {
 			includeInIndex = 0;
-			isa = PBXFolderReference;
+			isa = PBXFileReference;
+			lastKnownFileType = folder;
 			name = tcltest;
 			path = ../library/tcltest;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F2500A016ED0DF01DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = word.tcl;
 			path = ../library/word.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 //F50
 //F51
@@ -1262,23 +1511,28 @@
 //F93
 //F94
 		F9A61C9D04C2B4E3006F5A0B = {
-			isa = PBXFrameworkReference;
-			name = Tcl.framework;
-			path = ../../build/tcl/Tcl.framework;
-			refType = 2;
+			explicitFileType = wrapper.framework;
+			isa = PBXFileReference;
+			path = Tcl.framework;
+			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		F9FED5C6047C7CEC006F146B = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tclMacOSXFCmd.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F9FED5C7047C7D1B006F146B = {
-			fileEncoding = 30;
+			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tclPathObj.c;
-			path = /Users/steffen/Documents/Development/TclTk/HEAD/tcl/generic/tclPathObj.c;
-			refType = 0;
+			path = ../generic/tclPathObj.c;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 	};
 	rootObject = 00E2F845016E82EB0ACA28DC;