summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--macosx/README42
-rw-r--r--macosx/Tcl-Common.xcconfig4
-rw-r--r--macosx/Tcl.xcode/default.pbxuser26
-rw-r--r--macosx/Tcl.xcode/project.pbxproj54
-rw-r--r--macosx/Tcl.xcodeproj/default.pbxuser32
-rw-r--r--macosx/Tcl.xcodeproj/project.pbxproj32
7 files changed, 77 insertions, 127 deletions
diff --git a/ChangeLog b/ChangeLog
index cdde355..20ea4bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-09-06 Daniel Steffen <das@users.sourceforge.net>
+
+ * macosx/Tcl.xcode/project.pbxproj: discontinue unmaintained support
+ * macosx/Tcl.xcode/default.pbxuser: for Xcode 1.5; replace by Xcode2
+ project for use on Tiger (with Tcl.xcodeproj to be used on Leopard).
+
+ * macosx/Tcl.xcodeproj/project.pbxproj: updates for Xcode 2.5 and 3.0.
+ * macosx/Tcl.xcodeproj/default.pbxuser:
+ * macosx/Tcl.xcode/project.pbxproj:
+ * macosx/Tcl.xcode/default.pbxuser:
+ * macosx/Tcl-Common.xcconfig:
+
+ * macosx/README: document project changes.
+
2007-09-05 Don Porter <dgp@users.sourceforge.net>
* generic/tclBasic.c: Removed support for the unmaintained
diff --git a/macosx/README b/macosx/README
index 3c2d5ba..0f0a66f 100644
--- a/macosx/README
+++ b/macosx/README
@@ -1,7 +1,7 @@
Tcl Mac OS X README
-------------------
-RCS: @(#) $Id: README,v 1.13 2007/06/29 03:15:39 das Exp $
+RCS: @(#) $Id: README,v 1.14 2007/09/06 08:07:17 das Exp $
This is the README file for the Mac OS X/Darwin version of Tcl.
@@ -88,14 +88,14 @@ select based notifier).
- It is also possible to build with Apple's IDE via the projects in tcl/macosx,
take care to only use the project matching your DevTools and OS version:
- * Tcl.pbproj for ProjectBuilder on 10.2 and earlier, this has a 'Tcl' target
- that simply calls through to the tcl/macosx/GNUMakefile.
- * Tcl.xcode for Xcode 1.5 on 10.3, this additionally has a native 'tcltest'
- target useful for debugging, this target's 'Development' buildstyle
- has ZeroLink and Fix&Continue enabled, use the 'DevelNoFixZL' buildstyle
- if you need a debug build without these features.
- * Tcl.xcodeproj for Xcode 2.4 on 10.4 or later, which has the following
- additional build configurations for the 'Tcl' and 'tcltest' targets:
+ * Tcl.pbproj for Xcode or ProjectBuilder on 10.3 and earlier, this has a
+ 'Tcl' target that simply calls through to the tcl/macosx/GNUMakefile.
+ * Tcl.xcode for Xcode 2.4 on 10.4 and Xcode 2.5 on 10.4 and later, which
+ additionally has a native 'tcltest' target useful for debugging, this
+ target's 'Debug' build configuration has ZeroLink and Fix&Continue
+ enabled, use the 'DebugNoFixZL' build configuration if you need a debug
+ build without these features. The following additional build
+ configurations are available for the 'Tcl' and 'tcltest' targets:
'DebugUnthreaded': debug build with threading turned off.
'DebugMemCompile': debug build with memory and bytecode debugging on.
'DebugLeaks': debug build with PURIFY defined.
@@ -103,8 +103,6 @@ take care to only use the project matching your DevTools and OS version:
requires a 64bit capable processor (i.e. G5 or Core2/Xeon).
'ReleaseUniversal': builds the targets as universal binaries for the
ppc, ppc64, i386 and x86_64 architectures.
- 'ReleaseUniversal10.5SDK': same as 'ReleaseUniversal' but builds
- against the 10.5 SDK on Leopard (with 10.5 deployment target).
'ReleaseUniversal10.4uSDK': same as 'ReleaseUniversal' but builds
against the 10.4u SDK, required to build universal binaries on
PowerPC Tiger (where the system libraries are not universal).
@@ -113,24 +111,26 @@ take care to only use the project matching your DevTools and OS version:
'ReleasePPC10.2.8SDK': builds for PowerPC with gcc-3.3 against the
10.2.8 SDK, useful to verify on Tiger that building on Jaguar
would succeed.
+ * Tcl.xcodeproj for Xcode 3.0 on 10.5 and later, which has the following
+ additional build configuration:
+ 'ReleaseUniversal10.5SDK': same as 'ReleaseUniversal' but builds
+ against the 10.5 SDK on Leopard (with 10.5 deployment target).
+
Notes about the native targets of the Xcode projects:
- * the Xcode 2 project refers to the toplevel tcl source directory through
- the TCL_SRCROOT user build setting, by default this is set to the
+ * the Xcode projects refer to the toplevel tcl source directory through the
+ TCL_SRCROOT user build setting, by default this is set to the
project-relative path '../../tcl', if your tcl source directory is named
differently, e.g. '../../tcl8.5', you'll need to manually change the
TCL_SRCROOT setting by editing your ${USER}.pbxuser file (located inside
the Tcl.xcodeproj bundle directory) with a text editor.
- * Xcode 1.5 has a bug that causes Fix&Continue and the Build menu items
- Compile/Preprocess/ShowAssembly to fail in presence of relative paths to
- source files, as a workaround change the Path Type of the 'Tcl Sources'
- group to 'Absolute Path' in the group's Info panel. (fixed in Xcode 2.2)
* the native targets need a version of the unix configure script with config
headers enabled, this is automatically generated as tcl/macosx/configure
by the project but that requires 2.59 versions of autoconf & autoheader.
- These are not available on on Mac OS X 10.3 by default and need to be
+ These are not available on Mac OS X 10.5 by default and need to be
installed manually. By default they are assumed to be installed as
/usr/local/bin/autoconf-2.59 and /usr/local/bin/autoheader-2.59, set the
- env vars AUTOCONF and AUTOHEADER to their true locations if necessary.
+ AUTOCONF and AUTOHEADER build settings in ${USER}.pbxuser to their true
+ locations if necessary.
- To build universal binaries outside of Tcl.xcodeproj, set CFLAGS as follows:
export CFLAGS="-arch ppc -arch ppc64 -arch i386 -arch x86_64 \
@@ -150,8 +150,8 @@ to the minimal OS version (>= 10.2) the binaries should be able to run on, e.g:
This requires Mac OS X 10.2 and gcc 3.1; if you have gcc 4 or later you can set
CFLAGS instead:
export CFLAGS="-mmacosx-version-min=10.2"
-The Tcl.xcodeproj is setup to produce binaries that can run on 10.2 or later,
-except for the 'ReleaseUniversal*' configurations, where they require 10.4.
+The Tcl.xcode project is setup to produce binaries that can run on 10.2 or
+later (except for the Univerasl and SDK configurations).
Support for weak-linking was added to the code for 8.4.14/8.5a5.
Detailed Instructions for building with macosx/GNUmakefile
diff --git a/macosx/Tcl-Common.xcconfig b/macosx/Tcl-Common.xcconfig
index 568e314..0758cf0 100644
--- a/macosx/Tcl-Common.xcconfig
+++ b/macosx/Tcl-Common.xcconfig
@@ -9,7 +9,7 @@
// See the file "license.terms" for information on usage and redistribution
// of this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
-// RCS: @(#) $Id: Tcl-Common.xcconfig,v 1.5 2007/06/29 03:15:39 das Exp $
+// RCS: @(#) $Id: Tcl-Common.xcconfig,v 1.6 2007/09/06 08:07:18 das Exp $
//
HEADER_SEARCH_PATHS = $(DERIVED_FILE_DIR)/tcl $(HEADER_SEARCH_PATHS)
@@ -19,7 +19,7 @@ GCC_PREFIX_HEADER = $(DERIVED_FILE_DIR)/tcl/tclConfig.h
GCC_GENERATE_DEBUGGING_SYMBOLS = YES
GCC_NO_COMMON_BLOCKS = YES
GCC_DYNAMIC_NO_PIC = YES
-GCC = /usr/bin/gcc
+GCC = $(DEVELOPER_DIR)/usr/bin/gcc
GCC_VERSION = 4.0
CC = $(GCC)-$(GCC_VERSION)
WARNING_CFLAGS_GCC3 = -Wall -Wno-implicit-int -Wno-unused-parameter -Wno-deprecated-declarations
diff --git a/macosx/Tcl.xcode/default.pbxuser b/macosx/Tcl.xcode/default.pbxuser
index 09d2b55..5c67540 100644
--- a/macosx/Tcl.xcode/default.pbxuser
+++ b/macosx/Tcl.xcode/default.pbxuser
@@ -4,19 +4,17 @@
activeBuildConfigurationName = Debug;
activeExecutable = F9E61D1C090A4282002B3151 /* tclsh */;
activeTarget = F9E61D16090A3E94002B3151 /* Tcl */;
- addToTargets = (
- );
codeSenseManager = F944EB9D08F798180049FDD4 /* Code sense */;
executables = (
F9E61D1C090A4282002B3151 /* tclsh */,
F944EB8F08F798100049FDD4 /* tcltest */,
);
perUserDictionary = {
- com.apple.ide.smrt.PBXUserSmartGroupsKey.Rev10 = <040b73747265616d747970656481e8038401408484840e4e534d757461626c654172726179008484074e534172726179008484084e534f626a65637400858401690192848484134e534d757461626c6544696374696f6e6172790084840c4e5344696374696f6e6172790095960792848484084e53537472696e67019584012b146162736f6c75746550617468546f42756e646c658692849a9a008692849a9a046e616d658692849a9a14496d706c656d656e746174696f6e2046696c65738692849a9a03636c7a8692849a9a1550425846696c656e616d65536d61727447726f75708692849a9a0b6465736372697074696f6e8692849a9a103c6e6f206465736372697074696f6e3e8692849a9a08676c6f62616c49448692849a9a183143433045413430303433353045463930303434343130428692849a9a195042585472616e7369656e744c6f636174696f6e4174546f708692849a9a06626f74746f6d8692849a9a0b707265666572656e63657386928497960892849a9a1250425850726f6a65637453636f70654b65798692849a9a035945538692849a9a05696d6167658692849a9a0b536d617274466f6c6465728692849a9a0763616e536176658692848484084e534e756d626572008484074e5356616c7565009584012a849696018692849a9a0572656765788692849a9a225c2e28637c6370707c437c4350507c6d7c6d6d7c6a6176617c73687c7363707429248692849a9a04726f6f748692849a9a093c50524f4a4543543e8692849a9a097265637572736976658692ad92849a9a0669734c656166869284ae9db096008692849a9a07666e6d617463688692849a9a0086868686>;
+ com.apple.ide.smrt.PBXUserSmartGroupsKey.Rev10 = <040b747970656473747265616d8103e88401408484840e4e534d757461626c654172726179008484074e534172726179008484084e534f626a65637400858401690192848484134e534d757461626c6544696374696f6e6172790084840c4e5344696374696f6e6172790095960792848484084e53537472696e67019584012b146162736f6c75746550617468546f42756e646c658692849a9a008692849a9a046e616d658692849a9a14496d706c656d656e746174696f6e2046696c65738692849a9a03636c7a8692849a9a1550425846696c656e616d65536d61727447726f75708692849a9a0b6465736372697074696f6e8692849a9a103c6e6f206465736372697074696f6e3e8692849a9a08676c6f62616c49448692849a9a183143433045413430303433353045463930303434343130428692849a9a195042585472616e7369656e744c6f636174696f6e4174546f708692849a9a06626f74746f6d8692849a9a0b707265666572656e63657386928497960892849a9a1250425850726f6a65637453636f70654b65798692849a9a035945538692849a9a05696d6167658692849a9a0b536d617274466f6c6465728692849a9a0763616e536176658692848484084e534e756d626572008484074e5356616c7565009584012a849696018692849a9a0572656765788692849a9a065c2e286329248692849a9a04726f6f748692849a9a093c50524f4a4543543e8692849a9a097265637572736976658692ad92849a9a0669734c656166869284ae9db096008692849a9a07666e6d617463688692849a9a0086868686>;
};
sourceControlManager = F944EB9C08F798180049FDD4 /* Source Control */;
userBuildSettings = {
- GCC = /usr/bin/gcc;
+ GCC = "${DEVELOPER_DIR}/usr/bin/gcc";
SYMROOT = "${SRCROOT}/../../build/tcl";
TCL_SRCROOT = "${SRCROOT}/../../tcl";
};
@@ -82,16 +80,6 @@
value = /Library/Tcl;
},
{
- active = YES;
- name = HOME;
- value = "/Users/${USER}";
- },
- {
- active = YES;
- name = USER;
- value = "${USER}";
- },
- {
active = NO;
name = DYLD_PRINT_LIBRARIES;
},
@@ -130,12 +118,8 @@
executableUserSymbolLevel = 0;
libgmallocEnabled = 0;
name = tcltest;
- savedGlobals = {
- };
sourceDirectories = (
);
- variableFormatDictionary = {
- };
};
F944EB9C08F798180049FDD4 /* Source Control */ = {
isa = PBXSourceControlManager;
@@ -144,6 +128,7 @@
scmConfiguration = {
CVSToolPath = /usr/bin/cvs;
CVSUseSSH = NO;
+ SubversionToolPath = /usr/local/bin/svn;
};
scmType = scm.cvs;
};
@@ -151,6 +136,9 @@
isa = PBXCodeSenseManager;
indexTemplatePath = "";
};
+ F97258A50A86873C00096C78 /* tests */ = {
+ activeExec = 0;
+ };
F9E61D16090A3E94002B3151 /* Tcl */ = {
activeExec = 0;
executables = (
@@ -204,8 +192,6 @@
executableUserSymbolLevel = 0;
libgmallocEnabled = 0;
name = tclsh;
- savedGlobals = {
- };
sourceDirectories = (
);
};
diff --git a/macosx/Tcl.xcode/project.pbxproj b/macosx/Tcl.xcode/project.pbxproj
index 7c969d9..3415e51 100644
--- a/macosx/Tcl.xcode/project.pbxproj
+++ b/macosx/Tcl.xcode/project.pbxproj
@@ -930,7 +930,7 @@
F966C06F08F281DC005CB29B /* Frameworks */,
1AB674ADFE9D54B511CA2CBB /* Products */,
);
- comments = "Copyright (c) 2004-2007 Daniel A. Steffen <das@users.sourceforge.net>\n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.7 2007/09/06 07:26:11 das Exp $\n";
+ comments = "Copyright (c) 2004-2007 Daniel A. Steffen <das@users.sourceforge.net>\n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.8 2007/09/06 08:07:18 das Exp $\n";
name = Tcl;
path = .;
sourceTree = SOURCE_ROOT;
@@ -1920,7 +1920,6 @@
"$(TCL_SRCROOT)/unix/dltest/pkgc.c",
"$(TCL_SRCROOT)/unix/dltest/pkgd.c",
"$(TCL_SRCROOT)/unix/dltest/pkge.c",
- "$(TCL_SRCROOT)/unix/dltest/pkgf.c",
"$(TCL_SRCROOT)/unix/dltest/pkgua.c",
);
outputPaths = (
@@ -1975,7 +1974,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "## tcl configure shell script phase\n\ncd \"${TCL_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.in -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n echo \"Running autoconf & autoheader in tcl/macosx\"\n rm -rf autom4te.cache\n ${AUTOCONF:-/usr/bin/autoconf} && ${AUTOHEADER:-/usr/bin/autoheader} || exit $?\n rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tcl && cd tcl &&\nif [ \"${TCL_SRCROOT}\"/macosx/configure -nt config.status ]; then\n echo \"Configuring Tcl\"\n \"${TCL_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared ${CONFIGURE_ARGS}\nelse\n ./config.status\nfi\n";
+ shellScript = "## tcl configure shell script phase\n\ncd \"${TCL_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.in -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n echo \"Running autoconf & autoheader in tcl/macosx\"\n rm -rf autom4te.cache\n ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tcl && cd tcl &&\nif [ \"${TCL_SRCROOT}\"/macosx/configure -nt config.status ]; then\n echo \"Configuring Tcl\"\n \"${TCL_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared ${CONFIGURE_ARGS}\nelse\n ./config.status\nfi\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -2560,8 +2559,9 @@
CFLAGS = "$(PER_ARCH_CFLAGS_ppc) -fconstant-cfstrings $(CFLAGS)";
CPPFLAGS = "-arch ppc -D__CONSTANT_CFSTRINGS__ -DMAC_OS_X_VERSION_MIN_REQUIRED=1020 -nostdinc -isystem $(SDKROOT)/usr/include/gcc/darwin/$(GCC_VERSION) -isystem $(SDKROOT)/usr/include -F$(SDKROOT)/System/Library/Frameworks";
DEBUG_INFORMATION_FORMAT = stabs;
+ GCC = /usr/bin/gcc;
GCC_VERSION = 3.3;
- LDFLAGS = "-L$(SDKROOT)/usr/lib/gcc/darwin/$(GCC_VERSION) -Wl,-syslibroot,$(SDKROOT) ";
+ LDFLAGS = "-L$(SDKROOT)/usr/lib/gcc/darwin/$(GCC_VERSION) -Wl,-syslibroot,$(SDKROOT)";
MACOSX_DEPLOYMENT_TARGET = 10.2;
PREBINDING = YES;
SDKROOT = /Developer/SDKs/MacOSX10.2.8.sdk;
@@ -2572,48 +2572,6 @@
};
name = ReleasePPC10.2.8SDK;
};
- F9EEED960C2FEFD300396116 /* ReleaseUniversal10.5SDK */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = tclsh;
- };
- name = ReleaseUniversal10.5SDK;
- };
- F9EEED970C2FEFD300396116 /* ReleaseUniversal10.5SDK */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = tcltest;
- };
- name = ReleaseUniversal10.5SDK;
- };
- F9EEED980C2FEFD300396116 /* ReleaseUniversal10.5SDK */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = tests;
- TCLTEST_OPTIONS = "";
- TCL_LIBRARY = "$(TCL_SRCROOT)/library";
- TEST_RIG = "$(OBJROOT)/$(CONFIGURATION)/tcltest";
- };
- name = ReleaseUniversal10.5SDK;
- };
- F9EEED990C2FEFD300396116 /* ReleaseUniversal10.5SDK */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Tcl-Release.xcconfig */;
- buildSettings = {
- ARCHS = (
- ppc,
- ppc64,
- i386,
- x86_64,
- );
- CFLAGS = "-arch ppc -arch ppc64 -arch i386 -arch x86_64 $(CFLAGS)";
- CPPFLAGS = "-isysroot $(SDKROOT) $(CPPFLAGS)";
- MACOSX_DEPLOYMENT_TARGET = 10.5;
- PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
- };
- name = ReleaseUniversal10.5SDK;
- };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -2628,7 +2586,6 @@
F97AED1B0B660B2100310EA2 /* Debug64bit */,
F95CC8AD09158F3100EA5ACE /* Release */,
F91BCC4F093152310042A6BF /* ReleaseUniversal */,
- F9EEED960C2FEFD300396116 /* ReleaseUniversal10.5SDK */,
F9DB62080B65ADA800A370FB /* ReleaseUniversal10.4uSDK */,
F9DB621F0B65AFDE00A370FB /* ReleasePPC10.3.9SDK */,
F9DB62350B65B03A00A370FB /* ReleasePPC10.2.8SDK */,
@@ -2647,7 +2604,6 @@
F97AED1C0B660B2100310EA2 /* Debug64bit */,
F95CC8B209158F3100EA5ACE /* Release */,
F91BCC50093152310042A6BF /* ReleaseUniversal */,
- F9EEED970C2FEFD300396116 /* ReleaseUniversal10.5SDK */,
F9DB62090B65ADA800A370FB /* ReleaseUniversal10.4uSDK */,
F9DB62200B65AFDE00A370FB /* ReleasePPC10.3.9SDK */,
F9DB62360B65B03A00A370FB /* ReleasePPC10.2.8SDK */,
@@ -2666,7 +2622,6 @@
F97AED1E0B660B2100310EA2 /* Debug64bit */,
F95CC8B709158F3100EA5ACE /* Release */,
F91BCC51093152310042A6BF /* ReleaseUniversal */,
- F9EEED990C2FEFD300396116 /* ReleaseUniversal10.5SDK */,
F9DB620A0B65ADA800A370FB /* ReleaseUniversal10.4uSDK */,
F9DB62210B65AFDE00A370FB /* ReleasePPC10.3.9SDK */,
F9DB62370B65B03A00A370FB /* ReleasePPC10.2.8SDK */,
@@ -2685,7 +2640,6 @@
F97AED1D0B660B2100310EA2 /* Debug64bit */,
F97258AA0A86873D00096C78 /* Release */,
F97258AC0A86873D00096C78 /* ReleaseUniversal */,
- F9EEED980C2FEFD300396116 /* ReleaseUniversal10.5SDK */,
F97AED080B660A6C00310EA2 /* ReleaseUniversal10.4uSDK */,
F97AED0F0B660AA300310EA2 /* ReleasePPC10.3.9SDK */,
F97AED160B660AF100310EA2 /* ReleasePPC10.2.8SDK */,
diff --git a/macosx/Tcl.xcodeproj/default.pbxuser b/macosx/Tcl.xcodeproj/default.pbxuser
index 09d2b55..47e6f9b 100644
--- a/macosx/Tcl.xcodeproj/default.pbxuser
+++ b/macosx/Tcl.xcodeproj/default.pbxuser
@@ -4,19 +4,19 @@
activeBuildConfigurationName = Debug;
activeExecutable = F9E61D1C090A4282002B3151 /* tclsh */;
activeTarget = F9E61D16090A3E94002B3151 /* Tcl */;
- addToTargets = (
- );
codeSenseManager = F944EB9D08F798180049FDD4 /* Code sense */;
executables = (
F9E61D1C090A4282002B3151 /* tclsh */,
F944EB8F08F798100049FDD4 /* tcltest */,
);
perUserDictionary = {
- com.apple.ide.smrt.PBXUserSmartGroupsKey.Rev10 = <040b73747265616d747970656481e8038401408484840e4e534d757461626c654172726179008484074e534172726179008484084e534f626a65637400858401690192848484134e534d757461626c6544696374696f6e6172790084840c4e5344696374696f6e6172790095960792848484084e53537472696e67019584012b146162736f6c75746550617468546f42756e646c658692849a9a008692849a9a046e616d658692849a9a14496d706c656d656e746174696f6e2046696c65738692849a9a03636c7a8692849a9a1550425846696c656e616d65536d61727447726f75708692849a9a0b6465736372697074696f6e8692849a9a103c6e6f206465736372697074696f6e3e8692849a9a08676c6f62616c49448692849a9a183143433045413430303433353045463930303434343130428692849a9a195042585472616e7369656e744c6f636174696f6e4174546f708692849a9a06626f74746f6d8692849a9a0b707265666572656e63657386928497960892849a9a1250425850726f6a65637453636f70654b65798692849a9a035945538692849a9a05696d6167658692849a9a0b536d617274466f6c6465728692849a9a0763616e536176658692848484084e534e756d626572008484074e5356616c7565009584012a849696018692849a9a0572656765788692849a9a225c2e28637c6370707c437c4350507c6d7c6d6d7c6a6176617c73687c7363707429248692849a9a04726f6f748692849a9a093c50524f4a4543543e8692849a9a097265637572736976658692ad92849a9a0669734c656166869284ae9db096008692849a9a07666e6d617463688692849a9a0086868686>;
+ com.apple.ide.smrt.PBXUserSmartGroupsKey.Rev10 = <040b73747265616d747970656481e8038401408484840e4e534d757461626c654172726179008484074e534172726179008484084e534f626a65637400858401690192848484134e534d757461626c6544696374696f6e6172790084840c4e5344696374696f6e6172790095960792848484084e53537472696e67019584012b046e616d658692849a9a14496d706c656d656e746174696f6e2046696c65738692849a9a146162736f6c75746550617468546f42756e646c658692849a9a008692849a9a195042585472616e7369656e744c6f636174696f6e4174546f708692849a9a06626f74746f6d8692849a9a03636c7a8692849a9a1550425846696c656e616d65536d61727447726f75708692849a9a0b6465736372697074696f6e8692849a9a103c6e6f206465736372697074696f6e3e8692849a9a0b707265666572656e63657386928497960892849a9a07666e6d617463688692849a9a008692849a9a05696d6167658692849a9a0b536d617274466f6c6465728692849a9a04726f6f748692849a9a093c50524f4a4543543e8692849a9a0572656765788692849a9a065c2e286329248692849a9a097265637572736976658692848484084e534e756d626572008484074e5356616c7565009584012a849696018692849a9a0669734c656166869284b09db296008692849a9a0763616e536176658692af92849a9a1250425850726f6a65637453636f70654b65798692849a9a03594553868692849a9a08676c6f62616c49448692849a9a18314343304541343030343335304546393030343434313042868686>;
};
sourceControlManager = F944EB9C08F798180049FDD4 /* Source Control */;
userBuildSettings = {
- GCC = /usr/bin/gcc;
+ AUTOCONF = "/usr/local/bin/autoconf-2.59";
+ AUTOHEADER = "/usr/local/bin/autoheader-2.59";
+ GCC = "${DEVELOPER_DIR}/usr/bin/gcc";
SYMROOT = "${SRCROOT}/../../build/tcl";
TCL_SRCROOT = "${SRCROOT}/../../tcl";
};
@@ -29,7 +29,6 @@
};
F944EB8F08F798100049FDD4 /* tcltest */ = {
isa = PBXExecutable;
- activeArgIndex = 2147483647;
activeArgIndices = (
NO,
NO,
@@ -41,6 +40,7 @@
"-verbose \"bet\"",
);
autoAttachOnCrash = 1;
+ breakpointsEnabled = 1;
configStateDict = {
"PBXLSLaunchAction-0" = {
PBXLSLaunchAction = 0;
@@ -82,16 +82,6 @@
value = /Library/Tcl;
},
{
- active = YES;
- name = HOME;
- value = "/Users/${USER}";
- },
- {
- active = YES;
- name = USER;
- value = "${USER}";
- },
- {
active = NO;
name = DYLD_PRINT_LIBRARIES;
},
@@ -130,12 +120,8 @@
executableUserSymbolLevel = 0;
libgmallocEnabled = 0;
name = tcltest;
- savedGlobals = {
- };
sourceDirectories = (
);
- variableFormatDictionary = {
- };
};
F944EB9C08F798180049FDD4 /* Source Control */ = {
isa = PBXSourceControlManager;
@@ -144,6 +130,7 @@
scmConfiguration = {
CVSToolPath = /usr/bin/cvs;
CVSUseSSH = NO;
+ SubversionToolPath = /usr/bin/svn;
};
scmType = scm.cvs;
};
@@ -151,6 +138,9 @@
isa = PBXCodeSenseManager;
indexTemplatePath = "";
};
+ F97258A50A86873C00096C78 /* tests */ = {
+ activeExec = 0;
+ };
F9E61D16090A3E94002B3151 /* Tcl */ = {
activeExec = 0;
executables = (
@@ -159,12 +149,12 @@
};
F9E61D1C090A4282002B3151 /* tclsh */ = {
isa = PBXExecutable;
- activeArgIndex = 2147483647;
activeArgIndices = (
);
argumentStrings = (
);
autoAttachOnCrash = 1;
+ breakpointsEnabled = 1;
configStateDict = {
"PBXLSLaunchAction-0" = {
PBXLSLaunchAction = 0;
@@ -204,8 +194,6 @@
executableUserSymbolLevel = 0;
libgmallocEnabled = 0;
name = tclsh;
- savedGlobals = {
- };
sourceDirectories = (
);
};
diff --git a/macosx/Tcl.xcodeproj/project.pbxproj b/macosx/Tcl.xcodeproj/project.pbxproj
index cbac50d..1d011de 100644
--- a/macosx/Tcl.xcodeproj/project.pbxproj
+++ b/macosx/Tcl.xcodeproj/project.pbxproj
@@ -930,7 +930,7 @@
F966C06F08F281DC005CB29B /* Frameworks */,
1AB674ADFE9D54B511CA2CBB /* Products */,
);
- comments = "Copyright (c) 2004-2007 Daniel A. Steffen <das@users.sourceforge.net>\n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.25 2007/08/14 06:32:55 das Exp $\n";
+ comments = "Copyright (c) 2004-2007 Daniel A. Steffen <das@users.sourceforge.net>\n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.26 2007/09/06 08:07:18 das Exp $\n";
name = Tcl;
path = .;
sourceTree = SOURCE_ROOT;
@@ -1893,7 +1893,11 @@
/* Begin PBXProject section */
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ BuildIndependentTargetsInParallel = NO;
+ };
buildConfigurationList = F95CC8B509158F3100EA5ACE /* Build configuration list for PBXProject "Tcl" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 08FB7794FE84155DC02AAC07 /* Tcl */;
projectDirPath = "";
@@ -1920,7 +1924,6 @@
"$(TCL_SRCROOT)/unix/dltest/pkgc.c",
"$(TCL_SRCROOT)/unix/dltest/pkgd.c",
"$(TCL_SRCROOT)/unix/dltest/pkge.c",
- "$(TCL_SRCROOT)/unix/dltest/pkgf.c",
"$(TCL_SRCROOT)/unix/dltest/pkgua.c",
);
outputPaths = (
@@ -1929,6 +1932,7 @@
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
shellScript = "## dltest build script phase\n\nrm -f \"${DERIVED_FILE_DIR}/tcl/dltest.marker\"\nmake -C \"${DERIVED_FILE_DIR}/tcl\" dltest.marker\nln -fsh \"${DERIVED_FILE_DIR}/tcl/dltest\" \"${CONFIGURATION_BUILD_DIR}\"\n";
+ showEnvVarsInLog = 0;
};
F97258A40A86873C00096C78 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -1942,6 +1946,7 @@
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
shellScript = "if [ \"${ACTION:-build}\" == \"build\" ]; then\nif [ -z \"${HOME}\" ]; then export HOME=\"$(echo ~)\"; fi\ncd \"${TARGET_TEMP_DIR}\"; rm -rf \"${DERIVED_FILE_DIR}\"; mkdir -p \"${DERIVED_FILE_DIR}\"\nprintf '%s%s%s%s%s' '\npackage require tcltest 2.2\nnamespace import tcltest::*\nconfigure -testdir [file normalize {' \"${TCL_SRCROOT}\" '/tests}]\nconfigure -tmpdir [file normalize {' \"${DERIVED_FILE_DIR}\" '}]\nconfigure -verbose [concat [configure -verbose] line]\n# following test only fails when testsuite is run from inside Xcode, so skip it\nconfigure -skip [concat [configure -skip] stack-3.1]\nrunAllTests\n' | \"${TEST_RIG}\"; TEST_RIG_RESULT=$?\n[ ${TEST_RIG_RESULT} -ne 0 ] && echo \"tcltest:0: error: tcltest exited abnormally with code ${TEST_RIG_RESULT}.\"\nexit ${TEST_RIG_RESULT}\nfi";
+ showEnvVarsInLog = 0;
};
F97AF02F0B665DA900310EA2 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -1955,6 +1960,7 @@
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
shellScript = "if [ -e \"${BUILT_PRODUCTS_DIR}/tclsh\" ]; then\n mv -f \"${BUILT_PRODUCTS_DIR}/tclsh\" \"${BUILT_PRODUCTS_DIR}/tclsh${VERSION}\"\nfi\ngnumake -C \"${TCL_SRCROOT}/macosx\" -j \"$(sysctl -n hw.activecpu)\" \"$(echo \"${ACTION}\" | sed -e s/build// -e s/clean/distclean/ -e s/..\\*/\\&-/)${MAKE_TARGET}\" CFLAGS_WARNING=\"${WARNING_CFLAGS}\" SYMROOT=\"${BUILT_PRODUCTS_DIR}\" OBJ_DIR=\"${OBJECT_FILE_DIR}\" INSTALL_ROOT=\"${DSTROOT}\" PREFIX=\"${PREFIX}\" BINDIR=\"${BINDIR}\" LIBDIR=\"${FRAMEWORK_INSTALL_PATH}\" MANDIR=\"${MANDIR}\" EXTRA_CONFIGURE_ARGS=\"${CONFIGURE_ARGS}\" ${EXTRA_MAKE_FLAGS}\nresult=$?\nif [ -e \"${BUILT_PRODUCTS_DIR}/tclsh${VERSION}\" ]; then\n mv -f \"${BUILT_PRODUCTS_DIR}/tclsh${VERSION}\" \"${BUILT_PRODUCTS_DIR}/tclsh\"\nfi\nif [ -e \"${BUILT_PRODUCTS_DIR}/tcltest\" ]; then\n\trm -f \"${BUILT_PRODUCTS_DIR}/tcltest\"\nfi\necho \"Done\"\nexit ${result}\n";
+ showEnvVarsInLog = 0;
};
F9A5C5F508F651A2008AE941 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -1975,7 +1981,8 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "## tcl configure shell script phase\n\ncd \"${TCL_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.in -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n echo \"Running autoconf & autoheader in tcl/macosx\"\n rm -rf autom4te.cache\n ${AUTOCONF:-/usr/bin/autoconf} && ${AUTOHEADER:-/usr/bin/autoheader} || exit $?\n rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tcl && cd tcl &&\nif [ \"${TCL_SRCROOT}\"/macosx/configure -nt config.status ]; then\n echo \"Configuring Tcl\"\n \"${TCL_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared ${CONFIGURE_ARGS}\nelse\n ./config.status\nfi\n";
+ shellScript = "## tcl configure shell script phase\n\ncd \"${TCL_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.in -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n echo \"Running autoconf & autoheader in tcl/macosx\"\n rm -rf autom4te.cache\n ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tcl && cd tcl &&\nif [ \"${TCL_SRCROOT}\"/macosx/configure -nt config.status ]; then\n echo \"Configuring Tcl\"\n \"${TCL_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared ${CONFIGURE_ARGS}\nelse\n ./config.status\nfi\n";
+ showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -2176,7 +2183,7 @@
x86_64,
);
CFLAGS = "-arch ppc -arch ppc64 -arch i386 -arch x86_64 $(CFLAGS)";
- MACOSX_DEPLOYMENT_TARGET = 10.4;
+ MACOSX_DEPLOYMENT_TARGET = 10.5;
OTHER_LDFLAGS = (
"-Wl,-no_arch_warnings",
"$(OTHER_LDFLAGS)",
@@ -2214,7 +2221,7 @@
baseConfigurationReference = F97AE8330B65C87F00310EA2 /* Tcl-Debug.xcconfig */;
buildSettings = {
CONFIGURE_ARGS = "$(CONFIGURE_ARGS) --enable-symbols=all";
- MACOSX_DEPLOYMENT_TARGET = 10.2;
+ MACOSX_DEPLOYMENT_TARGET = 10.5;
PREBINDING = NO;
};
name = DebugMemCompile;
@@ -2274,7 +2281,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = F97AE8330B65C87F00310EA2 /* Tcl-Debug.xcconfig */;
buildSettings = {
- MACOSX_DEPLOYMENT_TARGET = 10.2;
+ MACOSX_DEPLOYMENT_TARGET = 10.5;
PREBINDING = NO;
};
name = Debug;
@@ -2283,7 +2290,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Tcl-Release.xcconfig */;
buildSettings = {
- MACOSX_DEPLOYMENT_TARGET = 10.2;
+ MACOSX_DEPLOYMENT_TARGET = 10.5;
PREBINDING = YES;
};
name = Release;
@@ -2292,7 +2299,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = F97AE8330B65C87F00310EA2 /* Tcl-Debug.xcconfig */;
buildSettings = {
- MACOSX_DEPLOYMENT_TARGET = 10.2;
+ MACOSX_DEPLOYMENT_TARGET = 10.5;
PREBINDING = NO;
};
name = DebugNoFixZL;
@@ -2398,7 +2405,7 @@
ARCHS = "$(NATIVE_ARCH_64_BIT)";
CONFIGURE_ARGS = "--enable-64bit $(CONFIGURE_ARGS)";
CPPFLAGS = "-arch $(NATIVE_ARCH_64_BIT) $(CPPFLAGS)";
- MACOSX_DEPLOYMENT_TARGET = 10.2;
+ MACOSX_DEPLOYMENT_TARGET = 10.5;
PREBINDING = NO;
};
name = Debug64bit;
@@ -2456,7 +2463,7 @@
baseConfigurationReference = F97AE8330B65C87F00310EA2 /* Tcl-Debug.xcconfig */;
buildSettings = {
CONFIGURE_ARGS = "$(CONFIGURE_ARGS) --disable-threads";
- MACOSX_DEPLOYMENT_TARGET = 10.2;
+ MACOSX_DEPLOYMENT_TARGET = 10.5;
PREBINDING = NO;
};
name = DebugUnthreaded;
@@ -2469,7 +2476,7 @@
PURIFY,
"$(GCC_PREPROCESSOR_DEFINITIONS)",
);
- MACOSX_DEPLOYMENT_TARGET = 10.2;
+ MACOSX_DEPLOYMENT_TARGET = 10.5;
PREBINDING = NO;
};
name = DebugLeaks;
@@ -2560,8 +2567,9 @@
CFLAGS = "$(PER_ARCH_CFLAGS_ppc) -fconstant-cfstrings $(CFLAGS)";
CPPFLAGS = "-arch ppc -D__CONSTANT_CFSTRINGS__ -DMAC_OS_X_VERSION_MIN_REQUIRED=1020 -nostdinc -isystem $(SDKROOT)/usr/include/gcc/darwin/$(GCC_VERSION) -isystem $(SDKROOT)/usr/include -F$(SDKROOT)/System/Library/Frameworks";
DEBUG_INFORMATION_FORMAT = stabs;
+ GCC = /usr/bin/gcc;
GCC_VERSION = 3.3;
- LDFLAGS = "-L$(SDKROOT)/usr/lib/gcc/darwin/$(GCC_VERSION) -Wl,-syslibroot,$(SDKROOT) ";
+ LDFLAGS = "-L$(SDKROOT)/usr/lib/gcc/darwin/$(GCC_VERSION) -Wl,-syslibroot,$(SDKROOT)";
MACOSX_DEPLOYMENT_TARGET = 10.2;
PREBINDING = YES;
SDKROOT = /Developer/SDKs/MacOSX10.2.8.sdk;