diff options
author | das <das> | 2007-06-06 09:53:38 (GMT) |
---|---|---|
committer | das <das> | 2007-06-06 09:53:38 (GMT) |
commit | 6f2cb1c3833edfcb13bda8041d4c1a673e1b503d (patch) | |
tree | 7a445345d7b6dedcc530da1dcbc44e43e6550f8f /macosx | |
parent | 0ce2a2cb2fb98447e3060196f2415dd267330e0d (diff) | |
download | tcl-6f2cb1c3833edfcb13bda8041d4c1a673e1b503d.zip tcl-6f2cb1c3833edfcb13bda8041d4c1a673e1b503d.tar.gz tcl-6f2cb1c3833edfcb13bda8041d4c1a673e1b503d.tar.bz2 |
* macosx/Tcl.xcodeproj/project.pbxproj: add settings for Fix&Continue.
* unix/configure.in (Darwin): add plist for tclsh; link the
* unix/Makefile.in (Darwin): Tcl and tclsh plists into their
* macosx/Tclsh-Info.plist.in (new): binaries in all cases.
* macosx/Tcl-Common.xcconfig:
* unix/tcl.m4 (Darwin): fix CF checks in fat 32&64bit builds.
* unix/configure: autoconf-2.59
Diffstat (limited to 'macosx')
-rw-r--r-- | macosx/Tcl-Common.xcconfig | 4 | ||||
-rw-r--r-- | macosx/Tcl.xcodeproj/project.pbxproj | 6 | ||||
-rw-r--r-- | macosx/Tclsh-Info.plist.in | 38 |
3 files changed, 44 insertions, 4 deletions
diff --git a/macosx/Tcl-Common.xcconfig b/macosx/Tcl-Common.xcconfig index 86fa509..a31e6b5 100644 --- a/macosx/Tcl-Common.xcconfig +++ b/macosx/Tcl-Common.xcconfig @@ -9,11 +9,11 @@ // 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.3 2007/04/23 20:46:13 das Exp $ +// RCS: @(#) $Id: Tcl-Common.xcconfig,v 1.4 2007/06/06 09:53:39 das Exp $ // HEADER_SEARCH_PATHS = $(DERIVED_FILE_DIR)/tcl $(HEADER_SEARCH_PATHS) -OTHER_LDFLAGS = -headerpad_max_install_names $(OTHER_LDFLAGS) +OTHER_LDFLAGS = -headerpad_max_install_names -sectcreate __TEXT __info_plist $(DERIVED_FILE_DIR)/tcl/Tclsh-Info.plist $(OTHER_LDFLAGS) INSTALL_PATH = "$(BINDIR)" GCC_PREFIX_HEADER = $(DERIVED_FILE_DIR)/tcl/tclConfig.h GCC_GENERATE_DEBUGGING_SYMBOLS = YES diff --git a/macosx/Tcl.xcodeproj/project.pbxproj b/macosx/Tcl.xcodeproj/project.pbxproj index e74face..6a05a0d 100644 --- a/macosx/Tcl.xcodeproj/project.pbxproj +++ b/macosx/Tcl.xcodeproj/project.pbxproj @@ -932,7 +932,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.21 2007/05/09 12:51:03 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.22 2007/06/06 09:53:40 das Exp $\n"; name = Tcl; path = .; sourceTree = SOURCE_ROOT; @@ -1901,7 +1901,7 @@ hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* Tcl */; projectDirPath = ""; - projectRoot = ""; + projectRoot = ..; targets = ( F9E61D16090A3E94002B3151 /* Tcl */, 8DD76FA90486AB0100D96B5E /* tcltest */, @@ -2249,11 +2249,13 @@ isa = XCBuildConfiguration; buildSettings = { CONFIGURE_ARGS = "tcl_cv_cc_visibility_hidden=no $(CONFIGURE_ARGS)"; + GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "__private_extern__=extern", "$(GCC_PREPROCESSOR_DEFINITIONS)", ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; PRODUCT_NAME = tcltest; ZERO_LINK = YES; }; diff --git a/macosx/Tclsh-Info.plist.in b/macosx/Tclsh-Info.plist.in new file mode 100644 index 0000000..8b82a09 --- /dev/null +++ b/macosx/Tclsh-Info.plist.in @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!-- + Copyright (c) 2005-2007 Daniel A. Steffen <das@users.sourceforge.net> + + See the file "license.terms" for information on usage and redistribution of + this file, and for a DISCLAIMER OF ALL WARRANTIES. + + RCS: @(#) $Id: Tclsh-Info.plist.in,v 1.1 2007/06/06 09:53:40 das Exp $ +--> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>tclsh@TCL_VERSION@</string> + <key>CFBundleGetInfoString</key> + <string>Tcl Shell @TCL_VERSION@@TCL_PATCH_LEVEL@, +Copyright © @TCL_YEAR@ Tcl Core Team, +Copyright © 2001-@TCL_YEAR@ Daniel A. Steffen, +Initial MacOS X Port by Jim Ingham & Ian Reid, +Copyright © 2001-2002, Apple Computer, Inc.</string> + <key>CFBundleIdentifier</key> + <string>com.tcltk.tclsh</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>tclsh</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>@TCL_VERSION@@TCL_PATCH_LEVEL@</string> + <key>CFBundleSignature</key> + <string>TclS</string> + <key>CFBundleVersion</key> + <string>@TCL_VERSION@@TCL_PATCH_LEVEL@</string> +</dict> +</plist> |