summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.fossil-settings/ignore-glob3
-rw-r--r--.travis.yml28
-rw-r--r--win/nmakehlp.c2
3 files changed, 17 insertions, 16 deletions
diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index a58aef5..651d616 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -32,7 +32,7 @@ libtommath/pretty.build
libtommath/tommath.src
libtommath/*.log
libtommath/*.pdf
-libtommath/gen.pl
+libtommath/*.pl
libtommath/*.sh
libtommath/doc/*
libtommath/tombc/*
@@ -64,4 +64,5 @@ win/*.manifest
win/pkgs/*
win/coffbase.txt
win/tcl.hpj
+win/nmakehlp.out
win/nmhlp-out.txt
diff --git a/.travis.yml b/.travis.yml
index fc9d618..7209614 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,41 +14,41 @@ jobs:
# Testing on Linux with various compilers
- name: "Linux/GCC/Shared"
os: linux
- dist: bionic
+ dist: focal
compiler: gcc
env:
- BUILD_DIR=unix
- name: "Linux/GCC/Shared: UTF_MAX=4"
os: linux
- dist: bionic
+ dist: focal
compiler: gcc
env:
- BUILD_DIR=unix
- CFGOPT=CFLAGS=-DTCL_UTF_MAX=4
- name: "Linux/GCC/Shared: UTF_MAX=6"
os: linux
- dist: bionic
+ dist: focal
compiler: gcc
env:
- BUILD_DIR=unix
- CFGOPT=CFLAGS=-DTCL_UTF_MAX=6
- name: "Linux/GCC/Static"
os: linux
- dist: bionic
+ dist: focal
compiler: gcc
env:
- CFGOPT="--disable-shared"
- BUILD_DIR=unix
- name: "Linux/GCC/Debug"
os: linux
- dist: bionic
+ dist: focal
compiler: gcc
env:
- BUILD_DIR=unix
- CFGOPT="--enable-symbols"
- name: "Linux/GCC/Mem-Debug"
os: linux
- dist: bionic
+ dist: focal
compiler: gcc
env:
- BUILD_DIR=unix
@@ -56,7 +56,7 @@ jobs:
# Older versions of GCC...
- name: "Linux/GCC 7/Shared"
os: linux
- dist: bionic
+ dist: focal
compiler: gcc-7
addons:
apt:
@@ -93,27 +93,27 @@ jobs:
# Clang
- name: "Linux/Clang/Shared"
os: linux
- dist: bionic
+ dist: focal
compiler: clang
env:
- BUILD_DIR=unix
- name: "Linux/Clang/Static"
os: linux
- dist: bionic
+ dist: focal
compiler: clang
env:
- CFGOPT="--disable-shared"
- BUILD_DIR=unix
- name: "Linux/Clang/Debug"
os: linux
- dist: bionic
+ dist: focal
compiler: clang
env:
- BUILD_DIR=unix
- CFGOPT="--enable-symbols"
- name: "Linux/Clang/Mem-Debug"
os: linux
- dist: bionic
+ dist: focal
compiler: clang
env:
- BUILD_DIR=unix
@@ -167,7 +167,7 @@ jobs:
# Doesn't run tests because wine is only an imperfect Windows emulation
- name: "Linux-cross-Windows/GCC/Shared/no test"
os: linux
- dist: bionic
+ dist: focal
compiler: x86_64-w64-mingw32-gcc
env:
- BUILD_DIR=win
@@ -181,7 +181,7 @@ jobs:
# Doesn't run tests because wine is only an imperfect Windows emulation
- name: "Linux-cross-Windows-32/GCC/Shared/no test"
os: linux
- dist: bionic
+ dist: focal
compiler: i686-w64-mingw32-gcc
env:
- BUILD_DIR=win
@@ -359,7 +359,7 @@ jobs:
# "make dist" only
- name: "Linux: make dist"
os: linux
- dist: bionic
+ dist: focal
compiler: gcc
env:
- BUILD_DIR=unix
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index fac32ee..7536ede 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -708,7 +708,7 @@ QualifyPath(
{
char szCwd[MAX_PATH + 1];
- GetFullPathName(szPath, sizeof(szCwd)-1, szCwd, NULL);
+ GetFullPathName(szPath, sizeof(szCwd)-1, szCwd, NULL);
printf("%s\n", szCwd);
return 0;
}