Skip to content

Commit f366768

Browse files
joachimmetzjoachimmetz
committed
Changes for CI tests
1 parent bbcaaf5 commit f366768

File tree

21 files changed

+110
-99
lines changed

21 files changed

+110
-99
lines changed

‎.github/workflows/build_wheel.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
3737
- name: Prepare build
3838
run: |
39-
./synclibs.sh --use-head && ./autogen.sh && ./configure
39+
./synclibs.sh --use-head && ./autogen.sh && ./configure && make sources >/dev/null
4040
- name: Build Python wheel
4141
run: |
4242
tox -e${{ matrix.toxenv }}

‎Makefile.am‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -97,35 +97,14 @@ library:
9797
(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
9898

9999
distclean: clean
100-
/bin/rm -f Makefile
101-
/bin/rm -f config.status
102-
/bin/rm -f config.cache
103-
/bin/rm -f config.log
104-
/bin/rm -f libqcow.pc
105-
/bin/rm -f libqcow.spec
100+
-rm -f Makefile
101+
-rm -f config.status
102+
-rm -f config.cache
103+
-rm -f config.log
104+
-rm -f libqcow.pc
105+
-rm -f libqcow.spec
106106
@for dir in ${subdirs}; do \
107107
(cd $$dir && $(MAKE) distclean) \
108108
|| case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
109109
done && test -z "$$fail"
110110

111-
splint:
112-
(cd $(srcdir)/libcerror && $(MAKE) splint $(AM_MAKEFLAGS))
113-
(cd $(srcdir)/libcthreads && $(MAKE) splint $(AM_MAKEFLAGS))
114-
(cd $(srcdir)/libcdata && $(MAKE) splint $(AM_MAKEFLAGS))
115-
(cd $(srcdir)/libclocale && $(MAKE) splint $(AM_MAKEFLAGS))
116-
(cd $(srcdir)/libcnotify && $(MAKE) splint $(AM_MAKEFLAGS))
117-
(cd $(srcdir)/libcsplit && $(MAKE) splint $(AM_MAKEFLAGS))
118-
(cd $(srcdir)/libuna && $(MAKE) splint $(AM_MAKEFLAGS))
119-
(cd $(srcdir)/libcfile && $(MAKE) splint $(AM_MAKEFLAGS))
120-
(cd $(srcdir)/libcpath && $(MAKE) splint $(AM_MAKEFLAGS))
121-
(cd $(srcdir)/libbfio && $(MAKE) splint $(AM_MAKEFLAGS))
122-
(cd $(srcdir)/libfcache && $(MAKE) splint $(AM_MAKEFLAGS))
123-
(cd $(srcdir)/libfdata && $(MAKE) splint $(AM_MAKEFLAGS))
124-
(cd $(srcdir)/libcaes && $(MAKE) splint $(AM_MAKEFLAGS))
125-
(cd $(srcdir)/libqcow && $(MAKE) splint $(AM_MAKEFLAGS))
126-
(cd $(srcdir)/qcowtools && $(MAKE) splint $(AM_MAKEFLAGS))
127-
(cd $(srcdir)/pyqcow && $(MAKE) splint $(AM_MAKEFLAGS))
128-
(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
129-
(cd $(srcdir)/tests && $(MAKE) $(AM_MAKEFLAGS))
130-
(cd $(srcdir)/ossfuzz && $(MAKE) $(AM_MAKEFLAGS))
131-

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ build_script:
286286
- sh: if test ${BUILD_ENVIRONMENT} = "xcode"; then export PATH="/usr/local/opt/gettext/bin:$PATH"; export SED="/usr/local/bin/gsed"; tests/build.sh ${CONFIGURE_OPTIONS}; fi
287287
- cmd: if [%BUILD_ENVIRONMENT%]==[python] (
288288
"%PYTHON%" setup.py bdist_wheel )
289-
- sh: if test ${BUILD_ENVIRONMENT} = "python-tox"; then export PATH="/usr/local/opt/gettext/bin:$PATH"; export SED="/usr/local/bin/gsed"; ./synclibs.sh && ./autogen.sh && ./configure --disable-nls --disable-shared-libs && make >/dev/null && tox -e${TOXENV}; fi
289+
- sh: if test ${BUILD_ENVIRONMENT} = "python-tox"; then export PATH="/usr/local/opt/gettext/bin:$PATH"; export SED="/usr/local/bin/gsed"; ./synclibs.sh && ./autogen.sh && ./configure --disable-nls --disable-shared-libs && make sources >/dev/null && tox -e${TOXENV}; fi
290290
- cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
291291
xcopy /i /q /s C:\projects\libqcow C:\cygwin64\home\appveyor\libqcow &&
292292
C:\cygwin64\bin\bash -e -l -c "cd libqcow && wget -q 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' -O './config.guess' && wget -q 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD' -O './config.sub'" &&

‎common/Makefile.am‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ MAINTAINERCLEANFILES = \
1919
Makefile.in
2020

2121
distclean: clean
22-
/bin/rm -f config.h
23-
/bin/rm -f types.h
24-
/bin/rm -f Makefile
22+
-rm -f config.h
23+
-rm -f types.h
24+
-rm -f Makefile
2525

‎configure.ac‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ AC_PREREQ([2.71])
22

33
AC_INIT(
44
[libqcow],
5-
[20231020],
5+
[20231023],
66
[[email protected]])
77

88
AC_CONFIG_SRCDIR(
99
[include/libqcow.h.in])
1010

1111
AM_INIT_AUTOMAKE([gnu 1.6 tar-ustar])
12+
AM_EXTRA_RECURSIVE_TARGETS([sources splint])
1213

1314
AC_CONFIG_MACRO_DIR([m4])
1415

‎include/Makefile.am‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ MAINTAINERCLEANFILES = \
1919
Makefile.in
2020

2121
distclean: clean
22-
/bin/rm -f libqcow.h
23-
/bin/rm -f libqcow/definitions.h
24-
/bin/rm -f libqcow/features.h
25-
/bin/rm -f libqcow/types.h
26-
/bin/rm -f Makefile
22+
-rm -f libqcow.h
23+
-rm -f libqcow/definitions.h
24+
-rm -f libqcow/features.h
25+
-rm -f libqcow/types.h
26+
-rm -f Makefile
2727

‎libqcow.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package >
33
<metadata>
44
<id>libqcow</id>
5-
<version>20231020</version>
5+
<version>20231023</version>
66
<authors>Joachim Metz</authors>
77
<owners>joachimmetz</owners>
88
<license type="expression">LGPL-3.0-or-later</license>
99
<projectUrl>https://github.com/libyal/libqcow</projectUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<title>libqcow</title>
1212
<description>Library to access the QEMU Copy-On-Write (QCOW) image file format</description>
13-
<releaseNotes>Release of libqcow 20231020</releaseNotes>
13+
<releaseNotes>Release of libqcow 20231023</releaseNotes>
1414
<copyright>Copyright (C) 2010-2023</copyright>
1515
<tags>native</tags>
1616
</metadata>

‎libqcow/Makefile.am‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,13 @@ MAINTAINERCLEANFILES = \
8585
Makefile.in
8686

8787
distclean: clean
88-
/bin/rm -f libqcow_definitions.h
89-
/bin/rm -f libqcow.rc
90-
/bin/rm -f Makefile
88+
-rm -f libqcow_definitions.h
89+
-rm -f libqcow.rc
90+
-rm -f Makefile
9191

92-
splint:
92+
sources-local: $(BUILT_SOURCES)
93+
94+
splint-local:
9395
@echo "Running splint on libqcow ..."
9496
-splint -preproc -redef $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(libqcow_la_SOURCES)
9597

‎manuals/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ MAINTAINERCLEANFILES = \
1010
Makefile.in
1111

1212
distclean: clean
13-
/bin/rm -f Makefile
13+
-rm -f Makefile
1414

‎msvscpp/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ MAINTAINERCLEANFILES = \
4040
Makefile.in
4141

4242
distclean: clean
43-
/bin/rm -f Makefile
43+
-rm -f Makefile
4444

0 commit comments

Comments
 (0)