BRL-CAD/tcl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 9.0. No need for 'package require registry' any more

Browse Source
This commit is contained in:
jan.nijtmans
2026-06-11 12:35:49 +00:00
parent 4ed4fd47da e53d6db1ac
commit 78a2986c20
19 changed files with 34 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compat/gettod.c
+1 -1
View File
@@ -4,7 +4,7 @@
* This file provides the gettimeofday function on systems
* that only have the System V ftime function.
*
* Copyright (c) 1995 Sun Microsystems, Inc.
* Copyright © 1995 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
compat/mkstemp.c
+1 -1
View File
@@ -3,7 +3,7 @@
*
* Source code for the "mkstemp" library routine.
*
* Copyright (c) 2009 Donal K. Fellows
* Copyright © 2009 Donal K. Fellows
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
compat/strncasecmp.c
+2 -2
View File
@@ -3,8 +3,8 @@
*
* Source code for the "strncasecmp" library routine.
*
* Copyright (c) 1988-1993 The Regents of the University of California.
* Copyright (c) 1995-1996 Sun Microsystems, Inc.
* Copyright © 1988-1993 The Regents of the University of California.
* Copyright © 1995-1996 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
compat/waitpid.c
+2 -2
View File
@@ -5,8 +5,8 @@
* that don't have waitpid but do have wait3. This code is based on a
* prototype version written by Mark Diekhans and Karl Lehenbauer.
*
* Copyright (c) 1993 The Regents of the University of California.
* Copyright (c) 1994 Sun Microsystems, Inc.
* Copyright © 1993 The Regents of the University of California.
* Copyright © 1994 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
generic/tclClockFmt.c
+1 -1
View File
@@ -4,7 +4,7 @@
* Contains the date format (and scan) routines. This code is back-ported
* from the time and date facilities of tclSE engine, by Serg G. Brester.
*
* Copyright (c) 2015 by Sergey G. Brester aka sebres. All rights reserved.
* Copyright © 2015 by Sergey G. Brester aka sebres. All rights reserved.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
generic/tclListTypes.c
+1 -1
View File
@@ -4,7 +4,7 @@
* This file contains functions that implement the Tcl abstract list
* object types.
*
* Copyright (c) 2025 Ashok P. Nadkarni. All rights reserved.
* Copyright © 2025 Ashok P. Nadkarni. All rights reserved.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
generic/tclMutexTest.c
+1 -1
View File
@@ -3,7 +3,7 @@
*
* This file implements the testmutex command.
*
* Copyright (c) 2025 Ashok P. Nadkarni. All rights reserved.
* Copyright © 2025 Ashok P. Nadkarni. All rights reserved.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
generic/tclStrIdxTree.c
+1 -1
View File
@@ -5,7 +5,7 @@
*
* This code is back-ported from the tclSE engine, by Serg G. Brester.
*
* Copyright (c) 2016 by Sergey G. Brester aka sebres. All rights reserved.
* Copyright © 2016 by Sergey G. Brester aka sebres. All rights reserved.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
generic/tclStubLibTbl.c
+2 -2
View File
@@ -4,8 +4,8 @@
* Stub object that will be statically linked into extensions that want
* to access Tcl.
*
* Copyright (c) 1998-1999 by Scriptics Corporation.
* Copyright (c) 1998 Paul Duffin.
* Copyright © 1998-1999 by Scriptics Corporation.
* Copyright © 1998 Paul Duffin.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
tests/fCmd.test
+2 -19
View File
@@ -25,23 +25,6 @@ testConstraint testchmod [llength [info commands testchmod]]
testConstraint winLessThan10 0
# Don't know how to determine this constraint correctly
testConstraint notNetworkFilesystem 0
testConstraint reg 0
if {[testConstraint win]} {
if {[catch {
# Is the registry extension already static to this shell?
try {
load {} Registry
set ::reglib {}
} on error {} {
# try the location given to use on the commandline to tcltest
::tcltest::loadTestedCommands
load $::reglib Registry
}
testConstraint reg 1
} regError]} {
catch {package require registry; testConstraint reg 1}
}
}
testConstraint notInCIenv [expr {![info exists ::env(CI)] || !$::env(CI)}]
@@ -130,7 +113,7 @@ proc gethomedirglob {user} {
return [string tolower $home]
}
}
} elseif {[testConstraint reg]} {
} elseif {[testConstraint win]} {
# Windows with registry extension loaded
if {![catch {
set sid [exec {*}[auto_execok powershell] -Command "(Get-LocalUser -Name '$user')\[0\].sid.Value"]
@@ -2691,7 +2674,7 @@ test fCmd-29.1 {weird memory corruption fault} -body {
test fCmd-30.1 {file writable on 'My Documents'} -setup {
# Get the localized version of the folder name by looking in the registry.
set mydocsname [tcl::registry get {HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders} Personal]
} -constraints {win reg} -body {
} -constraints win -body {
file writable $mydocsname
} -result 1
test fCmd-30.2 {file readable on 'NTUSER.DAT'} -constraints {win notWine} -body {
tests/tcltests.tcl
+5 -2
View File
@@ -126,9 +126,12 @@ namespace eval ::tcltests {
}
proc windowscodepage {} {
# Note we cannot use result of chcp because that returns OEM code page.
package require registry
set cp [tcl::registry get HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Nls\\CodePage ACP]
proc windowscodepage {} "return cp$cp"
if {$cp eq "65001"} {}
proc windowscodepage {} "return utf-8"
} else {
proc windowscodepage {} "return cp$cp"
}
return [windowscodepage]
}
}
tests/winFCmd.test
-1
View File
@@ -42,7 +42,6 @@ if {![catch {exec {*}[auto_execok cmd.exe] /c ver} winVer]} {
testConstraint longPathAware [testlongpathsetting]
} else {
catch {
package require registry
testConstraint longPathAware [tcl::registry get "HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\FileSystem" LongPathsEnabled]
}
}
tools/encoding/txt2enc.c
+1 -1
View File
@@ -5,7 +5,7 @@
* came with "The Unicode Standard, Version 2.0" into a form that can
* be quickly loaded into Tcl.
*
* Copyright (c) 1997 Sun Microsystems, Inc.
* Copyright © 1997 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
unix/tclAppInit.c
+3 -3
View File
@@ -4,9 +4,9 @@
* Provides a default version of the main program and Tcl_AppInit
* procedure for tclsh and other Tcl-based applications (without Tk).
*
* Copyright (c) 1993 The Regents of the University of California.
* Copyright (c) 1994-1997 Sun Microsystems, Inc.
* Copyright (c) 1998-1999 Scriptics Corporation.
* Copyright © 1993 The Regents of the University of California.
* Copyright © 1994-1997 Sun Microsystems, Inc.
* Copyright © 1998-1999 Scriptics Corporation.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
win/cat.c
+3 -3
View File
@@ -3,10 +3,10 @@
*
* Program used when testing tclWinPipe.c
*
* Copyright (c) 1996 by Sun Microsystems, Inc.
* Copyright © 1996 by Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
#include <stdio.h>
win/nmakehlp.c
+2 -2
View File
@@ -4,8 +4,8 @@
*
* This is used to fix limitations within nmake and the environment.
*
* Copyright (c) 2002 David Gravereaux.
* Copyright (c) 2006 Pat Thoyts
* Copyright © 2002 David Gravereaux.
* Copyright © 2006 Pat Thoyts
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
win/tclAppInit.c
+3 -3
View File
@@ -6,9 +6,9 @@
* Note that this program must be built in Win32 console mode to work
* properly.
*
* Copyright (c) 1993 The Regents of the University of California.
* Copyright (c) 1994-1997 Sun Microsystems, Inc.
* Copyright (c) 1998-1999 Scriptics Corporation.
* Copyright © 1993 The Regents of the University of California.
* Copyright © 1994-1997 Sun Microsystems, Inc.
* Copyright © 1998-1999 Scriptics Corporation.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
win/tclWinDde.c
+1 -1
View File
@@ -4,7 +4,7 @@
* This file provides functions that implement the "send" command,
* allowing commands to be passed from interpreter to interpreter.
*
* Copyright (c) 1997 by Sun Microsystems, Inc.
* Copyright © 1997 by Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
win/tclWinReg.c
+2 -2
View File
@@ -5,8 +5,8 @@
* command. This command is built as a dynamically loadable extension in
* a separate DLL.
*
* Copyright (c) 1997 by Sun Microsystems, Inc.
* Copyright (c) 1998-1999 by Scriptics Corporation.
* Copyright © 1997 by Sun Microsystems, Inc.
* Copyright © 1998-1999 by Scriptics Corporation.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.