Applied updates

libyal · Nov 14, 2018 · 81e013d · 81e013d
1 parent e8ad7d1
commit 81e013d
Show file tree

Hide file tree

Showing 4 changed files with 134 additions and 47 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -132,15 +132,13 @@ matrix:
     env:
     - CONFIGURE_OPTIONS=""
     - TARGET="macos-gcc"
-    compiler: clang
     compiler: gcc
     os: osx
     osx_image: xcode8.3
   - name: "MacOS with gcc and Python module"
     env:
     - CONFIGURE_OPTIONS="--enable-python"
     - TARGET="macos-gcc-python"
-    compiler: clang
     compiler: gcc
     os: osx
     osx_image: xcode8.3
@@ -149,22 +147,19 @@ matrix:
     - CONFIGURE_OPTIONS="--enable-python2"
     - PYTHON_VERSION=2
     - TARGET="macos-gcc-python2"
-    compiler: clang
     compiler: gcc
     os: osx
     osx_image: xcode8.3
   - name: "MacOS with gcc and Python 2 module (setup.py)"
     env:
     - TARGET="macos-gcc-python-setup-py"
-    compiler: clang
     compiler: gcc
     os: osx
     osx_image: xcode8.3
   - name: "MacOS gcc and pkgbuild"
     env:
     - CONFIGURE_OPTIONS="--disable-dependency-tracking --prefix=/usr/local --enable-python --with-pyprefix"
     - TARGET="macos-gcc-pkgbuild"
-    compiler: clang
     compiler: gcc
     os: osx
     osx_image: xcode8.3

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,52 +1,144 @@
 environment:
   matrix:
   - TARGET: vs2008
+    BUILD_ENVIRONMENT: msbuild
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
     VisualStudioVersion: 9.0
     platform: Win32
     configuration: Release
   - TARGET: vs2010
+    BUILD_ENVIRONMENT: msbuild
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
     VisualStudioVersion: 10.0
     platform: Win32
     configuration: VSDebug
   - TARGET: vs2012
+    BUILD_ENVIRONMENT: msbuild
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
     VisualStudioVersion: 11.0
     platform: x64
     configuration: Release
   - TARGET: vs2013
+    BUILD_ENVIRONMENT: msbuild
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
     VisualStudioVersion: 12.0
     platform: Win32
     configuration: Release
   - TARGET: vs2015
+    BUILD_ENVIRONMENT: msbuild
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     VisualStudioVersion: 14.0
     platform: Win32
     configuration: Release
   - TARGET: vs2017
+    BUILD_ENVIRONMENT: msbuild
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     VisualStudioVersion: 15.0
     configuration: Release
   - TARGET: python27
+    BUILD_ENVIRONMENT: python
+    PYTHON: "C:\\Python27"
+  - TARGET: python27-x64
+    BUILD_ENVIRONMENT: python
+    PYTHON: "C:\\Python27-x64"
   - TARGET: python36
-  - TARGET: cygwin
-  - TARGET: cygwin64
-  - TARGET: mingw
-  - TARGET: mingw-w64
+    BUILD_ENVIRONMENT: python
+    PYTHON: "C:\\Python36"
+  - TARGET: python36-x64
+    BUILD_ENVIRONMENT: python
+    PYTHON: "C:\\Python36-x64"
+  - TARGET: cygwin-gcc
+    BUILD_ENVIRONMENT: cygwin
+    CONFIGURE_OPTIONS: ""
+    CFLAGS: "--coverage"
+    LDFLAGS: "--coverage"
+  - TARGET: cygwin-gcc-no-optimization
+    BUILD_ENVIRONMENT: cygwin
+    CONFIGURE_OPTIONS: "--enable-shared=no"
+    CFLAGS: "--coverage -O0"
+    CPPFLAGS: "-DOPTIMIZATION_DISABLED"
+    LDFLAGS: "--coverage"
+  - TARGET: cygwin-gcc-python
+    BUILD_ENVIRONMENT: cygwin
+    CONFIGURE_OPTIONS: "--enable-python"
+    CFLAGS: "--coverage"
+    LDFLAGS: "--coverage"
+  - TARGET: cygwin-gcc-python2
+    BUILD_ENVIRONMENT: cygwin
+    CONFIGURE_OPTIONS: "--enable-python2"
+    CFLAGS: "--coverage"
+    LDFLAGS: "--coverage"
+  - TARGET: cygwin-gcc-python3
+    BUILD_ENVIRONMENT: cygwin
+    CONFIGURE_OPTIONS: "--enable-python3"
+    CFLAGS: "--coverage"
+    LDFLAGS: "--coverage"
+  - TARGET: cygwin64-gcc
+    BUILD_ENVIRONMENT: cygwin64
+    CONFIGURE_OPTIONS: ""
+    CFLAGS: "--coverage"
+    LDFLAGS: "--coverage"
+  - TARGET: cygwin64-gcc-no-optimization
+    BUILD_ENVIRONMENT: cygwin64
+    CONFIGURE_OPTIONS: "--enable-shared=no"
+    CFLAGS: "--coverage -O0"
+    CPPFLAGS: "-DOPTIMIZATION_DISABLED"
+    LDFLAGS: "--coverage"
+  - TARGET: cygwin64-gcc-python
+    BUILD_ENVIRONMENT: cygwin64
+    CONFIGURE_OPTIONS: "--enable-python"
+    CFLAGS: "--coverage"
+    LDFLAGS: "--coverage"
+  - TARGET: cygwin64-gcc-python2
+    BUILD_ENVIRONMENT: cygwin64
+    CONFIGURE_OPTIONS: "--enable-python2"
+    CFLAGS: "--coverage"
+    LDFLAGS: "--coverage"
+  - TARGET: cygwin64-gcc-python3
+    BUILD_ENVIRONMENT: cygwin64
+    CONFIGURE_OPTIONS: "--enable-python3"
+    CFLAGS: "--coverage"
+    LDFLAGS: "--coverage"
+  - TARGET: mingw-gcc
+    BUILD_ENVIRONMENT: mingw
+    CONFIGURE_OPTIONS: ""
+    CFLAGS: "--coverage"
+    LDFLAGS: "--coverage"
+  - TARGET: mingw-gcc-no-optimization
+    BUILD_ENVIRONMENT: mingw
+    CONFIGURE_OPTIONS: "--enable-shared=no"
+    CFLAGS: "--coverage -O0"
+    CPPFLAGS: "-DOPTIMIZATION_DISABLED"
+    LDFLAGS: "--coverage"
+  - TARGET: mingw-w64-gcc
+    BUILD_ENVIRONMENT: mingw-w64
+    CONFIGURE_OPTIONS: ""
+    CFLAGS: "--coverage"
+    LDFLAGS: "--coverage"
+  - TARGET: mingw-w64-gcc-no-optimization
+    BUILD_ENVIRONMENT: mingw-w64
+    CONFIGURE_OPTIONS: "--enable-shared=no"
+    CFLAGS: "--coverage -O0"
+    CPPFLAGS: "-DOPTIMIZATION_DISABLED"
+    LDFLAGS: "--coverage"
+
+matrix:
+  allow_failures:
+  - TARGET: python27-x64
 
 install:
 - cmd: git clone https://github.com/codecov/codecov-bash.git ..\codecov-bash
-- cmd: git clone https://github.com/libyal/vstools.git ..\vstools
-- cmd: if [%TARGET%]==[cygwin] (
+- cmd: if [%BUILD_ENVIRONMENT%]==[msbuild] (
+    git clone https://github.com/libyal/vstools.git ..\vstools )
+- cmd: if [%BUILD_ENVIRONMENT%]==[cygwin] (
     C:\cygwin\setup-x86.exe -qgnNdO -l C:\cygwin\var\cache\setup -R c:\cygwin -s http://cygwin.mirror.constant.com -P python2-devel -P python3-devel )
-- cmd: if [%TARGET%]==[cygwin64] (
+- cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
     C:\cygwin64\setup-x86_64.exe -qgnNdO -l C:\cygwin64\var\cache\setup -R c:\cygwin64 -s http://cygwin.mirror.constant.com -P python2-devel -P python3-devel )
 
 build_script:
-- ps: .\synclibs.ps1
-- ps: .\autogen.ps1
+- ps: If ($env:BUILD_ENVIRONMENT -eq "msbuild" -or $env:BUILD_ENVIRONMENT -eq "python") {
+    .\synclibs.ps1;
+    .\autogen.ps1 }
 - cmd: if [%TARGET%]==[vs2008] (
     msbuild /verbosity:quiet msvscpp\libfwsi.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" )
 - cmd: if [%TARGET%]==[vs2010] (
@@ -70,38 +162,36 @@ build_script:
     C:\Python27\python.exe ..\vstools\scripts\msvscpp-convert.py --extend-with-x64 --no-python-dll --output-format 2017 --with-dokany msvscpp\libfwsi.sln &&
     msbuild /verbosity:quiet vs2017\libfwsi.sln /property:Platform=Win32 /property:PlatformToolset=v141 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" &&
     msbuild /verbosity:quiet vs2017\libfwsi.sln /property:Platform=x64 /property:PlatformToolset=v141 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" )
-- cmd: if [%TARGET%]==[python27] (
-    C:\Python27\python.exe setup.py bdist_msi )
-- cmd: if [%TARGET%]==[python36] (
-    C:\Python36\python.exe setup.py bdist_msi )
-- cmd: if [%TARGET%]==[cygwin] (
+- cmd: if [%BUILD_ENVIRONMENT%]==[python] (
+    "%PYTHON%\\python.exe" setup.py bdist_msi )
+- cmd: if [%BUILD_ENVIRONMENT%]==[cygwin] (
     xcopy /i /q /s C:\projects\libfwsi C:\cygwin\home\appveyor\libfwsi &&
     C:\cygwin\bin\bash -e -l -c "cd libfwsi && ./synclibs.sh --use-head && ./autogen.sh" )
-- cmd: if [%TARGET%]==[cygwin64] (
+- cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
     xcopy /i /q /s C:\projects\libfwsi C:\cygwin64\home\appveyor\libfwsi &&
     C:\cygwin64\bin\bash -e -l -c "cd libfwsi && ./synclibs.sh --use-head && ./autogen.sh" )
-- cmd: if [%TARGET%]==[mingw] (
+- cmd: if [%BUILD_ENVIRONMENT%]==[mingw] (
     xcopy /i /q /s C:\projects\libfwsi C:\MinGW\msys\1.0\home\appveyor\libfwsi &&
     C:\MinGW\msys\1.0\bin\bash -e -l -c "cd libfwsi && sed 's/@VERSION@/0.29/g' m4/pkg.m4.in > m4/pkg.m4 && ./synclibs.sh --use-head && ./autogen.sh" )
-- cmd: if [%TARGET%]==[mingw-w64] (
+- cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] (
     xcopy /i /q /s C:\projects\libfwsi C:\msys64\home\appveyor\libfwsi &&
     C:\msys64\usr\bin\bash -e -l -c "cd libfwsi && ./synclibs.sh --use-head && ./autogen.sh" )
 
 test_script:
 - cmd: rem Run tests
-- ps: If ($env:TARGET -eq "vs2008" -or $env:TARGET -eq "vs2010" -or $env:TARGET -eq "vs2012" -or $env:TARGET -eq "vs2013" -or $env:TARGET -eq "vs2015" -or $env:TARGET -eq "vs2017") {
+- ps: If ($env:BUILD_ENVIRONMENT -eq "msbuild") {
     .\runtests.ps1 }
-- cmd: if [%TARGET%]==[cygwin] (
-    C:\cygwin\bin\bash -e -l -c "cd libfwsi && ./runtests.sh" )
-- cmd: if [%TARGET%]==[cygwin64] (
-    C:\cygwin64\bin\bash -e -l -c "cd libfwsi && ./runtests.sh" )
-- cmd: if [%TARGET%]==[mingw] (
-    C:\MinGW\msys\1.0\bin\bash -e -l -c "cd libfwsi && ./runtests.sh" )
-- cmd: if [%TARGET%]==[mingw-w64] (
-    C:\msys64\usr\bin\bash -e -l -c "cd libfwsi && ./runtests.sh" )
+- cmd: if [%BUILD_ENVIRONMENT%]==[cygwin] (
+    C:\cygwin\bin\bash -e -l -c "cd libfwsi && ./configure ${CONFIGURE_OPTIONS} && make > /dev/null && make check CHECK_WITH_STDERR=1 || if test $? -ne 0 && test -f tests/test-suite.log; then cat tests/test-suite.log; fi" )
+- cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
+    C:\cygwin64\bin\bash -e -l -c "cd libfwsi && ./configure ${CONFIGURE_OPTIONS} && make > /dev/null && make check CHECK_WITH_STDERR=1 || if test $? -ne 0 && test -f tests/test-suite.log; then cat tests/test-suite.log; fi" )
+- cmd: if [%BUILD_ENVIRONMENT%]==[mingw] (
+    C:\MinGW\msys\1.0\bin\bash -e -l -c "cd libfwsi && ./configure ${CONFIGURE_OPTIONS} && make > /dev/null && make check CHECK_WITH_STDERR=1 || if test $? -ne 0 && test -f tests/test-suite.log; then cat tests/test-suite.log; fi" )
+- cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] (
+    C:\msys64\usr\bin\bash -e -l -c "cd libfwsi && ./configure ${CONFIGURE_OPTIONS} && make > /dev/null && make check CHECK_WITH_STDERR=1 || if test $? -ne 0 && test -f tests/test-suite.log; then cat tests/test-suite.log; fi" )
 
 after_test:
-- cmd: if [%TARGET%]==[mingw] (
+- cmd: if [%TARGET%]==[mingw-gcc-no-optimization] (
     copy C:\projects\codecov-bash\codecov C:\MinGW\msys\1.0\home\appveyor\libfwsi\codecov.sh &&
-    C:\MinGW\msys\1.0\bin\bash -e -l -c "cd libfwsi && chmod a+x ./codecov.sh && sed -i 's/-execdir /-exec /' ./codecov.sh && ./codecov.sh -n mingw -y .codecov.yml" )
+    C:\MinGW\msys\1.0\bin\bash -e -l -c "cd libfwsi && chmod a+x ./codecov.sh && sed -i 's/-execdir /-exec /' ./codecov.sh && ./codecov.sh -n ${TARGET} -y .codecov.yml" )
 
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )
 
 AC_INIT(
  [libfwsi],
- [20181013],
+ [20181114],
  [[email protected]])
 
 AC_CONFIG_SRCDIR(

diff --git a/libfwsi.spec.in b/libfwsi.spec.in
@@ -10,33 +10,35 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 @libfwsi_spec_requires@ @ax_libcdata_spec_requires@ @ax_libcerror_spec_requires@ @ax_libclocale_spec_requires@ @ax_libcnotify_spec_requires@ @ax_libcthreads_spec_requires@ @ax_libfdatetime_spec_requires@ @ax_libfguid_spec_requires@ @ax_libfole_spec_requires@ @ax_libfwps_spec_requires@ @ax_libuna_spec_requires@
 BuildRequires: gcc @ax_libcdata_spec_build_requires@ @ax_libcerror_spec_build_requires@ @ax_libclocale_spec_build_requires@ @ax_libcnotify_spec_build_requires@ @ax_libcthreads_spec_build_requires@ @ax_libfdatetime_spec_build_requires@ @ax_libfguid_spec_build_requires@ @ax_libfole_spec_build_requires@ @ax_libfwps_spec_build_requires@ @ax_libuna_spec_build_requires@
 
-%description
+%description -n libfwsi
 Library to access the Windows Shell Item format
 
-%package devel
+%package -n libfwsi-devel
 Summary: Header files and libraries for developing applications for libfwsi
 Group: Development/Libraries
 Requires: libfwsi = %{version}-%{release}
 
-%description devel
+%description -n libfwsi-devel
 Header files and libraries for developing applications for libfwsi.
 
-%package python
+%package -n libfwsi-python2
+Obsoletes: libfwsi-python < %{version}
+Provides: libfwsi-python = %{version}
 Summary: Python 2 bindings for libfwsi
 Group: System Environment/Libraries
-Requires: libfwsi = %{version}-%{release} python
-BuildRequires: python-devel
+Requires: libfwsi = %{version}-%{release} python2
+BuildRequires: python2-devel
 
-%description python
+%description -n libfwsi-python2
 Python 2 bindings for libfwsi
 
-%package python3
+%package -n libfwsi-python3
 Summary: Python 3 bindings for libfwsi
 Group: System Environment/Libraries
 Requires: libfwsi = %{version}-%{release} python3
 BuildRequires: python3-devel
 
-%description python3
+%description -n libfwsi-python3
 Python 3 bindings for libfwsi
 
 %prep
@@ -57,13 +59,13 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -n libfwsi
 %defattr(644,root,root,755)
 %license COPYING
 %doc AUTHORS README
 %attr(755,root,root) %{_libdir}/*.so.*
 
-%files devel
+%files -n libfwsi-devel
 %defattr(644,root,root,755)
 %license COPYING
 %doc AUTHORS README ChangeLog
@@ -74,15 +76,15 @@ rm -rf %{buildroot}
 %{_includedir}/*
 %{_mandir}/man3/*
 
-%files python
+%files -n libfwsi-python2
 %defattr(644,root,root,755)
 %license COPYING
 %doc AUTHORS README
 %{_libdir}/python2*/site-packages/*.a
 %{_libdir}/python2*/site-packages/*.la
 %{_libdir}/python2*/site-packages/*.so
 
-%files python3
+%files -n libfwsi-python3
 %defattr(644,root,root,755)
 %license COPYING
 %doc AUTHORS README