summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog16
-rw-r--r--macosx/Tcl-Common.xcconfig5
-rw-r--r--macosx/Tcl.xcodeproj/default.pbxuser1
-rw-r--r--macosx/Tcl.xcodeproj/project.pbxproj22
4 files changed, 35 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index ee92f12..bfa311b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,18 @@
+2008-03-12 Daniel Steffen <das@users.sourceforge.net>
+
+ * macosx/Tcl.xcodeproj/project.pbxproj: add support for Xcode 3.1
+ * macosx/Tcl.xcodeproj/default.pbxuser: CODE_SIGN_IDENTITY and
+ * macosx/Tcl-Common.xcconfig: 'xcodebuild install'.
+
2008-03-12 Andreas Kupries <andreask@activestate.com>
- * doc/info.n: Replaced {expand} with {8}.
+ * doc/info.n: Replaced {expand} with {*}.
2008-03-12 Jeff Hobbs <jeffh@ActiveState.com>
- * unix/Makefile.in (install-libraries): Bump http to 2.7
- * win/Makefile.in (install-libraries): Added -myaddr option to allow
- * library/http/http.tcl (http::geturl): control of selected socket
+ * unix/Makefile.in (install-libraries): Bump http to 2.7
+ * win/Makefile.in (install-libraries): Added -myaddr option to allow
+ * library/http/http.tcl (http::geturl): control of selected socket
* library/http/pkgIndex.tcl: interface. [Bug 559898]
* doc/http.n, tests/http.test: Added -keepalive and
-protocol 1.1 with chunked transfer encoding support. [Bug
@@ -56,7 +62,7 @@
* unix/Makefile.in (install-strip): strip non-global symbols from
dynamic library.
- * unix/tclUnixNotfy.c: fix warning
+ * unix/tclUnixNotfy.c: fix warning.
* tests/exec.test (exec-9.7): reduce timing sensitivity
* tests/socket.test (socket-2.11): (esp. on multi-proc machines).
diff --git a/macosx/Tcl-Common.xcconfig b/macosx/Tcl-Common.xcconfig
index 43467b9..9f89d82 100644
--- a/macosx/Tcl-Common.xcconfig
+++ b/macosx/Tcl-Common.xcconfig
@@ -9,12 +9,13 @@
// 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.9 2008/03/11 22:28:34 das Exp $
+// RCS: @(#) $Id: Tcl-Common.xcconfig,v 1.10 2008/03/12 22:17:57 das Exp $
//
HEADER_SEARCH_PATHS = "$(DERIVED_FILE_DIR)/tcl" $(HEADER_SEARCH_PATHS)
OTHER_LDFLAGS = -headerpad_max_install_names -sectcreate __TEXT __info_plist "$(DERIVED_FILE_DIR)/tcl/Tclsh-Info.plist" $(OTHER_LDFLAGS)
-INSTALL_PATH = "$(BINDIR)"
+INSTALL_PATH = $(BINDIR)
+INSTALL_MODE_FLAG = go-w,a+rX
GCC_PREFIX_HEADER = $(DERIVED_FILE_DIR)/tcl/tclConfig.h
GCC_GENERATE_DEBUGGING_SYMBOLS = YES
GCC_NO_COMMON_BLOCKS = YES
diff --git a/macosx/Tcl.xcodeproj/default.pbxuser b/macosx/Tcl.xcodeproj/default.pbxuser
index b135cfb..45224d6 100644
--- a/macosx/Tcl.xcodeproj/default.pbxuser
+++ b/macosx/Tcl.xcodeproj/default.pbxuser
@@ -16,6 +16,7 @@
userBuildSettings = {
AUTOCONF = "/usr/local/bin/autoconf-2.59";
AUTOHEADER = "/usr/local/bin/autoheader-2.59";
+ CODE_SIGN_IDENTITY = "";
SYMROOT = "${SRCROOT}/../../build/tcl";
TCL_SRCROOT = "${SRCROOT}/../../tcl";
};
diff --git a/macosx/Tcl.xcodeproj/project.pbxproj b/macosx/Tcl.xcodeproj/project.pbxproj
index d452303..205d5e4 100644
--- a/macosx/Tcl.xcodeproj/project.pbxproj
+++ b/macosx/Tcl.xcodeproj/project.pbxproj
@@ -933,7 +933,7 @@
F966C06F08F281DC005CB29B /* Frameworks */,
1AB674ADFE9D54B511CA2CBB /* Products */,
);
- comments = "Copyright (c) 2004-2008 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.30 2008/03/11 22:26:27 das Exp $\n";
+ comments = "Copyright (c) 2004-2008 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.31 2008/03/12 22:17:58 das Exp $\n";
name = Tcl;
path = .;
sourceTree = SOURCE_ROOT;
@@ -1959,12 +1959,14 @@
files = (
);
inputPaths = (
+ "${TARGET_TEMP_DIR}/.none",
);
outputPaths = (
+ "${TARGET_BUILD_DIR}/${EXECUTABLE_NAME}",
);
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}\" CFLAGS_OPTIMIZE=\"-O${GCC_OPTIMIZATION_LEVEL}\" 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";
+ shellScript = "if [ -e \"${TARGET_BUILD_DIR}/tclsh\" ]; then\n mv -f \"${TARGET_BUILD_DIR}/tclsh\" \"${TARGET_BUILD_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}\" CFLAGS_OPTIMIZE=\"-O${GCC_OPTIMIZATION_LEVEL}\" 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 \"${TARGET_BUILD_DIR}/tclsh${VERSION}\" ]; then\n mv -f \"${TARGET_BUILD_DIR}/tclsh${VERSION}\" \"${TARGET_BUILD_DIR}/tclsh\"\nfi\nif [ -e \"${BUILT_PRODUCTS_DIR}/tcltest\" ]; then\n\trm -f \"${BUILT_PRODUCTS_DIR}/tcltest\"\nfi\necho \"Done\"\nrm -f \"${SCRIPT_INPUT_FILE_0}\"\nexit ${result}\n";
showEnvVarsInLog = 0;
};
F9A5C5F508F651A2008AE941 /* ShellScript */ = {
@@ -2168,6 +2170,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = ReleaseUniversal;
};
@@ -2202,6 +2205,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = DebugMemCompile;
};
@@ -2236,6 +2240,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = Debug;
};
@@ -2243,6 +2248,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = Release;
};
@@ -2250,6 +2256,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = DebugNoFixZL;
};
@@ -2384,6 +2391,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = Debug64bit;
};
@@ -2430,6 +2438,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = "Debug gcc42";
};
@@ -2474,6 +2483,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = "Debug llvmgcc42";
};
@@ -2528,6 +2538,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = "ReleaseUniversal gcc42";
};
@@ -2577,6 +2588,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = "ReleaseUniversal llvmgcc42";
};
@@ -2601,6 +2613,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = DebugUnthreaded;
};
@@ -2608,6 +2621,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = DebugLeaks;
};
@@ -2672,6 +2686,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = ReleaseUniversal10.4uSDK;
};
@@ -2709,6 +2724,7 @@
buildSettings = {
LDFLAGS = "-force_cpusubtype_ALL $(LDFLAGS)";
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = ReleasePPC10.3.9SDK;
};
@@ -2736,6 +2752,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = ReleasePPC10.2.8SDK;
};
@@ -2771,6 +2788,7 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = tclsh;
+ SKIP_INSTALL = NO;
};
name = ReleaseUniversal10.5SDK;
};