Skip to content

Commit

Permalink
Changes for string conversion of negative POSIX timestamps
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Dec 14, 2024
1 parent 47838ce commit d46bf4f
Show file tree
Hide file tree
Showing 9 changed files with 194 additions and 80 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/build_macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Build from source.
name: build_macos
on: [push, pull_request]
permissions: read-all
jobs:
build_ubuntu:
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- os: macos-12
configure_options: ''
- os: macos-13
configure_options: ''
- os: macos-14
configure_options: ''
- os: macos-15
configure_options: ''
steps:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
brew update -q
brew install -q autoconf automake gettext gnu-sed libtool pkg-config || true
brew link --force gettext
ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
- name: Download test data
run: |
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
- name: Building from source
env:
CC: ${{ matrix.compiler }}
run: |
tests/build.sh ${{ matrix.configure_options }}
- name: Run tests
run: |
tests/runtests.sh
2 changes: 1 addition & 1 deletion acinclude.m4
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dnl Checks for required headers and functions
dnl
dnl Version: 20240413
dnl Version: 20240518

dnl Function to detect if libfdatetime dependencies are available
AC_DEFUN([AX_LIBFDATETIME_CHECK_LOCAL],
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,23 +72,23 @@ environment:
PYTHON_PATH: "C:\\Python311"
- TARGET: macos-x64-clang
BUILD_ENVIRONMENT: xcode
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma
HOMEBREW_NO_INSTALL_CLEANUP: 1
CC: clang
CFLAGS: "-I/usr/local/include"
LDFLAGS: "-L/usr/local/lib"
CONFIGURE_OPTIONS: ""
- TARGET: macos-x64-gcc
BUILD_ENVIRONMENT: xcode
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma
HOMEBREW_NO_INSTALL_CLEANUP: 1
CC: gcc
CFLAGS: "-I/usr/local/include"
LDFLAGS: "-L/usr/local/lib"
CONFIGURE_OPTIONS: ""
- TARGET: macos-pkgbuild
BUILD_ENVIRONMENT: xcode
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma
HOMEBREW_NO_INSTALL_CLEANUP: 1
CONFIGURE_OPTIONS: "--disable-dependency-tracking --prefix=/usr/local --with-pyprefix"
- TARGET: cygwin64-gcc
Expand Down
6 changes: 3 additions & 3 deletions autogen.ps1
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
29 changes: 15 additions & 14 deletions autogen.sh
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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";
Expand Down
26 changes: 13 additions & 13 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
AC_PREREQ([2.71])

AC_INIT(
[libfdatetime],
[20240518],
[[email protected]])
[libfdatetime],
[20241214],
[[email protected]])

AC_CONFIG_SRCDIR(
[include/libfdatetime.h.in])
[include/libfdatetime.h.in])

AM_INIT_AUTOMAKE([gnu 1.6 tar-ustar])
AM_EXTRA_RECURSIVE_TARGETS([sources splint])
Expand Down Expand Up @@ -71,21 +71,21 @@ CFLAGS="$CFLAGS -Wall";

dnl Check if requires and build requires should be set in spec file
AS_IF(
[test "x$ac_cv_libcerror" = xyes],
[AC_SUBST(
[libfdatetime_spec_requires],
[Requires:])
])
[test "x$ac_cv_libcerror" = xyes],
[AC_SUBST(
[libfdatetime_spec_requires],
[Requires:])
])

dnl Set the date for the dpkg files
AC_SUBST(
[DPKG_DATE],
[`date -R 2> /dev/null`])
[DPKG_DATE],
[`date -R 2> /dev/null`])

dnl Set the date for the spec file
AC_SUBST(
[SPEC_DATE],
[`date +"%a %b %e %Y" 2> /dev/null`])
[SPEC_DATE],
[`date +"%a %b %e %Y" 2> /dev/null`])

dnl Generate Makefiles
AC_CONFIG_FILES([Makefile])
Expand Down
Loading

0 comments on commit d46bf4f

Please sign in to comment.