#5 - upgrades

adamyg · Feb 2, 2025 · e68e3a9 · e68e3a9
1 parent 2926085
commit e68e3a9
Show file tree

Hide file tree

Showing 140 changed files with 967 additions and 423 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -1,9 +1,9 @@
 # -*- mode: mak; -*-
-# $Id: Makefile.in,v 1.18 2023/12/26 17:01:00 cvsuser Exp $
+# $Id: Makefile.in,v 1.19 2025/02/02 08:47:32 cvsuser Exp $
 # winxsh - top level makefile.
 #
 #
-# Copyright (c) 2015 - 2023, Adam Young.
+# Copyright (c) 2015 - 2025, Adam Young.
 # All rights reserved.
 #
 # This file is part of the WinRSH/WinSSH project.
@@ -83,7 +83,7 @@ libdir		= @libdir@
 datadir		= @datadir@
 
         # package directories
-pkgname		= winsh
+pkgname		= @PACKAGE@
 ifeq (rief,$(findstring rief,$(libexecdir)))
 pkglibexecdir	= $(libexecdir)
 pkglibdir	= $(libdir)
@@ -109,11 +109,10 @@ top_srcdir	= @top_srcdir@
 
 # File extensions
 
-E=
 A=		.a
 O=		.o
 LP=		lib
-E=		.exe
+E=		
 
 CLEAN=		*.bak *~ *.BAK *.swp *.tmp core *.core a.out
 XCLEAN=		$(D_BIN)/*.map
@@ -145,7 +144,7 @@ ifneq ("$(word 1,$(MAKECMDGOALS))","release")
 		| make [VERBOSE=1] [release or debug] target \n\
 		|\n\
 		|	Build one or more of the following targets recursively within each sub-directory\n\
-		|	for the toolchain @TOOLCHAIN@. \n\
+		|	for the toolchain "@TOOLCHAINNAME@" (@TOOLCHAIN@). \n\
 		|\n\
 		| Options: \n\
 		|	VERBOSE - increase run-time diagnostics; suppress stderr filtering. \n\

diff --git a/buildinfo.pl b/buildinfo.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/perl -w
 # -*- mode: perl; -*-
-# $Id: buildinfo.pl,v 1.6 2023/12/26 17:01:00 cvsuser Exp $
+# $Id: buildinfo.pl,v 1.7 2025/02/02 08:47:32 cvsuser Exp $
 # buildinfo generation
 #
-# Copyright Adam Young 2018-2023
+# Copyright Adam Young 2018 - 2025
 # All rights reserved.
 #
 # The applications are free software: you can redistribute it
@@ -42,9 +42,13 @@
 my $version = "0.0.1";
 
 my $builddate = undef;
+my $buildyear = undef;
+my $buildmonth = undef;
+my $buildmday = undef;
 my $buildnumber = "1";
 my $buildtype = undef;
 my $buildtoolchain = undef;
+my $iswin64 = undef;
 
 my $bindir  = undef;
 my $sbindir = undef;
@@ -64,6 +68,7 @@
 		'date=i'        => \$builddate,
 		'build=i'       => \$buildnumber,
 		'toolchain=s'   => \$buildtoolchain,
+		'iswin64=s'     => \$iswin64,
 		'type:s'        => \$buildtype,
 		'bindir:s'      => \$bindir,
 		'sbindir:s'     => \$sbindir,
@@ -102,6 +107,12 @@
 $builddate = strftime('%Y%m%d', localtime)
 	if (! $builddate);
 
+($buildyear, $buildmonth, $buildmday) = ($1,$2,$3)
+	if ($builddate =~ /^(\d\d\d\d)(\d\d)(\d\d)$/);
+
+die "buildinfo: BUILD_DATE invalid"
+	if (! $buildyear);
+
 Generate();
 
 sub
@@ -128,11 +139,29 @@
 #define ${prefix}VERSION_3 ${version3}
 #define ${prefix}VERSION_4 ${buildnumber}
 #define ${prefix}BUILD_DATE "${builddate}"
+#define ${prefix}BUILD_YEAR "${buildyear}"
+#define ${prefix}BUILD_MONTH "${buildmonth}"
+#define ${prefix}BUILD_MDAY "${buildmday}"
 #define ${prefix}BUILD_NUMBER "${buildnumber}"
 EOT
 
-	print FILE "#define BUILD_TOOLCHAIN \"${buildtoolchain}\"\n"
-		if ($buildtoolchain);
+	if ($buildtoolchain) {
+		my $buildtoolname = $buildtoolchain;
+		$buildtoolname =~ s/^\.//;
+
+		print FILE "#define BUILD_TOOLCHAIN \"${buildtoolchain}\"\n";
+		print FILE "#define BUILD_TOOLNAME \"${buildtoolname}\"\n";
+		print FILE "#define BUILD_ARCHITECTURE \"x64\"\n"
+			if ($buildtoolname =~ /64$/);
+	}
+
+	if (defined $iswin64) {
+		if ($iswin64 eq 'yes') {
+			print FILE "#define BUILD_ISWIN64 1\n";
+		} else {
+			print FILE "#define BUILD_ISWIN32 1\n";
+		}
+	}
 
 	if ($buildtype) {
 		print FILE "#define BUILD_TYPE \"${buildtype}\"\n";
@@ -161,6 +190,9 @@
 	print FILE "#define ${prefix}BUILD_LIBEXECDIR \"${libexecdir}\"\n"
 		if ($libexecdir);
 
+	print FILE "#define ${prefix}BUILD_DATADIR \"${datadir}\"\n"
+		if ($datadir);
+
 	close(FILE);
 }
 

diff --git a/libNTService/Makefile.in b/libNTService/Makefile.in
@@ -1,8 +1,8 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.6 2023/12/27 14:22:58 cvsuser Exp $
+# $Id: Makefile.in,v 1.7 2025/02/02 08:47:18 cvsuser Exp $
 # libNTService makefile.
 #
-# Copyright (c) 2020 - 2023, Adam Young.
+# Copyright (c) 2020 - 2025, Adam Young.
 # All rights reserved.
 #
 # The applications are free software: you can redistribute it

diff --git a/libNTService/NTService.cpp b/libNTService/NTService.cpp
@@ -1,11 +1,11 @@
 #include <edidentifier.h>
-__CIDENT_RCSID(NTService_cpp, "$Id: NTService.cpp,v 1.14 2023/12/27 14:22:58 cvsuser Exp $")
+__CIDENT_RCSID(NTService_cpp, "$Id: NTService.cpp,v 1.15 2025/02/02 08:47:18 cvsuser Exp $")
 
 /* -*- mode: c; indent-width: 8; -*- */
 /*
  * CNTService - Classic window services framework (tweaked).
  *
- * Copyright (c) 2020 - 2023, Adam Young.
+ * Copyright (c) 2020 - 2025, Adam Young.
  * Based on the MSDN example service framework.
  * All rights reserved.
  *

diff --git a/libNTService/NTService.h b/libNTService/NTService.h
@@ -4,7 +4,7 @@
 /*
  * CNTService - Classic window services framework (tweaked).
  *
- * Copyright (c) 2020 - 2023, Adam Young.
+ * Copyright (c) 2020 - 2025, Adam Young.
  * All rights reserved.
  *
  * This file is part of the WinRSH/WinSSH project.

diff --git a/libNTService/NTServiceConfig.cpp b/libNTService/NTServiceConfig.cpp
@@ -1,11 +1,11 @@
 #include <edidentifier.h>
-__CIDENT_RCSID(NTServiceConfig_cpp, "$Id: NTServiceConfig.cpp,v 1.10 2023/12/27 14:22:58 cvsuser Exp $")
+__CIDENT_RCSID(NTServiceConfig_cpp, "$Id: NTServiceConfig.cpp,v 1.11 2025/02/02 08:47:18 cvsuser Exp $")
 
 /* -*- mode: c; indent-width: 8; -*- */
 /*
  * CNTService - Classic window services framework (tweaked).
  *
- * Copyright (c) 2020 - 2023, Adam Young.
+ * Copyright (c) 2020 - 2025, Adam Young.
  * All rights reserved.
  *
  * This file is part of the WinRSH/WinSSH project.

diff --git a/libNTService/NTServiceConfig.h b/libNTService/NTServiceConfig.h
@@ -2,7 +2,7 @@
  * CNTService - Classic window services framework (tweaked).
  * Service config.
  *
- * Copyright (c) 2020 - 2023, Adam Young.
+ * Copyright (c) 2020 - 2025, Adam Young.
  * All rights reserved.
  *
  * This file is part of the WinRSH/WinSSH project.

diff --git a/libNTService/NTServiceControl.cpp b/libNTService/NTServiceControl.cpp
@@ -1,11 +1,11 @@
 #include <edidentifier.h>
-__CIDENT_RCSID(NTServiceControl_cpp, "$Id: NTServiceControl.cpp,v 1.8 2023/12/27 14:22:59 cvsuser Exp $")
+__CIDENT_RCSID(NTServiceControl_cpp, "$Id: NTServiceControl.cpp,v 1.9 2025/02/02 08:47:18 cvsuser Exp $")
 
 /* -*- mode: c; indent-width: 8; -*- */
 /*
  * CNTService - Classic window services framework (tweaked).
  *
- * Copyright (c) 2020 - 2023, Adam Young.
+ * Copyright (c) 2020 - 2025, Adam Young.
  * All rights reserved.
  *
  * This file is part of the WinRSH/WinSSH project.

diff --git a/libNTService/NTServiceControl.h b/libNTService/NTServiceControl.h
@@ -2,7 +2,7 @@
  * CNTService - Classic window services framework (tweaked).
  * Service Control
  *
- * Copyright (c) 2020 - 2023, Adam Young.
+ * Copyright (c) 2020 - 2025, Adam Young.
  * All rights reserved.
  *
  * This file is part of the WinRSH/WinSSH project.

diff --git a/libNTService/NTServiceGetopt.h b/libNTService/NTServiceGetopt.h
@@ -5,7 +5,7 @@
 /*
  * CNTService - Classic window services framework (tweaked).
  *
- * Copyright (c) 2020 - 2023, Adam Young.
+ * Copyright (c) 2020 - 2025, Adam Young.
  * All rights reserved.
  *
  * This file is part of the WinRSH/WinSSH project.

diff --git a/libNTService/NTServiceIIO.h b/libNTService/NTServiceIIO.h
@@ -4,7 +4,7 @@
 /*
  * CNTService - Classic window services framework (tweaked).
  *
- * Copyright (c) 2020 - 2023, Adam Young.
+ * Copyright (c) 2020 - 2025, Adam Young.
  * All rights reserved.
  *
  * This file is part of the WinRSH/WinSSH project.

diff --git a/libNTService/NTServiceIO.h b/libNTService/NTServiceIO.h
@@ -4,7 +4,7 @@
 /*
  * CNTService - Classic window services framework (tweaked).
  *
- * Copyright (c) 2020 - 2023, Adam Young.
+ * Copyright (c) 2020 - 2025, Adam Young.
  * All rights reserved.
  *
  * This file is part of the WinRSH/WinSSH project.

diff --git a/libNTService/NTServiceReg.cpp b/libNTService/NTServiceReg.cpp
@@ -1,12 +1,12 @@
 #include <edidentifier.h>
-__CIDENT_RCSID(NTServiceReg_cpp, "$Id: NTServiceReg.cpp,v 1.6 2023/12/27 14:22:59 cvsuser Exp $")
+__CIDENT_RCSID(NTServiceReg_cpp, "$Id: NTServiceReg.cpp,v 1.7 2025/02/02 08:47:18 cvsuser Exp $")
 
 /* -*- mode: c; indent-width: 8; -*- */
 /*
  * CNTService - Classic window services framework (tweaked).
  * Service Control
  *
- * Copyright (c) 2020 - 2023, Adam Young.
+ * Copyright (c) 2020 - 2025, Adam Young.
  * All rights reserved.
  *
  * This file is part of the WinRSH/WinSSH project.

diff --git a/libNTService/NTServiceReg.h b/libNTService/NTServiceReg.h
@@ -5,7 +5,7 @@
  * CNTService - Classic window services framework (tweaked).
  * Registry interface.
  *
- * Copyright (c) 2020 - 2023, Adam Young.
+ * Copyright (c) 2020 - 2025, Adam Young.
  * All rights reserved.
  *
  * This file is part of the WinRSH/WinSSH project.

diff --git a/libNTService/NTString.h b/libNTService/NTString.h
@@ -4,7 +4,7 @@
 /*
  * CNTService - Classic window services framework (tweaked).
  *
- * Copyright (c) 2020 - 2023, Adam Young.
+ * Copyright (c) 2020 - 2025, Adam Young.
  * All rights reserved.
  *
  * Simple String - OpenWATCOM has unresolved dbgsym linker issues with <string>.

diff --git a/libmbedtls/.gitignore b/libmbedtls/.gitignore
@@ -1,5 +1,7 @@
-mbedtls-2.13.0/
-mbedtls-2.16.6/
+mbedtls-2.13.*
+readme_2_13_*
+mbedtls-2.16.*
+readme_2_16_*
 mbedtls-2.27.0/
 mbedtls-3.6.2/
 Makefile.in.*

diff --git a/libtermemu/Makefile.in b/libtermemu/Makefile.in
@@ -1,9 +1,9 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.15 2023/12/26 17:01:00 cvsuser Exp $
+# $Id: Makefile.in,v 1.16 2025/02/02 08:47:06 cvsuser Exp $
 # libtermemu makefile.
 #
 #
-# Copyright (c) 2015 - 2022, Adam Young.
+# Copyright (c) 2015 - 2025, Adam Young.
 # All rights reserved.
 #
 # This file is part of the WinRSH/WinSSH project.
@@ -32,10 +32,12 @@ top_builddir=	@top_builddir@
 
 # File extensions
 
-O=		.o
+C=		.c
 H=		.h
+O=		.o
 A=		.a
 LP=		lib
+E=
 
 CLEAN=		*.bak *~ *.BAK *.swp *.tmp core *.core a.out
 XCLEAN=
@@ -46,6 +48,9 @@ CC=		@CC@
 AR=		@AR@
 RANLIB=		@RANLIB@
 RM=		@RM@
+PERL=		@PERL@
+LIBTOOL=	@LIBTOOL@
+RC=		@RC@
 
 # Configuration
 
@@ -57,12 +62,21 @@ ifneq ("$(BUILD_TYPE)","release")
 RTSUFFIX=d
 endif
 
+QUIETOUT:=	>/dev/null 2>&1
+ifeq ($(VERBOSE),1)
+QUIETOUT:=
+else ifeq ($(VERBOSE),0)
+else ifeq ($(VERBOSE),)
+else
+$(error VERBOSE: unexpected value 0 or 1 required, $(VERBOSE) given]))
+endif
+
 # Directories
 
 D_INC=		$(ROOT)/include
 D_BIN=		$(ROOT)/bin@TOOLCHAINEXT@/$(BUILD_TYPE)
-D_OBJ=		$(ROOT)/obj@TOOLCHAINEXT@/$(BUILD_TYPE)/libtermemu
 D_LIB=		$(ROOT)/lib@TOOLCHAINEXT@/$(BUILD_TYPE)
+D_OBJ=		$(ROOT)/obj@TOOLCHAINEXT@/$(BUILD_TYPE)/libtermemu
 
 # Common flags
 
@@ -134,11 +148,11 @@ $(LIBRARY):		$(D_OBJ)/.created $(LIBOBJS)
 
 $(D_BIN)/mkkeys$(E):	MAPFILE=$(basename $@).map
 $(D_BIN)/mkkeys$(E):	$(D_OBJ)/.created $(MKKEYS_OBJS)
-		$(CC) $(LDFLAGS) -o $@ $(MKKEYS_OBJS) $(LDLIBS) @LDMAPFILE@
+		$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(MKKEYS_OBJS) $(LDLIBS) @LDMAPFILE@
 
 $(D_BIN)/kbtest$(E):	MAPFILE=$(basename $@).map
 $(D_BIN)/kbtest$(E):	$(D_OBJ)/.created $(KBTEST_OBJS)
-		$(CC) $(LDFLAGS) -o $@ $(KBTEST_OBJS) $(LDLIBS) @LDMAPFILE@
+		$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(KBTEST_OBJS) $(LDLIBS) @LDMAPFILE@
 
 $(D_OBJ)/.created:
 		-@mkdir $(D_OBJ)