Skip to content

Commit f258de1

Browse files
committed
Applied updates
1 parent 5b07d07 commit f258de1

File tree

93 files changed

+103
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+103
-103
lines changed

.github/workflows/build_macos.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ name: build_macos
33
on: [push, pull_request]
44
permissions: read-all
55
jobs:
6-
build_ubuntu:
6+
build_macos:
77
runs-on: ${{ matrix.os }}
88
strategy:
99
matrix:
1010
include:
11-
- os: macos-12
12-
configure_options: ''
13-
- os: macos-13
14-
configure_options: ''
1511
- os: macos-14
1612
configure_options: ''
1713
- os: macos-15
1814
configure_options: ''
15+
- os: macos-15-intel
16+
configure_options: ''
17+
- os: macos-26
18+
configure_options: ''
1919
steps:
2020
- uses: actions/checkout@v4
2121
- name: Install build dependencies

AUTHORS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Acknowledgements: libbfio
22

3-
Copyright (C) 2009-2024, Joachim Metz <[email protected]>
3+
Copyright (C) 2009-2025, Joachim Metz <[email protected]>
44

55
Additional credits go to:
66
- Xavier Roche, for providing the memory range patches

appveyor.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,23 @@ environment:
7272
PYTHON_PATH: "C:\\Python311"
7373
- TARGET: macos-x64-clang
7474
BUILD_ENVIRONMENT: xcode
75-
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
75+
APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma
7676
HOMEBREW_NO_INSTALL_CLEANUP: 1
7777
CC: clang
7878
CFLAGS: "-I/usr/local/include"
7979
LDFLAGS: "-L/usr/local/lib"
8080
CONFIGURE_OPTIONS: ""
8181
- TARGET: macos-x64-gcc
8282
BUILD_ENVIRONMENT: xcode
83-
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
83+
APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma
8484
HOMEBREW_NO_INSTALL_CLEANUP: 1
8585
CC: gcc
8686
CFLAGS: "-I/usr/local/include"
8787
LDFLAGS: "-L/usr/local/lib"
8888
CONFIGURE_OPTIONS: ""
8989
- TARGET: macos-pkgbuild
9090
BUILD_ENVIRONMENT: xcode
91-
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
91+
APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma
9292
HOMEBREW_NO_INSTALL_CLEANUP: 1
9393
CONFIGURE_OPTIONS: "--disable-dependency-tracking --prefix=/usr/local --with-pyprefix"
9494
- TARGET: cygwin64-gcc
@@ -117,14 +117,14 @@ environment:
117117
install:
118118
- cmd: if [%BUILD_ENVIRONMENT%]==[msbuild] (
119119
git clone https://github.com/libyal/vstools.git ..\vstools )
120-
- sh: if ( test `uname -s` = "Darwin" && test ${BUILD_ENVIRONMENT} = "python-tox" ) || test ${BUILD_ENVIRONMENT} = "xcode"; then brew update-reset && brew update -q; fi
120+
- sh: if ( test `uname -s` = "Darwin" && test ${BUILD_ENVIRONMENT} = "python-tox" ) || test ${BUILD_ENVIRONMENT} = "xcode"; then brew untap homebrew/homebrew-cask-versions && brew update -q; fi
121121
- 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
122122
- ps: If ($env:BUILD_ENVIRONMENT -eq "cygwin64") {
123123
(New-Object Net.WebClient).DownloadFile("https://cygwin.com/setup-x86_64.exe", "C:\\cygwin64\\setup-x86_64.exe") }
124124
- cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
125125
C:\cygwin64\setup-x86_64.exe -qgnNdO -l C:\cygwin64\var\cache\setup -R c:\cygwin64 -s http://cygwin.mirror.constant.com -P gettext-devel -P wget )
126126
- cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] (
127-
C:\msys64\usr\bin\pacman -S --noconfirm --needed autoconf automake gettext-devel libtool make mingw-w64-x86_64-gcc )
127+
C:\msys64\usr\bin\pacman -S --noconfirm --needed autoconf automake gettext-devel libtool make mingw-w64-x86_64-gcc pkg-config )
128128
- ps: If ( ( "cygwin64-gcc-no-optimization", "mingw-w64-gcc-no-optimization" ).Contains( $env:TARGET ) ) {
129129
$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest -Uri https://uploader.codecov.io/latest/windows/codecov.exe -Outfile ..\codecov.exe }
130130

build.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Script that builds libbfio
22
#
3-
# Version: 20230411
3+
# Version: 20251125
44

55
Param (
66
[string]$Configuration = ${Env:Configuration},
@@ -20,7 +20,7 @@ $Python = "${PythonPath}\python.exe"
2020
$Git = "git"
2121
$GitUrl = "https://github.com/libyal/vstools.git"
2222

23-
$MSVSCppConvert = "${VSToolsPath}\scripts\msvscpp-convert.py"
23+
$MSVSCppConvert = "${VSToolsPath}\vstools\scripts\msvscpp_convert.py"
2424

2525
If (-Not (Test-Path $Python))
2626
{
@@ -50,7 +50,7 @@ Else
5050
}
5151
If (-Not (Test-Path ${MSVSCppConvert}))
5252
{
53-
Write-Host "Missing msvscpp-convert.py: ${MSVSCppConvert}" -foreground Red
53+
Write-Host "Missing msvscpp_convert.py: ${MSVSCppConvert}" -foreground Red
5454

5555
Exit ${ExitFailure}
5656
}

common/byte_stream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Byte stream functions
33
*
4-
* Copyright (C) 2009-2024, Joachim Metz <[email protected]>
4+
* Copyright (C) 2009-2025, Joachim Metz <[email protected]>
55
*
66
* Refer to AUTHORS for acknowledgements.
77
*

common/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Common include file
33
*
4-
* Copyright (C) 2009-2024, Joachim Metz <[email protected]>
4+
* Copyright (C) 2009-2025, Joachim Metz <[email protected]>
55
*
66
* Refer to AUTHORS for acknowledgements.
77
*

common/config_borlandc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Configuration for the Borland/CodeGear C++ Builder compiler
33
*
4-
* Copyright (C) 2009-2024, Joachim Metz <[email protected]>
4+
* Copyright (C) 2009-2025, Joachim Metz <[email protected]>
55
*
66
* Refer to AUTHORS for acknowledgements.
77
*

common/config_msc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Configuration for the Microsoft Visual Studio C++ compiler
33
*
4-
* Copyright (C) 2009-2024, Joachim Metz <[email protected]>
4+
* Copyright (C) 2009-2025, Joachim Metz <[email protected]>
55
*
66
* Refer to AUTHORS for acknowledgements.
77
*

common/config_winapi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Configuration file for WINAPI
33
*
4-
* Copyright (C) 2009-2024, Joachim Metz <[email protected]>
4+
* Copyright (C) 2009-2025, Joachim Metz <[email protected]>
55
*
66
* Refer to AUTHORS for acknowledgements.
77
*

common/file_stream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* FILE stream functions
33
*
4-
* Copyright (C) 2009-2024, Joachim Metz <[email protected]>
4+
* Copyright (C) 2009-2025, Joachim Metz <[email protected]>
55
*
66
* Refer to AUTHORS for acknowledgements.
77
*

0 commit comments

Comments
 (0)