Applied updates

Author: joachimmetz

AUTHORS

@@ -1,4 +1,4 @@
 Acknowledgements: assorted
 
-Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
+Copyright (C) 2008-2025, Joachim Metz <joachim.metz@gmail.com>
 

autogen.ps1

@@ -1,12 +1,12 @@
 # Script to generate the necessary files for a msvscpp build
 #
-# Version: 20240306
+# Version: 20241014
 
 $WinFlex = "..\win_flex_bison\win_flex.exe"
 $WinBison = "..\win_flex_bison\win_bison.exe"
 
-$Library = Get-Content -Path configure.ac | select -skip 3 -first 1 | % { $_ -Replace " \[","" } | % { $_ -Replace "\],","" }
-$Version = Get-Content -Path configure.ac | select -skip 4 -first 1 | % { $_ -Replace " \[","" } | % { $_ -Replace "\],","" }
+$Library = Get-Content -Path configure.ac | select -skip 3 -first 1 | % { $_ -Replace "  \[","" } | % { $_ -Replace "\],","" }
+$Version = Get-Content -Path configure.ac | select -skip 4 -first 1 | % { $_ -Replace "  \[","" } | % { $_ -Replace "\],","" }
 $Prefix = ${Library}.Substring(3)
 
 Get-Content -Path "include\${Library}.h.in" | Out-File -Encoding ascii "include\${Library}.h"

autogen.sh

@@ -1,32 +1,38 @@
 #!/bin/sh
-# Script to generate ./configure using the autotools
+# Script to generate configure and Makefile using the autotools.
 #
-# Version: 20230405
+# Version: 20241013
 
 EXIT_SUCCESS=0;
 EXIT_FAILURE=1;
 
-BINDIR="/usr/bin";
+BINDIR=`which aclocal`;
+BINDIR=`dirname ${BINDIR}`;
 
-if ! test -x "${BINDIR}/aclocal";
+if ! test -x "${BINDIR}/aclocal" && test "${BINDIR}" != "/usr/bin";
 then
-	BINDIR="/usr/local/bin";
+	BINDIR="/usr/bin";
 fi
-if ! test -x "${BINDIR}/aclocal";
+if ! test -x "${BINDIR}/aclocal" && test "${BINDIR}" != "/usr/local/bin";
 then
 	BINDIR="/usr/local/bin";
 fi
-if ! test -x "${BINDIR}/aclocal";
+if ! test -x "${BINDIR}/aclocal" && test "${BINDIR}" != "/opt/local/bin";
 then
 	# Default location of MacPorts installed binaries.
 	BINDIR="/opt/local/bin";
 fi
-if ! test -x "${BINDIR}/aclocal";
+if ! test -x "${BINDIR}/aclocal" && test "${BINDIR}" != "/opt/homebrew/bin";
+then
+	# Default location of Homebrew installed binaries.
+	BINDIR="/opt/homebrew/bin";
+fi
+if ! test -x "${BINDIR}/aclocal" && test "${BINDIR}" != "/mingw32/bin";
 then
 	# Default location of 32-bit MSYS2-MinGW installed binaries.
 	BINDIR="/mingw32/bin";
 fi
-if ! test -x "${BINDIR}/aclocal";
+if ! test -x "${BINDIR}/aclocal" && test "${BINDIR}" != "/mingw64/bin";
 then
 	# Default location of 64-bit MSYS2-MinGW installed binaries.
 	BINDIR="/mingw64/bin";
@@ -91,35 +97,30 @@ else
 
 		exit ${EXIT_FAILURE};
 	fi
-
 	if ! test -x "${AUTOCONF}";
 		then
 		echo "Unable to find: autoconf";
 
 		exit ${EXIT_FAILURE};
 	fi
-
 	if ! test -x "${AUTOHEADER}";
 	then
 		echo "Unable to find: autoheader";
 
 		exit ${EXIT_FAILURE};
 	fi
-
 	if ! test -x "${AUTOMAKE}";
 	then
 		echo "Unable to find: automake";
 
 		exit ${EXIT_FAILURE};
 	fi
-
 	if ! test -x "${AUTOPOINT}";
 	then
 		echo "Unable to find: autopoint";
 
 		exit ${EXIT_FAILURE};
 	fi
-
 	if ! test -x "${LIBTOOLIZE}";
 	then
 		echo "Unable to find: libtoolize";

build.ps1

@@ -1,6 +1,6 @@
 # Script that builds assorted
 #
-# Version: 20230411
+# Version: 20251125
 
 Param (
 	[string]$Configuration = ${Env:Configuration},
@@ -20,7 +20,7 @@ $Python = "${PythonPath}\python.exe"
 $Git = "git"
 $GitUrl = "https://github.com/libyal/vstools.git"
 
-$MSVSCppConvert = "${VSToolsPath}\scripts\msvscpp-convert.py"
+$MSVSCppConvert = "${VSToolsPath}\vstools\scripts\msvscpp_convert.py"
 
 If (-Not (Test-Path $Python))
 {
@@ -50,7 +50,7 @@ Else
 }
 If (-Not (Test-Path ${MSVSCppConvert}))
 {
-	Write-Host "Missing msvscpp-convert.py: ${MSVSCppConvert}" -foreground Red
+	Write-Host "Missing msvscpp_convert.py: ${MSVSCppConvert}" -foreground Red
 
 	Exit ${ExitFailure}
 }

common/byte_stream.h

@@ -1,7 +1,7 @@
 /*
  * Byte stream functions
  *
- * Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2008-2025, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *

common/common.h

@@ -1,7 +1,7 @@
 /*
  * Common include file
  *
- * Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2008-2025, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *

common/config_borlandc.h

@@ -1,7 +1,7 @@
 /*
  * Configuration for the Borland/CodeGear C++ Builder compiler
  *
- * Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2008-2025, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *

common/config_msc.h

@@ -1,7 +1,7 @@
 /*
  * Configuration for the Microsoft Visual Studio C++ compiler
  *
- * Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2008-2025, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *

common/config_winapi.h

@@ -1,7 +1,7 @@
 /*
  * Configuration file for WINAPI
  *
- * Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2008-2025, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *

common/file_stream.h

@@ -1,7 +1,7 @@
 /*
  * FILE stream functions
  *
- * Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2008-2025, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *