Applied updates

libyal · Nov 6, 2023 · f77e61d · f77e61d
1 parent da88158
commit f77e61d
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 51 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
@@ -76,28 +76,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 libfwnt.pc
-	/bin/rm -f libfwnt.spec
+	-rm -f Makefile
+	-rm -f config.status
+	-rm -f config.cache
+	-rm -f config.log
+	-rm -f libfwnt.pc
+	-rm -f libfwnt.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)/libcnotify && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libfwnt && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/pyfwnt && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/po && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libclocale && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libuna && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/libcfile && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/tests && $(MAKE) splint $(AM_MAKEFLAGS))
-	(cd $(srcdir)/ossfuzz && $(MAKE) splint $(AM_MAKEFLAGS))
-
diff --git a/appveyor.yml b/appveyor.yml
@@ -189,7 +189,7 @@ install:
 - cmd: if [%BUILD_ENVIRONMENT%]==[msbuild] (
     git clone https://github.com/libyal/vstools.git ..\vstools )
 - sh: if test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode"; then brew update-reset && brew update -q; fi
-- sh: if test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode"; then brew install -q gettext gnu-sed || true; fi
+- sh: if test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode"; then brew install -q autoconf automake gettext gnu-sed libtool pkg-config || true; fi
 - sh: if test ${BUILD_ENVIRONMENT} = "python-tox"; then brew install -q python@${PYTHON_VERSION} tox twine-pypi || true; fi
 - cmd: if [%BUILD_ENVIRONMENT%]==[python] (
     "%PYTHON%" -m pip install -U pip setuptools twine wheel )
@@ -217,7 +217,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\libfwnt C:\cygwin64\home\appveyor\libfwnt &&
     C:\cygwin64\bin\bash -e -l -c "cd libfwnt && 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(
  [libfwnt],
- [20231011],
+ [20231106],
  [[email protected]])
 
 AC_CONFIG_SRCDIR(
  [include/libfwnt.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
@@ -18,9 +18,9 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f libfwnt.h
-	/bin/rm -f libfwnt/definitions.h
-	/bin/rm -f libfwnt/features.h
-	/bin/rm -f libfwnt/types.h
-	/bin/rm -f Makefile
+	-rm -f libfwnt.h
+	-rm -f libfwnt/definitions.h
+	-rm -f libfwnt/features.h
+	-rm -f libfwnt/types.h
+	-rm -f Makefile
 
diff --git a/libfwnt/Makefile.am b/libfwnt/Makefile.am
@@ -52,11 +52,13 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f libfwnt_definitions.h
-	/bin/rm -f libfwnt.rc
-	/bin/rm -f Makefile
+	-rm -f libfwnt_definitions.h
+	-rm -f libfwnt.rc
+	-rm -f Makefile
 
-splint:
+sources-local: $(BUILT_SOURCES)
+
+splint-local:
 	@echo "Running splint on libfwnt ..."
 	-splint -preproc -redef $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(libfwnt_la_SOURCES)
 
diff --git a/manuals/Makefile.am b/manuals/Makefile.am
@@ -8,5 +8,5 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile
 
diff --git a/msvscpp/Makefile.am b/msvscpp/Makefile.am
@@ -26,5 +26,5 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile
 
diff --git a/ossfuzz/Makefile.am b/ossfuzz/Makefile.am
@@ -64,9 +64,9 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile
 
-splint:
+splint-local:
 	@echo "Running splint on lznt1_fuzzer ..."
 	-splint -preproc -redef $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(lznt1_fuzzer_SOURCES)
 	@echo "Running splint on lzx_fuzzer ..."

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/pyfwnt-python2/Makefile.am b/pyfwnt-python2/Makefile.am
@@ -53,8 +53,8 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 clean-local:
-	/bin/rm -f pyfwnt*.[ch]
+	-rm -f pyfwnt*.[ch]
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile
 
diff --git a/pyfwnt-python3/Makefile.am b/pyfwnt-python3/Makefile.am
@@ -53,8 +53,8 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 clean-local:
-	/bin/rm -f pyfwnt*.[ch]
+	-rm -f pyfwnt*.[ch]
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile
 
diff --git a/pyfwnt/Makefile.am b/pyfwnt/Makefile.am
@@ -40,5 +40,5 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile
 
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/tests/Makefile.am b/tests/Makefile.am
@@ -192,5 +192,5 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 distclean: clean
-	/bin/rm -f Makefile
+	-rm -f Makefile
 
diff --git a/tests/test_runner.sh b/tests/test_runner.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Bash functions to run an executable for testing.
 #
-# Version: 20231001
+# Version: 20231013
 #
 # When CHECK_WITH_ASAN is set to a non-empty value the test executable
 # is run with asan, otherwise it is run without.
@@ -410,7 +410,7 @@ read_test_data_option_file()
 
 	if test "${OPTIONS_STRING}" = "# libyal test data options";
 	then
-		OPTIONS_STRING=`tail -n +2 "${TEST_DATA_OPTION_FILE}" | sed 's/^offset=/-o/;s/^password=/-p/;s/^recovery_password=/-r/;s/^startup_key=/-s/' | tr '\n' ' '`;
+		OPTIONS_STRING=`tail -n +2 "${TEST_DATA_OPTION_FILE}" | sed 's/^offset=/-o/;s/^password=/-p/;s/^recovery_password=/-r/;s/^startup_key=/-s/;s/virtual_address=/-v/' | tr '\n' ' '`;
 	fi
 	echo "${OPTIONS_STRING}";
 }