Changes for CI tests

libyal · Oct 25, 2023 · f366768 · f366768
1 parent bbcaaf5
commit f366768
Show file tree

Hide file tree

Showing 21 changed files with 110 additions and 99 deletions.
diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
@@ -36,7 +36,7 @@ jobs:
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
     - name: Prepare build
       run: |
-        ./synclibs.sh --use-head && ./autogen.sh && ./configure
+        ./synclibs.sh --use-head && ./autogen.sh && ./configure && make sources >/dev/null
     - name: Build Python wheel
       run: |
         tox -e${{ matrix.toxenv }}
diff --git a/Makefile.am b/Makefile.am
@@ -97,35 +97,14 @@ library:
 	(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
 
 distclean: clean
-	/bin/rm -f Makefile
-	/bin/rm -f config.status
-	/bin/rm -f config.cache
-	/bin/rm -f config.log
-	/bin/rm -f libqcow.pc
-	/bin/rm -f libqcow.spec
+	-rm -f Makefile
+	-rm -f config.status
+	-rm -f config.cache
+	-rm -f config.log
+	-rm -f libqcow.pc
+	-rm -f libqcow.spec
 	@for dir in ${subdirs}; do \
 		(cd $$dir && $(MAKE) distclean) \
 		|| case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 
-splint:
-	(cd $(srcdir)/libcerror && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libcthreads && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libcdata && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libclocale && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libcnotify && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libcsplit && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libuna && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libcfile && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libcpath && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libbfio && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libfcache && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libfdata && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libcaes && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libqcow && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/qcowtools && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/pyqcow && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
-	(cd $(srcdir)/tests && $(MAKE) $(AM_MAKEFLAGS))
-	(cd $(srcdir)/ossfuzz && $(MAKE) $(AM_MAKEFLAGS))
-
diff --git a/appveyor.yml b/appveyor.yml
@@ -286,7 +286,7 @@ build_script:
 - 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
 - cmd: if [%BUILD_ENVIRONMENT%]==[python] (
     "%PYTHON%" setup.py bdist_wheel )
-- 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
+- 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
 - cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
     xcopy /i /q /s C:\projects\libqcow C:\cygwin64\home\appveyor\libqcow &&
     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'" &&

diff --git a/common/Makefile.am b/common/Makefile.am
@@ -19,7 +19,7 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f config.h
-	/bin/rm -f types.h
-	/bin/rm -f Makefile
+	-rm -f config.h
+	-rm -f types.h
+	-rm -f Makefile
 
diff --git a/configure.ac b/configure.ac
@@ -2,13 +2,14 @@ AC_PREREQ([2.71])
 
 AC_INIT(
  [libqcow],
- [20231020],
+ [20231023],
  [[email protected]])
 
 AC_CONFIG_SRCDIR(
  [include/libqcow.h.in])
 
 AM_INIT_AUTOMAKE([gnu 1.6 tar-ustar])
+AM_EXTRA_RECURSIVE_TARGETS([sources splint])
 
 AC_CONFIG_MACRO_DIR([m4])
 

diff --git a/include/Makefile.am b/include/Makefile.am
@@ -19,9 +19,9 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f libqcow.h
-	/bin/rm -f libqcow/definitions.h
-	/bin/rm -f libqcow/features.h
-	/bin/rm -f libqcow/types.h
-	/bin/rm -f Makefile
+	-rm -f libqcow.h
+	-rm -f libqcow/definitions.h
+	-rm -f libqcow/features.h
+	-rm -f libqcow/types.h
+	-rm -f Makefile
 
diff --git a/libqcow.nuspec b/libqcow.nuspec
@@ -2,15 +2,15 @@
 <package >
   <metadata>
     <id>libqcow</id>
-    <version>20231020</version>
+    <version>20231023</version>
     <authors>Joachim Metz</authors>
     <owners>joachimmetz</owners>
     <license type="expression">LGPL-3.0-or-later</license>
     <projectUrl>https://github.com/libyal/libqcow</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <title>libqcow</title>
     <description>Library to access the QEMU Copy-On-Write (QCOW) image file format</description>
-    <releaseNotes>Release of libqcow 20231020</releaseNotes>
+    <releaseNotes>Release of libqcow 20231023</releaseNotes>
     <copyright>Copyright (C) 2010-2023</copyright>
     <tags>native</tags>
   </metadata>

diff --git a/libqcow/Makefile.am b/libqcow/Makefile.am
@@ -85,11 +85,13 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f libqcow_definitions.h
-	/bin/rm -f libqcow.rc
-	/bin/rm -f Makefile
+	-rm -f libqcow_definitions.h
+	-rm -f libqcow.rc
+	-rm -f Makefile
 
-splint:
+sources-local: $(BUILT_SOURCES)
+
+splint-local:
 	@echo "Running splint on libqcow ..."
 	-splint -preproc -redef $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(libqcow_la_SOURCES)
 
diff --git a/manuals/Makefile.am b/manuals/Makefile.am
@@ -10,5 +10,5 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile
 
diff --git a/msvscpp/Makefile.am b/msvscpp/Makefile.am
@@ -40,5 +40,5 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile
 
diff --git a/ossfuzz/Makefile.am b/ossfuzz/Makefile.am
@@ -37,9 +37,9 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile
 
-splint:
+splint-local:
 	@echo "Running splint on file_fuzzer ..."
 	-splint -preproc -redef $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(file_fuzzer_SOURCES)
 
diff --git a/po/Makevars.in b/po/Makevars.in
@@ -40,3 +40,6 @@ MSGID_BUGS_ADDRESS = @PACKAGE_BUGREPORT@
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
+# Additional make targets.
+sources splint:
+
diff --git a/pyqcow-python2/Makefile.am b/pyqcow-python2/Makefile.am
@@ -61,8 +61,8 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 clean-local:
-	/bin/rm -f pyqcow*.[ch]
+	-rm -f pyqcow*.[ch]
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile
 
diff --git a/pyqcow-python3/Makefile.am b/pyqcow-python3/Makefile.am
@@ -61,8 +61,8 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 clean-local:
-	/bin/rm -f pyqcow*.[ch]
+	-rm -f pyqcow*.[ch]
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile
 
diff --git a/pyqcow/Makefile.am b/pyqcow/Makefile.am
@@ -48,5 +48,5 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile
 
diff --git a/qcowtools/Makefile.am b/qcowtools/Makefile.am
@@ -82,9 +82,9 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile
 
-splint:
+splint-local:
 	@echo "Running splint on qcowinfo ..."
 	-splint -preproc -redef $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(qcowinfo_SOURCES)
 	@echo "Running splint on qcowmount ..."

diff --git a/synclibs.sh b/synclibs.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Script that synchronizes the local library dependencies
 #
-# Version: 20230510
+# Version: 20231023
 
 EXIT_SUCCESS=0;
 EXIT_FAILURE=1;
@@ -111,12 +111,12 @@ endif
 	if test ${LOCAL_LIB} = "libfplist";
 	then
 		# TODO: make this more generic to strip the last \\
-		sed -i'~' 's/libfplist_xml_scanner.c \\/libfplist_xml_scanner.c/' ${LOCAL_LIB_MAKEFILE_AM};
+		sed -i'~' '/EXTRA_DIST = /,/^$/s/libfplist_xml_scanner.c \\/libfplist_xml_scanner.c/' ${LOCAL_LIB_MAKEFILE_AM};
 
 	elif test ${LOCAL_LIB} = "libodraw";
 	then
 		# TODO: make this more generic to strip the last \\
-		sed -i'~' 's/libodraw_cue_scanner.c \\/libodraw_cue_scanner.c/' ${LOCAL_LIB_MAKEFILE_AM};
+		sed -i'~' '/EXTRA_DIST = /,/^$/s/libodraw_cue_scanner.c \\/libodraw_cue_scanner.c/' ${LOCAL_LIB_MAKEFILE_AM};
 
 	else
 		sed -i'~' '/EXTRA_DIST = /,/^$/d' ${LOCAL_LIB_MAKEFILE_AM};

diff --git a/synczlib.ps1 b/synczlib.ps1
@@ -1,6 +1,6 @@
 # Script that synchronizes zlib.
 #
-# Version: 20221022
+# Version: 20230926
 
 Function ExtractZip($Filename)
 {
@@ -27,9 +27,9 @@ Function ExtractZip($Filename)
 	}
 }
 
-$Filename = "${pwd}\zlib1213.zip"
-$Url = "http://zlib.net/zlib1213.zip"
-$ExtractedPath = "zlib-1.2.13"
+$Filename = "${pwd}\zlib13.zip"
+$Url = "http://zlib.net/zlib13.zip"
+$ExtractedPath = "zlib-1.3"
 $DestinationPath = "..\zlib"
 
 If (Test-Path ${Filename})

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -271,5 +271,5 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile