From 4edaedf1b097b8b903f798470d582787852d795c Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 10 Oct 2019 19:07:30 +0000 Subject: Don't bother to install wine, when we are not going to run it anyway. Only build shared version (32/64bit) when cross-compiling on Linux: We already compile all versions with GCC natively (with tests!), so those have little additional value. --- .travis.yml | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29b9e7f..28fd387 100644 --- a/.travis.yml +++ b/.travis.yml @@ -138,14 +138,13 @@ matrix: os: linux dist: xenial compiler: x86_64-w64-mingw32-gcc - addons: &mingw64 + addons: apt: packages: - gcc-mingw-w64-base - binutils-mingw-w64-x86-64 - gcc-mingw-w64-x86-64 - gcc-mingw-w64 - - wine env: - BUILD_DIR=win - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-threads" @@ -154,31 +153,13 @@ matrix: # Include a high visibility marker that tests are skipped outright - > echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`" - - name: "Linux-cross-Windows/GCC/Static/no test" - os: linux - dist: xenial - compiler: x86_64-w64-mingw32-gcc - addons: *mingw64 - env: - - BUILD_DIR=win - - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-threads --disable-shared" - script: *crosstest - - name: "Linux-cross-Windows/GCC/Debug/no test" - os: linux - dist: xenial - compiler: x86_64-w64-mingw32-gcc - addons: *mingw64 - env: - - BUILD_DIR=win - - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-threads --enable-symbols" - script: *crosstest # Test with mingw-w64 (32 bit) cross-compile # Doesn't run tests because wine is only an imperfect Windows emulation - name: "Linux-cross-Windows-32/GCC/Shared/no test" os: linux dist: xenial compiler: i686-w64-mingw32-gcc - addons: &mingw32 + addons: apt: packages: - gcc-mingw-w64-base @@ -186,29 +167,10 @@ matrix: - gcc-mingw-w64-i686 - gcc-mingw-w64 - gcc-multilib - - wine env: - BUILD_DIR=win - CFGOPT="--host=i686-w64-mingw32 --enable-threads" script: *crosstest - - name: "Linux-cross-Windows-32/GCC/Static/no test" - os: linux - dist: xenial - compiler: i686-w64-mingw32-gcc - addons: *mingw32 - env: - - BUILD_DIR=win - - CFGOPT="--host=i686-w64-mingw32 --enable-threads --disable-shared" - script: *crosstest - - name: "Linux-cross-Windows-32/GCC/Debug/no test" - os: linux - dist: xenial - compiler: i686-w64-mingw32-gcc - addons: *mingw32 - env: - - BUILD_DIR=win - - CFGOPT="--host=i686-w64-mingw32 --enable-threads --enable-symbols" - script: *crosstest # Test on Windows with MSVC native - name: "Windows/MSVC/Shared" os: windows -- cgit v0.12 From fafaee2a195d72b133d9dd4606bd71058bfbecbd Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Fri, 11 Oct 2019 12:43:49 +0000 Subject: Update (fossil's) ignore-glob and (git's) .gitignore --- .fossil-settings/ignore-glob | 6 ++++++ .gitignore | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob index c85b488..62a7a5a 100644 --- a/.fossil-settings/ignore-glob +++ b/.fossil-settings/ignore-glob @@ -19,14 +19,18 @@ */tcltest* */versions.vc */version.vc +*/libtcl.vfs +*/libtcl_*.zip html libtommath/bn.ilg libtommath/bn.ind libtommath/pretty.build libtommath/tommath.src +libtommath/*.log libtommath/*.pdf libtommath/*.pl libtommath/*.sh +libtommath/doc/* libtommath/tombc/* libtommath/pre_gen/* libtommath/pics/* @@ -43,6 +47,8 @@ unix/tclIndex unix/pkgs/* win/Debug* win/Release* +win/*.manifest win/pkgs/* +win/coffbase.txt win/tcl.hpj win/nmhlp-out.txt diff --git a/.gitignore b/.gitignore index 99fd07e..62a7a5a 100755 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,8 @@ */tcltest* */versions.vc */version.vc +*/libtcl.vfs +*/libtcl_*.zip html libtommath/bn.ilg libtommath/bn.ind @@ -45,6 +47,8 @@ unix/tclIndex unix/pkgs/* win/Debug* win/Release* +win/*.manifest win/pkgs/* +win/coffbase.txt win/tcl.hpj win/nmhlp-out.txt -- cgit v0.12 From 62cba4649fa3017633b316173e746d2bea9d0a43 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 14 Oct 2019 21:06:05 +0000 Subject: Fix [02773491861d9fd0]: Tcl_ParseArgsObjv TCL_ARGV_CONSTANT documentation is wrong --- doc/ParseArgs.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ParseArgs.3 b/doc/ParseArgs.3 index c254148..def55de 100644 --- a/doc/ParseArgs.3 +++ b/doc/ParseArgs.3 @@ -103,7 +103,7 @@ the argument's value. The following values are acceptable values for \fBTCL_ARGV_CONSTANT\fR . The argument does not take any following value argument. If this argument is -present, the \fIsrcPtr\fR field (casted to \fIint\fR) is copied to the variable +present, the (integer) value of the \fIsrcPtr\fR field is copied to the variable pointed to by the \fIdstPtr\fR field. The \fIclientData\fR field is ignored. .TP \fBTCL_ARGV_END\fR -- cgit v0.12 From c9d50be3b9d31a5e6339eae35dd3b04ee3b6913f Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 15 Oct 2019 14:38:11 +0000 Subject: Add more dummy stub-entries, filled with NULL. Stub table size corresponds with stub table size for 8.7, encountering NULL entries is better than accessing outside of array bounds. --- generic/tcl.decls | 2 +- generic/tclDecls.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++--- generic/tclInt.decls | 5 +++++ generic/tclIntDecls.h | 34 +++++++++++++++++++++++++++++ generic/tclStubInit.c | 29 ++++++++++++++++++++++++- 5 files changed, 125 insertions(+), 5 deletions(-) diff --git a/generic/tcl.decls b/generic/tcl.decls index 6fbf45f..f811ab6 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2107,7 +2107,7 @@ declare 578 { declare 579 { void Tcl_AppendPrintfToObj(Tcl_Obj *objPtr, const char *format, ...) } -declare 630 { +declare 648 { void TclUnusedStubEntry(void) } diff --git a/generic/tclDecls.h b/generic/tclDecls.h index b11c0d8..a1dbb26 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -3462,9 +3462,27 @@ EXTERN void Tcl_AppendPrintfToObj(Tcl_Obj *objPtr, /* Slot 627 is reserved */ /* Slot 628 is reserved */ /* Slot 629 is reserved */ +/* Slot 630 is reserved */ +/* Slot 631 is reserved */ +/* Slot 632 is reserved */ +/* Slot 633 is reserved */ +/* Slot 634 is reserved */ +/* Slot 635 is reserved */ +/* Slot 636 is reserved */ +/* Slot 637 is reserved */ +/* Slot 638 is reserved */ +/* Slot 639 is reserved */ +/* Slot 640 is reserved */ +/* Slot 641 is reserved */ +/* Slot 642 is reserved */ +/* Slot 643 is reserved */ +/* Slot 644 is reserved */ +/* Slot 645 is reserved */ +/* Slot 646 is reserved */ +/* Slot 647 is reserved */ #ifndef TclUnusedStubEntry_TCL_DECLARED #define TclUnusedStubEntry_TCL_DECLARED -/* 630 */ +/* 648 */ EXTERN void TclUnusedStubEntry(void); #endif @@ -4132,7 +4150,25 @@ typedef struct TclStubs { VOID *reserved627; VOID *reserved628; VOID *reserved629; - void (*tclUnusedStubEntry) (void); /* 630 */ + VOID *reserved630; + VOID *reserved631; + VOID *reserved632; + VOID *reserved633; + VOID *reserved634; + VOID *reserved635; + VOID *reserved636; + VOID *reserved637; + VOID *reserved638; + VOID *reserved639; + VOID *reserved640; + VOID *reserved641; + VOID *reserved642; + VOID *reserved643; + VOID *reserved644; + VOID *reserved645; + VOID *reserved646; + VOID *reserved647; + void (*tclUnusedStubEntry) (void); /* 648 */ } TclStubs; extern TclStubs *tclStubsPtr; @@ -6535,9 +6571,27 @@ extern TclStubs *tclStubsPtr; /* Slot 627 is reserved */ /* Slot 628 is reserved */ /* Slot 629 is reserved */ +/* Slot 630 is reserved */ +/* Slot 631 is reserved */ +/* Slot 632 is reserved */ +/* Slot 633 is reserved */ +/* Slot 634 is reserved */ +/* Slot 635 is reserved */ +/* Slot 636 is reserved */ +/* Slot 637 is reserved */ +/* Slot 638 is reserved */ +/* Slot 639 is reserved */ +/* Slot 640 is reserved */ +/* Slot 641 is reserved */ +/* Slot 642 is reserved */ +/* Slot 643 is reserved */ +/* Slot 644 is reserved */ +/* Slot 645 is reserved */ +/* Slot 646 is reserved */ +/* Slot 647 is reserved */ #ifndef TclUnusedStubEntry #define TclUnusedStubEntry \ - (tclStubsPtr->tclUnusedStubEntry) /* 630 */ + (tclStubsPtr->tclUnusedStubEntry) /* 648 */ #endif #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */ diff --git a/generic/tclInt.decls b/generic/tclInt.decls index 8acd433..2b3b89d 100644 --- a/generic/tclInt.decls +++ b/generic/tclInt.decls @@ -944,6 +944,11 @@ declare 249 { char *TclDoubleDigits(double dv, int ndigits, int flags, int *decpt, int *signum, char **endPtr) } + +declare 258 { + void TclUnusedStubEntry(void) +} + ############################################################################## diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index e4e85ad..6e74d36 100644 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -1056,6 +1056,19 @@ EXTERN void TclDbDumpActiveObjects(FILE *outFile); EXTERN char * TclDoubleDigits(double dv, int ndigits, int flags, int *decpt, int *signum, char **endPtr); #endif +/* Slot 250 is reserved */ +/* Slot 251 is reserved */ +/* Slot 252 is reserved */ +/* Slot 253 is reserved */ +/* Slot 254 is reserved */ +/* Slot 255 is reserved */ +/* Slot 256 is reserved */ +/* Slot 257 is reserved */ +#ifndef TclUnusedStubEntry_TCL_DECLARED +#define TclUnusedStubEntry_TCL_DECLARED +/* 258 */ +EXTERN void TclUnusedStubEntry(void); +#endif typedef struct TclIntStubs { int magic; @@ -1311,6 +1324,15 @@ typedef struct TclIntStubs { VOID *reserved247; VOID *reserved248; char * (*tclDoubleDigits) (double dv, int ndigits, int flags, int *decpt, int *signum, char **endPtr); /* 249 */ + VOID *reserved250; + VOID *reserved251; + VOID *reserved252; + VOID *reserved253; + VOID *reserved254; + VOID *reserved255; + VOID *reserved256; + VOID *reserved257; + void (*tclUnusedStubEntry) (void); /* 258 */ } TclIntStubs; extern TclIntStubs *tclIntStubsPtr; @@ -2040,6 +2062,18 @@ extern TclIntStubs *tclIntStubsPtr; #define TclDoubleDigits \ (tclIntStubsPtr->tclDoubleDigits) /* 249 */ #endif +/* Slot 250 is reserved */ +/* Slot 251 is reserved */ +/* Slot 252 is reserved */ +/* Slot 253 is reserved */ +/* Slot 254 is reserved */ +/* Slot 255 is reserved */ +/* Slot 256 is reserved */ +/* Slot 257 is reserved */ +#ifndef TclUnusedStubEntry +#define TclUnusedStubEntry \ + (tclIntStubsPtr->tclUnusedStubEntry) /* 258 */ +#endif #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 6499bc2..9b1562c 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -550,6 +550,15 @@ TclIntStubs tclIntStubs = { NULL, /* 247 */ NULL, /* 248 */ TclDoubleDigits, /* 249 */ + NULL, /* 250 */ + NULL, /* 251 */ + NULL, /* 252 */ + NULL, /* 253 */ + NULL, /* 254 */ + NULL, /* 255 */ + NULL, /* 256 */ + NULL, /* 257 */ + TclUnusedStubEntry, /* 258 */ }; TclIntPlatStubs tclIntPlatStubs = { @@ -1398,7 +1407,25 @@ TclStubs tclStubs = { NULL, /* 627 */ NULL, /* 628 */ NULL, /* 629 */ - TclUnusedStubEntry, /* 630 */ + NULL, /* 630 */ + NULL, /* 631 */ + NULL, /* 632 */ + NULL, /* 633 */ + NULL, /* 634 */ + NULL, /* 635 */ + NULL, /* 636 */ + NULL, /* 637 */ + NULL, /* 638 */ + NULL, /* 639 */ + NULL, /* 640 */ + NULL, /* 641 */ + NULL, /* 642 */ + NULL, /* 643 */ + NULL, /* 644 */ + NULL, /* 645 */ + NULL, /* 646 */ + NULL, /* 647 */ + TclUnusedStubEntry, /* 648 */ }; /* !END!: Do not edit above this line. */ -- cgit v0.12