Skip to content

Commit 133ca42

Browse files
committed
Changes for deployment
1 parent a5e1ba9 commit 133ca42

15 files changed

+80
-76
lines changed

.github/workflows/build.yml

+28-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
compiler: 'gcc'
2222
configure_options: ''
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
- name: Install build dependencies
2626
run: |
2727
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config
@@ -36,6 +36,30 @@ jobs:
3636
- name: Run tests
3737
run: |
3838
tests/runtests.sh
39+
build_dist:
40+
runs-on: ubuntu-22.04
41+
strategy:
42+
matrix:
43+
include:
44+
- architecture: 'x64'
45+
compiler: 'gcc'
46+
configure_options: ''
47+
steps:
48+
- uses: actions/checkout@v4
49+
- name: Install build dependencies
50+
run: |
51+
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config
52+
- name: Download test data
53+
run: |
54+
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
55+
- name: Building from source
56+
env:
57+
CC: ${{ matrix.compiler }}
58+
run: |
59+
tests/build.sh ${{ matrix.configure_options }}
60+
- name: Run tests
61+
run: |
62+
make distcheck
3963
coverage_ubuntu:
4064
runs-on: ubuntu-22.04
4165
strategy:
@@ -48,7 +72,7 @@ jobs:
4872
compiler: 'gcc'
4973
configure_options: ''
5074
steps:
51-
- uses: actions/checkout@v3
75+
- uses: actions/checkout@v4
5276
- name: Install build dependencies
5377
run: |
5478
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config
@@ -69,6 +93,7 @@ jobs:
6993
(cd ${DIRECTORY} && find . -maxdepth 1 -name \*.gcno -type f -exec gcov -pb {} \;) \
7094
done
7195
- name: Upload coverage report to Codecov
72-
uses: codecov/codecov-action@v3
96+
uses: codecov/codecov-action@v4
7397
with:
7498
name: linux-${{ matrix.architecture }}-gcc-no-optimization
99+
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/build_freebsd.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build_freebsd:
77
runs-on: ubuntu-22.04
88
steps:
9-
- uses: actions/checkout@v3
9+
- uses: actions/checkout@v4
1010
- name: Building from source
1111
id: build_freebsd
1212
uses: vmactions/freebsd-vm@v1

.github/workflows/build_shared.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
compiler: 'gcc'
1515
configure_options: ''
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- name: Install build dependencies
1919
run: |
2020
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config

Makefile.am

+9-14
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,15 @@ EXTRA_DIST = \
3838
$(PKGCONFIG_FILES) \
3939
$(SPEC_FILES)
4040

41-
MAINTAINERCLEANFILES = \
42-
Makefile.in
41+
DISTCLEANFILES = \
42+
config.status \
43+
config.cache \
44+
config.log \
45+
libfdatetime.pc \
46+
libfdatetime.spec \
47+
Makefile \
48+
Makefile.in \
49+
po/Makevars
4350

4451
pkgconfigdir = $(libdir)/pkgconfig
4552

@@ -57,15 +64,3 @@ library:
5764
(cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS))
5865
(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
5966

60-
distclean: clean
61-
-rm -f Makefile
62-
-rm -f config.status
63-
-rm -f config.cache
64-
-rm -f config.log
65-
-rm -f libfdatetime.pc
66-
-rm -f libfdatetime.spec
67-
@for dir in ${subdirs}; do \
68-
(cd $$dir && $(MAKE) distclean) \
69-
|| case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
70-
done && test -z "$$fail"
71-

common/Makefile.am

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
AM_CPPFLAGS = -I$(top_srcdir)/include
1+
AM_CPPFLAGS = \
2+
-I../include -I$(top_srcdir)/include
23

34
EXTRA_DIST = \
45
byte_stream.h \
@@ -15,11 +16,9 @@ EXTRA_DIST = \
1516
types.h.in \
1617
wide_string.h
1718

18-
MAINTAINERCLEANFILES = \
19+
DISTCLEANFILES = \
20+
config.h \
21+
types.h \
22+
Makefile \
1923
Makefile.in
2024

21-
distclean: clean
22-
-rm -f config.h
23-
-rm -f types.h
24-
-rm -f Makefile
25-

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
22

33
AC_INIT(
44
[libfdatetime],
5-
[20240401],
5+
[20240415],
66
77

88
AC_CONFIG_SRCDIR(

include/Makefile.am

+6-8
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@ EXTRA_DIST = \
1414
libfdatetime/features.h.in \
1515
libfdatetime/types.h.in
1616

17-
MAINTAINERCLEANFILES = \
17+
DISTCLEANFILES = \
18+
libfdatetime.h \
19+
libfdatetime/definitions.h \
20+
libfdatetime/features.h \
21+
libfdatetime/types.h \
22+
Makefile \
1823
Makefile.in
1924

20-
distclean: clean
21-
-rm -f libfdatetime.h
22-
-rm -f libfdatetime/definitions.h
23-
-rm -f libfdatetime/features.h
24-
-rm -f libfdatetime/types.h
25-
-rm -f Makefile
26-

libfdatetime/Makefile.am

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AM_CPPFLAGS = \
2-
-I$(top_srcdir)/include \
3-
-I$(top_srcdir)/common \
2+
-I../include -I$(top_srcdir)/include \
3+
-I../common -I$(top_srcdir)/common \
44
@LIBCERROR_CPPFLAGS@ \
55
@LIBFDATETIME_DLL_EXPORT@
66

@@ -34,14 +34,12 @@ EXTRA_DIST = \
3434
libfdatetime.rc \
3535
libfdatetime.rc.in
3636

37-
MAINTAINERCLEANFILES = \
37+
DISTCLEANFILES = \
38+
libfdatetime_definitions.h \
39+
libfdatetime.rc \
40+
Makefile \
3841
Makefile.in
3942

40-
distclean: clean
41-
-rm -f libfdatetime_definitions.h
42-
-rm -f libfdatetime.rc
43-
-rm -f Makefile
44-
4543
sources-local: $(BUILT_SOURCES)
4644

4745
splint-local:

m4/libcerror.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl Checks for libcerror required headers and functions
22
dnl
3-
dnl Version: 20240314
3+
dnl Version: 20240413
44

55
dnl Function to detect if libcerror is available
66
dnl ac_libcerror_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
@@ -169,7 +169,7 @@ AC_DEFUN([AX_LIBCERROR_CHECK_LOCAL],
169169
])
170170
])
171171
172-
ac_cv_libcerror_CPPFLAGS="-I../libcerror";
172+
ac_cv_libcerror_CPPFLAGS="-I../libcerror -I\$(top_srcdir)/libcerror";
173173
ac_cv_libcerror_LIBADD="../libcerror/libcerror.la";
174174
175175
ac_cv_libcerror=local

manuals/Makefile.am

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ man_MANS = \
44
EXTRA_DIST = \
55
libfdatetime.3
66

7-
MAINTAINERCLEANFILES = \
7+
DISTCLEANFILES = \
8+
Makefile \
89
Makefile.in
910

10-
distclean: clean
11-
-rm -f Makefile
12-

msvscpp/Makefile.am

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ MSVSCPP_FILES = \
1616
EXTRA_DIST = \
1717
$(MSVSCPP_FILES)
1818

19-
MAINTAINERCLEANFILES = \
19+
DISTCLEANFILES = \
20+
Makefile \
2021
Makefile.in
2122

22-
distclean: clean
23-
-rm -f Makefile
24-

synclibs.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
# Script that synchronizes the local library dependencies
33
#
4-
# Version: 20231023
4+
# Version: 20240414
55

66
EXIT_SUCCESS=0;
77
EXIT_FAILURE=1;
@@ -95,10 +95,11 @@ endif
9595
d
9696
}
9797
98-
/distclean: clean/ {
98+
/DISTCLEANFILES = / {
9999
n
100-
N
101-
d
100+
/${LOCAL_LIB}_definitions.h/ {
101+
d
102+
}
102103
}";
103104
echo "${SED_SCRIPT}" >> ${LOCAL_LIB}-$$.sed;
104105
sed -i'~' -f ${LOCAL_LIB}-$$.sed ${LOCAL_LIB_MAKEFILE_AM};
@@ -140,7 +141,7 @@ SED_SCRIPT="/^$/ {
140141
then
141142
if ! test -f "m4/libuna.m4";
142143
then
143-
sed -i'~' 's?@LIBUNA_CPPFLAGS@?-I$(top_srcdir)/libuna?' ${LOCAL_LIB_MAKEFILE_AM};
144+
sed -i'~' 's?@LIBUNA_CPPFLAGS@?-I../libuna -I$(top_srcdir)/libuna?' ${LOCAL_LIB_MAKEFILE_AM};
144145
fi
145146
fi
146147

tests/Makefile.am

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AM_CPPFLAGS = \
2-
-I$(top_srcdir)/include \
3-
-I$(top_srcdir)/common \
2+
-I../include -I$(top_srcdir)/include \
3+
-I../common -I$(top_srcdir)/common \
44
@LIBCERROR_CPPFLAGS@ \
55
@LIBFDATETIME_DLL_IMPORT@
66

@@ -141,9 +141,7 @@ fdatetime_test_systemtime_LDADD = \
141141
../libfdatetime/libfdatetime.la \
142142
@LIBCERROR_LIBADD@
143143

144-
MAINTAINERCLEANFILES = \
144+
DISTCLEANFILES = \
145+
Makefile \
145146
Makefile.in
146147

147-
distclean: clean
148-
-rm -f Makefile
149-

tests/test_library.sh

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
# Tests library functions and types.
33
#
4-
# Version: 20231007
4+
# Version: 20240413
55

66
EXIT_SUCCESS=0;
77
EXIT_FAILURE=1;
@@ -141,12 +141,9 @@ then
141141
exit ${EXIT_IGNORE};
142142
fi
143143

144-
TEST_RUNNER="tests/test_runner.sh";
144+
TEST_DIRECTORY=`dirname $0`;
145145

146-
if ! test -f "${TEST_RUNNER}";
147-
then
148-
TEST_RUNNER="./test_runner.sh";
149-
fi
146+
TEST_RUNNER="${TEST_DIRECTORY}/test_runner.sh";
150147

151148
if ! test -f "${TEST_RUNNER}";
152149
then

tests/test_manpage.sh

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
# Tests man pages.
33
#
4-
# Version: 20230410
4+
# Version: 20240413
55

66
EXIT_SUCCESS=0;
77
EXIT_FAILURE=1;
@@ -45,12 +45,9 @@ then
4545
exit ${EXIT_IGNORE};
4646
fi
4747

48-
TEST_RUNNER="tests/test_runner.sh";
48+
TEST_DIRECTORY=`dirname $0`;
4949

50-
if ! test -f "${TEST_RUNNER}";
51-
then
52-
TEST_RUNNER="./test_runner.sh";
53-
fi
50+
TEST_RUNNER="${TEST_DIRECTORY}/test_runner.sh";
5451

5552
if ! test -f "${TEST_RUNNER}";
5653
then

0 commit comments

Comments
 (0)