Skip to content

Commit

Permalink
Applied updates
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Jan 30, 2024
1 parent c4bda70 commit 518c533
Show file tree
Hide file tree
Showing 285 changed files with 302 additions and 297 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Acknowledgements: libuna

Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>

This code is derived from information and software contributed by:
* Unicode string conversion
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ environment:
install:
- cmd: if [%BUILD_ENVIRONMENT%]==[msbuild] (
git clone https://github.com/libyal/vstools.git ..\vstools )
- sh: if test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode"; then brew update-reset && brew update -q; fi
- sh: if test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode"; then brew install -q autoconf automake gettext gnu-sed libtool pkg-config || true; fi
- sh: if ( test `uname -s` = "Darwin" && test ${BUILD_ENVIRONMENT} = "python-tox" ) || test ${BUILD_ENVIRONMENT} = "xcode"; then brew update-reset && brew update -q; fi
- sh: if ( test `uname -s` = "Darwin" && test ${BUILD_ENVIRONMENT} = "python-tox" ) || test ${BUILD_ENVIRONMENT} = "xcode"; then brew install -q autoconf automake gettext gnu-sed libtool pkg-config || true; fi
- ps: If ($env:BUILD_ENVIRONMENT -eq "cygwin64") {
(New-Object Net.WebClient).DownloadFile("https://cygwin.com/setup-x86_64.exe", "C:\\cygwin64\\setup-x86_64.exe") }
- cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
Expand All @@ -137,7 +137,7 @@ install:
$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest -Uri https://uploader.codecov.io/latest/windows/codecov.exe -Outfile ..\codecov.exe }

build_script:
- ps: If ($env:BUILD_ENVIRONMENT -eq "msbuild" -or ($env:BUILD_ENVIRONMENT -eq "python" -and $isWindows)) {
- ps: If ($env:BUILD_ENVIRONMENT -eq "msbuild" -or ($env:BUILD_ENVIRONMENT -eq "python-tox" -and $isWindows)) {
.\synclibs.ps1;
.\autogen.ps1 }
- ps: If ($env:TARGET -eq "vs2008") {
Expand Down
25 changes: 15 additions & 10 deletions autogen.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Script to generate the necessary files for a msvscpp build
#
# Version: 20230104
# Version: 20230118

$WinFlex = "..\win_flex_bison\win_flex.exe"
$WinBison = "..\win_flex_bison\win_bison.exe"
Expand All @@ -9,17 +9,22 @@ $Library = Get-Content -Path configure.ac | select -skip 3 -first 1 | % { $_ -Re
$Version = Get-Content -Path configure.ac | select -skip 4 -first 1 | % { $_ -Replace " \[","" } | % { $_ -Replace "\],","" }
$Prefix = ${Library}.Substring(3)

Get-Content -Path "include\${Library}.h.in" > "include\${Library}.h"
Get-Content -Path "include\${Library}\definitions.h.in" | % { $_ -Replace "@VERSION@","${Version}" } > "include\${Library}\definitions.h"
Get-Content -Path "include\${Library}\features.h.in" | % { $_ -Replace "@[A-Z0-9_]*@","0" } > "include\${Library}\features.h"
Get-Content -Path "include\${Library}\types.h.in" | % { $_ -Replace "@[A-Z0-9_]*@","0" } > "include\${Library}\types.h"
Get-Content -Path "common\types.h.in" | % { $_ -Replace "@PACKAGE@","${Library}" } > "common\types.h"
Get-Content -Path "${Library}\${Library}_definitions.h.in" | % { $_ -Replace "@VERSION@","${Version}" } > "${Library}\${Library}_definitions.h"
Get-Content -Path "${Library}\${Library}.rc.in" | % { $_ -Replace "@VERSION@","${Version}" } > "${Library}\${Library}.rc"
Get-Content -Path "include\${Library}.h.in" | Out-File -Encoding ascii "include\${Library}.h"
Get-Content -Path "include\${Library}\definitions.h.in" | % { $_ -Replace "@VERSION@","${Version}" } | Out-File -Encoding ascii "include\${Library}\definitions.h"
Get-Content -Path "include\${Library}\features.h.in" | % { $_ -Replace "@[A-Z0-9_]*@","0" } | Out-File -Encoding ascii "include\${Library}\features.h"
Get-Content -Path "include\${Library}\types.h.in" | % { $_ -Replace "@[A-Z0-9_]*@","0" } | Out-File -Encoding ascii "include\${Library}\types.h"
Get-Content -Path "common\types.h.in" | % { $_ -Replace "@PACKAGE@","${Library}" } | Out-File -Encoding ascii "common\types.h"
Get-Content -Path "${Library}\${Library}_definitions.h.in" | % { $_ -Replace "@VERSION@","${Version}" } | Out-File -Encoding ascii "${Library}\${Library}_definitions.h"
Get-Content -Path "${Library}\${Library}.rc.in" | % { $_ -Replace "@VERSION@","${Version}" } | Out-File -Encoding ascii "${Library}\${Library}.rc"

If (Test-Path "setup.cfg.in")
{
Get-Content -Path "setup.cfg.in" | % { $_ -Replace "@VERSION@","${Version}" } | Out-File -Encoding ascii "setup.cfg"
}

If (Test-Path "${Prefix}.net")
{
Get-Content -Path "${Prefix}.net\${Prefix}.net.rc.in" | % { $_ -Replace "@VERSION@","${Version}" } > "${Prefix}.net\${Prefix}.net.rc"
Get-Content -Path "${Prefix}.net\${Prefix}.net.rc.in" | % { $_ -Replace "@VERSION@","${Version}" } | Out-File -Encoding ascii "${Prefix}.net\${Prefix}.net.rc"
}

$NamePrefix = ""
Expand All @@ -38,7 +43,7 @@ ForEach (${DirectoryElement} in Get-ChildItem -Path "${Library}\*.l")
$Output = Invoke-Expression -Command "& '${WinFlex}' -Cf ${DirectoryElement} 2>&1"
Write-Host ${Output}

# Moving manually since win_flex -o <filename> does not provide the expected behavior.
# Moving manually since `win_flex -o filename' does not provide the expected behavior.
Move-Item "lex.yy.c" ${OutputFile} -force
}

Expand Down
2 changes: 1 addition & 1 deletion common/byte_stream.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Byte stream functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/common.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Common include file
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/config_borlandc.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Configuration for the Borland/CodeGear C++ Builder compiler
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/config_msc.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Configuration for the Microsoft Visual Studio C++ compiler
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/config_winapi.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Configuration file for WINAPI
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/file_stream.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* FILE stream functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/memory.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Memory functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/narrow_string.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Narrow character string functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/system_string.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* System character string functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/types.h.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Type and type-support definitions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/wide_string.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Wide character string functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AC_PREREQ([2.71])

AC_INIT(
[libuna],
[20231231],
[20240130],
[joachim.metz@gmail.com])

AC_CONFIG_SRCDIR(
Expand Down
2 changes: 1 addition & 1 deletion dpkg/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Upstream-Name: libuna
Source: https://github.com/libyal/libuna

Files: *
Copyright: 2008-2023, Joachim Metz <joachim.metz@gmail.com>
Copyright: 2008-2024, Joachim Metz <joachim.metz@gmail.com>
License: LGPL-3.0+

License: LGPL-3.0+
Expand Down
2 changes: 1 addition & 1 deletion include/libuna.h.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Library to support Unicode and ASCII (byte stream) conversions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion include/libuna/definitions.h.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Definitions for libuna
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion include/libuna/error.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The error code definitions for libuna
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion include/libuna/extern.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This header should be included in header files that export or import
* library functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion include/libuna/features.h.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Features of libuna
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion include/libuna/types.h.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Type definitions for libuna
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Library to support Unicode and ASCII (byte stream) conversions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna.rc.in
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ BEGIN
VALUE "FileDescription", "Library to support Unicode and ASCII (byte stream) conversions\0"
VALUE "FileVersion", "@VERSION@" "\0"
VALUE "InternalName", "libuna.dll\0"
VALUE "LegalCopyright", "(C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>\0"
VALUE "LegalCopyright", "(C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>\0"
VALUE "OriginalFilename", "libuna.dll\0"
VALUE "ProductName", "libuna\0"
VALUE "ProductVersion", "@VERSION@" "\0"
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_base16_stream.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Base16 stream functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_base16_stream.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Base16 stream functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_base32_stream.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Base32 stream functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_base32_stream.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Base32 stream functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_base64_stream.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Base64 stream functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_base64_stream.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Base64 stream functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_byte_stream.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Byte stream functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_byte_stream.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Byte stream functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_codepage_iso_8859_10.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* ISO 8859-10 codepage (Nordic) function
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_codepage_iso_8859_10.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* ISO 8859-10 codepage (Nordic) functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_codepage_iso_8859_13.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* ISO 8859-13 codepage (Baltic) function
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_codepage_iso_8859_13.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* ISO 8859-13 codepage (Baltic) functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_codepage_iso_8859_14.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* ISO 8859-14 codepage (Celtic) function
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_codepage_iso_8859_14.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* ISO 8859-14 codepage (Celtic) functions
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion libuna/libuna_codepage_iso_8859_15.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* ISO 8859-15 codepage (Latin 9) function
*
* Copyright (C) 2008-2023, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2008-2024, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
Loading

0 comments on commit 518c533

Please sign in to comment.