diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-04-06 15:47:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-04-06 15:47:17 (GMT) |
| commit | 774a6e14bbec230d6a4e08e529a4f72c0405ad5e (patch) | |
| tree | 5dba26443e8ad285bda9fb438eb5c90963b00715 /win | |
| parent | dd327eebecfff30c0d601f700f98ee3a3f0edd73 (diff) | |
| download | tk-774a6e14bbec230d6a4e08e529a4f72c0405ad5e.zip tk-774a6e14bbec230d6a4e08e529a4f72c0405ad5e.tar.gz tk-774a6e14bbec230d6a4e08e529a4f72c0405ad5e.tar.bz2 | |
Make pkgIndex.tcl files work on all platforms
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 14 | ||||
| -rwxr-xr-x | win/configure | 2 | ||||
| -rw-r--r-- | win/configure.ac | 2 | ||||
| -rw-r--r-- | win/makefile.vc | 12 | ||||
| -rw-r--r-- | win/rules.vc | 2 |
5 files changed, 28 insertions, 4 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 6e62f22..0ff2dcd 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -136,6 +136,8 @@ TK_VFS_ROOT = libtk.vfs TK_STUB_LIB_FILE = @TK_STUB_LIB_FILE@ TK_LIB_FILE = @TK_LIB_FILE@ TK_DLL_FILE = @TK_DLL_FILE@ +TK_DLL_FILE_TCL8 = @TK_DLL_FILE_TCL8@ +TK_DLL_FILE_TCL9 = @TK_DLL_FILE_TCL9@ TEST_DLL_FILE = tktest$(VER)${DLLSUFFIX} TEST_LIB_FILE = @LIBPREFIX@tktest$(VER)${DLLSUFFIX}${LIBSUFFIX} @@ -534,9 +536,17 @@ install-binaries: binaries echo "if {![package vsatisfies [package provide Tcl] 8.6-]} return";\ echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\ echo " || ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\ - echo " package ifneeded tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtcl9tk$(VERSION).dll]]]";\ + echo " if {[package vsatisfies [package provide Tcl] 9.0]} {";\ + echo " package ifneeded tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtcl9tk$(VERSION).dll]]]";\ + echo " } else {";\ + echo " package ifneeded tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtk$(VERSION).dll]]]";\ + echo " }";\ echo "} else {";\ - echo " package ifneeded tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin $(TK_DLL_FILE)]]]";\ + echo " if {[package vsatisfies [package provide Tcl] 9.0]} {";\ + echo " package ifneeded tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin $(TK_DLL_FILE_TCL9)]]]";\ + echo " } else {";\ + echo " package ifneeded tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin $(TK_DLL_FILE_TCL8)]]]";\ + echo " }";\ echo "}";\ echo "package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list package require -exact tk $(VERSION)$(PATCH_LEVEL)]";\ ) > $(PKG_INDEX); diff --git a/win/configure b/win/configure index 872005d..8ba1927 100755 --- a/win/configure +++ b/win/configure @@ -5805,6 +5805,8 @@ TK_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" eval "TK_SRC_DIR=\"`cd $srcdir/..; pwd`\"" +eval "TK_DLL_FILE_TCL8=tk$VER${DLLSUFFIX}" +eval "TK_DLL_FILE_TCL9=tcl9tk$VER${DLLSUFFIX}" if test ${TCL_MAJOR_VERSION} = 8 ; then eval "TK_DLL_FILE=tk$VER${DLLSUFFIX}" if test ${SHARED_BUILD} = 0 -o "$GCC" != "yes" ; then diff --git a/win/configure.ac b/win/configure.ac index 5fd3b8e..d7f89e6 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -240,6 +240,8 @@ TK_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" eval "TK_SRC_DIR=\"`cd $srcdir/..; pwd`\"" +eval "TK_DLL_FILE_TCL8=tk$VER${DLLSUFFIX}" +eval "TK_DLL_FILE_TCL9=tcl9tk$VER${DLLSUFFIX}" if test ${TCL_MAJOR_VERSION} = 8 ; then eval "TK_DLL_FILE=tk$VER${DLLSUFFIX}" if test ${SHARED_BUILD} = 0 -o "$GCC" != "yes" ; then diff --git a/win/makefile.vc b/win/makefile.vc index df42593..0c139b4 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -735,9 +735,17 @@ install-binaries: if {![package vsatisfies [package provide Tcl] 8.6-]} return
if {($$::tcl_platform(platform) eq "unix") && ([info exists ::env(DISPLAY)]
|| ([info exists ::argv] && ("-display" in $$::argv)))} {
- package ifneeded tk $(TK_PATCH_LEVEL) [list load [file normalize [file join $$dir .. .. bin libtcl9tk$(DOTVERSION).dll]]]
+ if {![package vsatisfies [package provide Tcl] 9.0]} {
+ package ifneeded tk $(TK_PATCH_LEVEL) [list load [file normalize [file join $$dir .. .. bin libtcl9tk$(DOTVERSION).dll]]]
+ } else {
+ package ifneeded tk $(TK_PATCH_LEVEL) [list load [file normalize [file join $$dir .. .. bin libtk$(DOTVERSION).dll]]]
+ }
} else {
- package ifneeded tk $(TK_PATCH_LEVEL) [list load [file normalize [file join $$dir .. .. bin $(TKLIBNAME)]]]
+ if {![package vsatisfies [package provide Tcl] 9.0]} {
+ package ifneeded tk $(TK_PATCH_LEVEL) [list load [file normalize [file join $$dir .. .. bin $(TKLIBNAME9)]]]
+ } else {
+ package ifneeded tk $(TK_PATCH_LEVEL) [list load [file normalize [file join $$dir .. .. bin $(TKLIBNAME8)]]]
+ }
}
package ifneeded Tk $(TK_PATCH_LEVEL) [list package require -exact tk $(TK_PATCH_LEVEL)]
<<
diff --git a/win/rules.vc b/win/rules.vc index 2d579e0..2e00832 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -1203,6 +1203,8 @@ TCLSH_NATIVE = $(TCLSH) !if $(DOING_TK) || $(NEED_TK)
WISHNAMEPREFIX = wish
WISHNAME = $(WISHNAMEPREFIX)$(TK_VERSION)$(SUFX).exe
+TKLIBNAME8 = $(PROJECT)$(TK_VERSION)$(SUFX).$(EXT)
+TKLIBNAME9 = tcl9$(PROJECT)$(TK_VERSION)$(SUFX).$(EXT)
!if $(TCL_MAJOR_VERSION) == 8
TKLIBNAME = $(PROJECT)$(TK_VERSION)$(SUFX).$(EXT)
TKIMPLIBNAME = tk$(TK_VERSION)$(SUFX).lib
|