diff options
| -rw-r--r-- | ChangeLog | 104 | ||||
| -rw-r--r-- | win/Makefile.in | 36 | ||||
| -rwxr-xr-x | win/configure | 38 | ||||
| -rw-r--r-- | win/tcl.m4 | 10 |
4 files changed, 100 insertions, 88 deletions
@@ -1,52 +1,64 @@ +2001-08-03 Jeff Hobbs <jeffh@ActiveState.com> + + * win/winMain.c (WishPanic): fixed CONST changes to go with + CONST-ification in Tcl. + + * win/configure: regenerated + * win/tcl.m4: fixed DLLSUFFIX definition to always be ${DBGX}.dll. + This is necessary for TEA compliant builds that build shared + against a static-built Tk. + * win/Makefile.in ($(WISH)): added $(TK_STUB_LIB_FILE) to build + target, otherwise it wouldn't get generated in a static build. + 2001-08-01 Don Porter <dgp@users.sourceforge.net> * doc/console.n: - * doc/menu.n: - * doc/text.n: - * doc/tkvars.n: - * generic/tkBind.c: - * generic/tkMenu.c: - * library/bgerror.tcl: - * library/button.tcl: - * library/choosedir.tcl: - * library/clrpick.tcl: - * library/comdlg.tcl: - * library/console.tcl: - * library/dialog.tcl: - * library/entry.tcl: - * library/focus.tcl: - * library/listbox.tcl: - * library/menu.tcl: - * library/msgbox.tcl: - * library/optMenu.tcl: - * library/palette.tcl: - * library/scale.tcl: - * library/scrlbar.tcl: - * library/spinbox.tcl: - * library/tclIndex: - * library/tearoff.tcl: - * library/text.tcl: - * library/tk.tcl: - * library/tkfbox.tcl: - * library/unsupported.tcl: - * library/xmfbox.tcl: - * mac/tkMacMenu.c: - * tests/clrpick.test: - * tests/filebox.test: - * tests/macMenu.test: - * tests/menu.test: - * tests/menuDraw.test: - * tests/msgbox.test: - * tests/text.test: - * tests/unixMenu.test: - * tests/winMenu.test: - * tests/xmfbox.test: - * unix/mkLinks: - * unix/tkUnixDialog.c: Merged changes from feature branch - dgp-privates-into-namespace, implementing TIP 44. All - Tk commands and variables matching tk[A-Z]* are now in the - ::tk namespace. See "BRANCH: dgp-privates-into-namespace" - entries below for details. [FR 220936] + * doc/menu.n: + * doc/text.n: + * doc/tkvars.n: + * generic/tkBind.c: + * generic/tkMenu.c: + * library/bgerror.tcl: + * library/button.tcl: + * library/choosedir.tcl: + * library/clrpick.tcl: + * library/comdlg.tcl: + * library/console.tcl: + * library/dialog.tcl: + * library/entry.tcl: + * library/focus.tcl: + * library/listbox.tcl: + * library/menu.tcl: + * library/msgbox.tcl: + * library/optMenu.tcl: + * library/palette.tcl: + * library/scale.tcl: + * library/scrlbar.tcl: + * library/spinbox.tcl: + * library/tclIndex: + * library/tearoff.tcl: + * library/text.tcl: + * library/tk.tcl: + * library/tkfbox.tcl: + * library/unsupported.tcl: + * library/xmfbox.tcl: + * mac/tkMacMenu.c: + * tests/clrpick.test: + * tests/filebox.test: + * tests/macMenu.test: + * tests/menu.test: + * tests/menuDraw.test: + * tests/msgbox.test: + * tests/text.test: + * tests/unixMenu.test: + * tests/winMenu.test: + * tests/xmfbox.test: + * unix/mkLinks: + * unix/tkUnixDialog.c: Merged changes from feature branch + dgp-privates-into-namespace, implementing TIP 44. All + Tk commands and variables matching tk[A-Z]* are now in the + ::tk namespace. See "BRANCH: dgp-privates-into-namespace" + entries below for details. [FR 220936] 2001-07-24 Mo DeJong <mdejong@redhat.com> diff --git a/win/Makefile.in b/win/Makefile.in index 4463c67..2d5df58 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.41 2001/07/06 02:25:02 mdejong Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.42 2001/08/04 00:29:56 hobbs Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -408,24 +408,20 @@ install-binaries: binaries else true; \ fi; \ done; - @echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/" - @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) - @echo "Installing $(WISH) as $(BIN_INSTALL_DIR)/wish$(VERSION)" - @$(INSTALL_PROGRAM) $(WISH) $(BIN_INSTALL_DIR)/$(WISH) - @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/" - @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh - @if test "$(DLLSUFFIX)" != "" ; then \ - echo "Installing $(TK_DLL_FILE) to $(LIB_INSTALL_DIR)/" ; \ - $(INSTALL_PROGRAM) $(TK_DLL_FILE) \ - $(BIN_INSTALL_DIR)/$(TK_DLL_FILE) ; \ - fi - @if test "$(TK_STUB_LIB_FILE)" != "" ; then \ - if [ -f $(TK_STUB_LIB_FILE) ]; then \ - echo "Installing $(TK_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ - $(INSTALL_DATA) $(TK_STUB_LIB_FILE) \ - $(LIB_INSTALL_DIR)/$(TK_STUB_LIB_FILE); \ + @for i in $(TK_DLL_FILE) $(WISH); \ + do \ + if [ -f $$i ]; then \ + echo "Installing $$i to $(BIN_INSTALL_DIR)/"; \ + $(COPY) $$i "$(BIN_INSTALL_DIR)"; \ + fi; \ + done + @for i in tkConfig.sh $(TK_LIB_FILE) $(TK_STUB_LIB_FILE); \ + do \ + if [ -f $$i ]; then \ + echo "Installing $$i to $(LIB_INSTALL_DIR)/"; \ + $(COPY) $$i "$(LIB_INSTALL_DIR)"; \ fi; \ - fi + done install-libraries: libraries @for i in $(INSTALL_ROOT)$(prefix)/lib \ @@ -439,7 +435,7 @@ install-libraries: libraries else true; \ fi; \ done; - @echo "Installing header files"; + @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkPlatDecls.h \ $(GENERIC_DIR)/tkIntXlibDecls.h $(GENERIC_DIR)/tkDecls.h ; \ do \ @@ -498,7 +494,7 @@ install-demos: install-doc: doc -$(WISH): $(TK_LIB_FILE) $(WISH_OBJS) wish.$(RES) +$(WISH): $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(WISH_OBJS) wish.$(RES) $(CC) $(CFLAGS) $(WISH_OBJS) $(TCL_LIB_FILE) $(TK_LIB_FILE) $(LIBS) \ wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW) diff --git a/win/configure b/win/configure index d576386..34720bd 100755 --- a/win/configure +++ b/win/configure @@ -1212,7 +1212,6 @@ echo "configure:1180: checking compiler flags" >&5 LIBSUFFIX="s\${DBGX}.a" LIBRARIES="\${STATIC_LIBRARIES}" EXESUFFIX="s\${DBGX}.exe" - DLLSUFFIX="" else # dynamic echo "$ac_t""using shared flags" 1>&6 @@ -1233,10 +1232,12 @@ echo "configure:1180: checking compiler flags" >&5 -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\$@)" LIBSUFFIX="\${DBGX}.a" - DLLSUFFIX="\${DBGX}.dll" EXESUFFIX="\${DBGX}.exe" LIBRARIES="\${SHARED_LIBRARIES}" fi + # DLLSUFFIX is separate because it is the building block for + # users of tclConfig.sh that may build shared or static. + DLLSUFFIX="\${DBGX}.dll" EXTRA_CFLAGS="${extra_cflags}" @@ -1286,7 +1287,6 @@ echo "configure:1180: checking compiler flags" >&5 LIBSUFFIX="s\${DBGX}.lib" LIBRARIES="\${STATIC_LIBRARIES}" EXESUFFIX="s\${DBGX}.exe" - DLLSUFFIX="" else # dynamic echo "$ac_t""using shared flags" 1>&6 @@ -1294,10 +1294,12 @@ echo "configure:1180: checking compiler flags" >&5 # Add SHLIB_LD_LIBS to the Make rule, not here. MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\$@" LIBSUFFIX="\${DBGX}.lib" - DLLSUFFIX="\${DBGX}.dll" EXESUFFIX="\${DBGX}.exe" LIBRARIES="\${SHARED_LIBRARIES}" fi + # DLLSUFFIX is separate because it is the building block for + # users of tclConfig.sh that may build shared or static. + DLLSUFFIX="\${DBGX}.dll" EXTRA_CFLAGS="-YX" CFLAGS_DEBUG="-nologo -Z7 -Od -WX ${runtime}d" @@ -1327,7 +1329,7 @@ echo "configure:1180: checking compiler flags" >&5 #-------------------------------------------------------------------- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1331: checking how to run the C preprocessor" >&5 +echo "configure:1333: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1342,13 +1344,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1346 "configure" +#line 1348 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1359,13 +1361,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1363 "configure" +#line 1365 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1376,13 +1378,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1380 "configure" +#line 1382 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1408,17 +1410,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for errno.h""... $ac_c" 1>&6 -echo "configure:1412: checking for errno.h" >&5 +echo "configure:1414: checking for errno.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1417 "configure" +#line 1419 "configure" #include "confdefs.h" #include <errno.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1450,7 +1452,7 @@ fi echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:1454: checking for build with symbols" >&5 +echo "configure:1456: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" @@ -1481,7 +1483,7 @@ TK_DBGX=${DBGX} echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6 -echo "configure:1485: checking the location of tclConfig.sh" >&5 +echo "configure:1487: checking the location of tclConfig.sh" >&5 if test -d ../../tcl8.4$TK_PATCH_LEVEL/win; then TCL_BIN_DIR_DEFAULT=../../tcl8.4$TK_PATCH_LEVEL/win @@ -1507,7 +1509,7 @@ fi echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 -echo "configure:1511: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 +echo "configure:1513: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then echo "$ac_t""loading" 1>&6 @@ -1529,7 +1531,7 @@ echo "configure:1511: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:1533: checking for tclsh" >&5 +echo "configure:1535: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -376,7 +376,6 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ LIBSUFFIX="s\${DBGX}.a" LIBRARIES="\${STATIC_LIBRARIES}" EXESUFFIX="s\${DBGX}.exe" - DLLSUFFIX="" else # dynamic AC_MSG_RESULT([using shared flags]) @@ -397,10 +396,12 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)" LIBSUFFIX="\${DBGX}.a" - DLLSUFFIX="\${DBGX}.dll" EXESUFFIX="\${DBGX}.exe" LIBRARIES="\${SHARED_LIBRARIES}" fi + # DLLSUFFIX is separate because it is the building block for + # users of tclConfig.sh that may build shared or static. + DLLSUFFIX="\${DBGX}.dll" EXTRA_CFLAGS="${extra_cflags}" @@ -450,7 +451,6 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ LIBSUFFIX="s\${DBGX}.lib" LIBRARIES="\${STATIC_LIBRARIES}" EXESUFFIX="s\${DBGX}.exe" - DLLSUFFIX="" else # dynamic AC_MSG_RESULT([using shared flags]) @@ -458,10 +458,12 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ # Add SHLIB_LD_LIBS to the Make rule, not here. MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\[$]@" LIBSUFFIX="\${DBGX}.lib" - DLLSUFFIX="\${DBGX}.dll" EXESUFFIX="\${DBGX}.exe" LIBRARIES="\${SHARED_LIBRARIES}" fi + # DLLSUFFIX is separate because it is the building block for + # users of tclConfig.sh that may build shared or static. + DLLSUFFIX="\${DBGX}.dll" EXTRA_CFLAGS="-YX" CFLAGS_DEBUG="-nologo -Z7 -Od -WX ${runtime}d" |