Skip to content

Commit

Permalink
Applied updates
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Mar 14, 2024
1 parent 62e1729 commit c291d7e
Show file tree
Hide file tree
Showing 127 changed files with 400 additions and 347 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Acknowledgements: libbfoverlay

Copyright (C) 2020-2023, Joachim Metz <[email protected]>
Copyright (C) 2020-2024, Joachim Metz <[email protected]>

6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ install:
.\builddokan.ps1 -Configuration ${Configuration} -Platform "Win32";
.\builddokan.ps1 -Configuration ${Configuration} -Platform "x64"; }
}
- 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 macfuse 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 macfuse 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 @@ -181,7 +181,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
66 changes: 37 additions & 29 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: 20240306

$WinFlex = "..\win_flex_bison\win_flex.exe"
$WinBison = "..\win_flex_bison\win_bison.exe"
Expand All @@ -9,48 +9,56 @@ $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 = ""

ForEach (${DirectoryElement} in Get-ChildItem -Path "${Library}\*.l")
ForEach (${Library} in Get-ChildItem -Directory -Path "lib*")
{
$OutputFile = ${DirectoryElement} -Replace ".l$",".c"
ForEach (${DirectoryElement} in Get-ChildItem -Path "${Library}\*.l")
{
$OutputFile = ${DirectoryElement} -Replace ".l$",".c"

$NamePrefix = Split-Path -path ${DirectoryElement} -leaf
$NamePrefix = ${NamePrefix} -Replace ".l$","_"
$NamePrefix = Split-Path -path ${DirectoryElement} -leaf
$NamePrefix = ${NamePrefix} -Replace ".l$","_"

Write-Host "Running: ${WinFlex} -Cf ${DirectoryElement}"
Write-Host "Running: ${WinFlex} -Cf ${DirectoryElement}"

# PowerShell will raise NativeCommandError if win_flex writes to stdout or stderr
# therefore 2>&1 is added and the output is stored in a variable.
$Output = Invoke-Expression -Command "& '${WinFlex}' -Cf ${DirectoryElement} 2>&1"
Write-Host ${Output}
# PowerShell will raise NativeCommandError if win_flex writes to stdout or stderr
# therefore 2>&1 is added and the output is stored in a variable.
$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.
Move-Item "lex.yy.c" ${OutputFile} -force
}
# Moving manually since `win_flex -o filename' does not provide the expected behavior.
Move-Item "lex.yy.c" ${OutputFile} -force
}

ForEach (${DirectoryElement} in Get-ChildItem -Path "${Library}\*.y")
{
$OutputFile = ${DirectoryElement} -Replace ".y$",".c"
ForEach (${DirectoryElement} in Get-ChildItem -Path "${Library}\*.y")
{
$OutputFile = ${DirectoryElement} -Replace ".y$",".c"

Write-Host "Running: ${WinBison} -d -v -l -p ${NamePrefix} -o ${OutputFile} ${DirectoryElement}"
Write-Host "Running: ${WinBison} -d -v -l -p ${NamePrefix} -o ${OutputFile} ${DirectoryElement}"

# PowerShell will raise NativeCommandError if win_bison writes to stdout or stderr
# therefore 2>&1 is added and the output is stored in a variable.
$Output = Invoke-Expression -Command "& '${WinBison}' -d -v -l -p ${NamePrefix} -o ${OutputFile} ${DirectoryElement} 2>&1"
Write-Host ${Output}
# PowerShell will raise NativeCommandError if win_bison writes to stdout or stderr
# therefore 2>&1 is added and the output is stored in a variable.
$Output = Invoke-Expression -Command "& '${WinBison}' -d -v -l -p ${NamePrefix} -o ${OutputFile} ${DirectoryElement} 2>&1"
Write-Host ${Output}
}
}

2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaymount.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Mounts basic file overlays.
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_getopt.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* GetOpt functions
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_getopt.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* GetOpt functions
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_i18n.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Internationalization (i18n) functions
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_libbfio.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The libbfio header wrapper
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_libbfoverlay.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The libbfoverlay header wrapper
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_libcdata.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The libcdata header wrapper
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_libcerror.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The libcerror header wrapper
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_libclocale.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The libclocale header wrapper
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_libcnotify.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The libcnotify header wrapper
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_libcpath.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The libcpath header wrapper
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_libuna.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The libuna header wrapper
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
4 changes: 2 additions & 2 deletions bfoverlaytools/bfoverlaytools_output.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Common output functions for the bfoverlaytools
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down Expand Up @@ -104,7 +104,7 @@ void bfoverlaytools_output_copyright_fprint(
*/
fprintf(
stream,
_( "Copyright (C) 2020-2023, %s.\n" ),
_( "Copyright (C) 2020-2024, %s.\n" ),
_( "Joachim Metz" ) );

fprintf(
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_output.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Common output functions for the bfoverlaytools
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_signal.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Signal handling functions
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_signal.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Signal handling functions
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/bfoverlaytools_unused.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Definitions to silence compiler warnings about unused function attributes/parameters.
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/mount_dokan.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Mount tool dokan functions
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/mount_dokan.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Mount tool dokan functions
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/mount_file_entry.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Mount file entry
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/mount_file_entry.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Mount file entry
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/mount_file_system.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Mount file system
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/mount_file_system.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Mount file system
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/mount_fuse.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Mount tool fuse functions
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/mount_fuse.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Mount tool fuse functions
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/mount_handle.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Mount handle
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion bfoverlaytools/mount_handle.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Mount handle
*
* Copyright (C) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
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) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* 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) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* 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) 2020-2023, Joachim Metz <[email protected]>
* Copyright (C) 2020-2024, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
Loading

0 comments on commit c291d7e

Please sign in to comment.