From 6297311b712fb631b245f682cfcbc17a233d7b60 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Fri, 19 Nov 2004 06:29:23 +0000
Subject: * macosx/Makefile: * unix/configure.in: *
unix/tclUnixInit.c (MacOSXGetLibraryPath): changed detection of tcl
framework build when determining tclLibPath from overloaded TCL_LIBRARY to
configuration define TCL_FRAMEWORK. [Bug 1068088]
* unix/configure: autoconf-2.13
* tests/unixInit.test (7.1): fixed failure when running tests
with -tmpdir arg not set to working dir.
---
ChangeLog | 13 +++++++++++++
macosx/Makefile | 5 ++---
tests/unixInit.test | 4 ++--
unix/configure | 4 ++++
unix/configure.in | 3 ++-
unix/tclUnixInit.c | 10 +++++-----
6 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 41ba825..5b87865 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-11-19 Daniel Steffen <das@users.sourceforge.net>
+
+ * macosx/Makefile:
+ * unix/configure.in:
+ * unix/tclUnixInit.c (MacOSXGetLibraryPath): changed detection
+ of tcl framework build when determining tclLibPath from overloaded
+ TCL_LIBRARY to configuration define TCL_FRAMEWORK. [Bug 1068088]
+
+ * unix/configure: autoconf-2.13
+
+ * tests/unixInit.test (7.1): fixed failure when running tests
+ with -tmpdir arg not set to working dir.
+
2004-11-18 Don Porter <dgp@users.sourceforge.net>
*** 8.4.8 TAGGED FOR RELEASE ***
diff --git a/macosx/Makefile b/macosx/Makefile
index ee9e40c..6458cb1 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -3,7 +3,7 @@
# Makefile to build Tcl on Mac OS X packaged as a Framework
# uses standard unix build system in tcl/unix
#
-# RCS: @(#) $Id: Makefile,v 1.5.2.9 2004/11/11 01:17:07 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.5.2.10 2004/11/19 06:29:23 das Exp $
#
########################################################################################################
@@ -101,7 +101,6 @@ TCL_EXE ?= ${SYMROOT}/${TCLSH}
DYLIB_INSTALL_PATH ?= ${INSTALL_PATH}
-TCL_LIBRARY := @TCL_IN_FRAMEWORK@
LIBDIR := ${INSTALL_PATH}/${PRODUCT_NAME}.framework/Versions/${PRODUCT_VERSION}
DYLIB_INSTALL_DIR := ${DYLIB_INSTALL_PATH}/${PRODUCT_NAME}.framework/Versions/${PRODUCT_VERSION}
INCLUDEDIR := ${LIBDIR}/Headers
@@ -115,7 +114,7 @@ OBJ_DIR = ${OBJROOT}/${BUILD_STYLE}
${PROJECT}: override INSTALL_ROOT = ${OBJ_DIR}/
-MAKE_VARS := INSTALL_ROOT TCL_PACKAGE_PATH TCL_LIBRARY DYLIB_INSTALL_DIR
+MAKE_VARS := INSTALL_ROOT TCL_PACKAGE_PATH DYLIB_INSTALL_DIR
MAKE_ARGS_V = $(foreach v,${MAKE_VARS},$v=${$v})
export CPPROG := cp -p
diff --git a/tests/unixInit.test b/tests/unixInit.test
index 61d69d0..20ee51e 100644
--- a/tests/unixInit.test
+++ b/tests/unixInit.test
@@ -10,7 +10,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: unixInit.test,v 1.30.2.9 2004/10/28 00:01:12 dgp Exp $
+# RCS: @(#) $Id: unixInit.test,v 1.30.2.10 2004/11/19 06:29:23 das Exp $
package require tcltest 2
namespace import -force ::tcltest::*
@@ -369,7 +369,7 @@ test unixInit-7.1 {closed standard channel: Bug 772288} -constraints {
close stdin
[list exec $tclsh crash.tcl]
" crashtest.tcl
- exec $tclsh crashtest.tcl
+ exec $tclsh [file join [temporaryDirectory] crashtest.tcl]
} -cleanup {
removeFile crash.tcl
removeFile crashtest.tcl
diff --git a/unix/configure b/unix/configure
index c25db6d..1f45906 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7271,6 +7271,10 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
TCL_BUILD_LIB_SPEC="-F`pwd` -framework Tcl"
TCL_LIB_SPEC="-framework Tcl"
TCL_LIB_FILE="Tcl"
+ cat >> confdefs.h <<\EOF
+#define TCL_FRAMEWORK 1
+EOF
+
elif test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}"
diff --git a/unix/configure.in b/unix/configure.in
index 6c4df56..bc91be2 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to
dnl generate the file "configure", which is run during Tcl installation
dnl to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.106.2.10 2004/11/18 02:07:09 rmax Exp $
+# RCS: @(#) $Id: configure.in,v 1.106.2.11 2004/11/19 06:29:25 das Exp $
AC_INIT(../generic/tcl.h)
AC_PREREQ(2.13)
@@ -471,6 +471,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
TCL_BUILD_LIB_SPEC="-F`pwd` -framework Tcl"
TCL_LIB_SPEC="-framework Tcl"
TCL_LIB_FILE="Tcl"
+ AC_DEFINE(TCL_FRAMEWORK)
elif test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}"
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index a51124e..a3add18 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -7,7 +7,7 @@
* Copyright (c) 1999 by Scriptics Corporation.
* All rights reserved.
*
- * RCS: @(#) $Id: tclUnixInit.c,v 1.34.2.4 2004/03/29 18:49:36 hobbs Exp $
+ * RCS: @(#) $Id: tclUnixInit.c,v 1.34.2.5 2004/11/19 06:29:25 das Exp $
*/
#if defined(HAVE_CFBUNDLE)
@@ -1069,10 +1069,10 @@ TclpCheckStackSpace()
static int Tcl_MacOSXGetLibraryPath(Tcl_Interp *interp, int maxPathLen, char *tclLibPath)
{
int foundInFramework = TCL_ERROR;
- if (strcmp(defaultLibraryDir, "@TCL_IN_FRAMEWORK@") == 0) {
- foundInFramework = Tcl_MacOSXOpenVersionedBundleResources(interp,
- "com.tcltk.tcllibrary", TCL_VERSION, 0, maxPathLen, tclLibPath);
- }
+#ifdef TCL_FRAMEWORK
+ foundInFramework = Tcl_MacOSXOpenVersionedBundleResources(interp,
+ "com.tcltk.tcllibrary", TCL_VERSION, 0, maxPathLen, tclLibPath);
+#endif
return foundInFramework;
}
#endif /* HAVE_CFBUNDLE */
--
cgit v0.12