diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-06 17:33:22 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-06 17:33:22 (GMT) |
| commit | d60bc321ce3c20557744e9e4ac1d5ae45f0d7ee3 (patch) | |
| tree | b14e639adb3b3c06047bf9c8edf4725f65bafc3d | |
| parent | 89e3b6811bfe4023587eeb490ddbe14d1c201ffe (diff) | |
| parent | 4404292972214f5a699f956595d5b66539e08fc6 (diff) | |
| download | tcl-d60bc321ce3c20557744e9e4ac1d5ae45f0d7ee3.zip tcl-d60bc321ce3c20557744e9e4ac1d5ae45f0d7ee3.tar.gz tcl-d60bc321ce3c20557744e9e4ac1d5ae45f0d7ee3.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | library/dde/pkgIndex.tcl | 2 | ||||
| -rw-r--r-- | library/reg/pkgIndex.tcl | 2 | ||||
| -rw-r--r-- | tests/winDde.test | 4 |
4 files changed, 13 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index ba88156..6438d66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -259,6 +259,15 @@ jobs: script: - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=static,msvcrt' '-f' makefile.vc all tcltest - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=static,msvcrt' '-f' makefile.vc test + - name: "Windows/MSVC/StaticPackage" + os: windows + compiler: cl + env: *vcenv + before_install: *vcpreinst + install: [] + script: + - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=static,staticpkg,msvcrt' '-f' makefile.vc all tcltest + - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=static,staticpkg,msvcrt' '-f' makefile.vc test - name: "Windows/MSVC/Debug" os: windows compiler: cl diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl index a87db33..e78d8f3 100644 --- a/library/dde/pkgIndex.tcl +++ b/library/dde/pkgIndex.tcl @@ -1,3 +1,3 @@ if {![package vsatisfies [package provide Tcl] 8.5-]} return if {[info sharedlibextension] != ".dll"} return -package ifneeded dde 1.4.3 [list load [file join $dir tcldde14.dll] dde] +package ifneeded dde 1.4.3 [list load [file join $dir tcldde14.dll] Dde] diff --git a/library/reg/pkgIndex.tcl b/library/reg/pkgIndex.tcl index 0413df6..ae5ded6 100644 --- a/library/reg/pkgIndex.tcl +++ b/library/reg/pkgIndex.tcl @@ -1,4 +1,4 @@ if {![package vsatisfies [package provide Tcl] 8.5-]} return if {[info sharedlibextension] != ".dll"} return package ifneeded registry 1.3.5 \ - [list load [file join $dir tclreg13.dll] registry] + [list load [file join $dir tclreg13.dll] Registry] diff --git a/tests/winDde.test b/tests/winDde.test index d2fb8a0..421578b 100644 --- a/tests/winDde.test +++ b/tests/winDde.test @@ -20,7 +20,7 @@ if {[testConstraint win]} { if {![catch { ::tcltest::loadTestedCommands set ::ddever [package require dde 1.4.3] - set ::ddelib [lindex [package ifneeded dde $::ddever] 1]}]} { + set ::ddelib [info loaded "" Dde]}]} { testConstraint dde 1 } } @@ -38,7 +38,7 @@ proc createChildProcess {ddeServerName args} { set f [open $::scriptName w+] puts $f [list set ddeServerName $ddeServerName] - puts $f [list load $::ddelib dde] + puts $f [list load $::ddelib Dde] puts $f { # DDE child server - # |