Applied updates

loongson-zjl · Feb 23, 2020 · 34c48fb · 34c48fb
1 parent acd56fd
commit 34c48fb
Show file tree

Hide file tree

Showing 305 changed files with 552 additions and 422 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 # Files to ignore by git
 #
-# Version: 20191005
+# Version: 20191220
 
 # Generic auto-generated build files
 *~
@@ -27,6 +27,7 @@
 *.trs
 /*.egg-info/
 .deps
+.dirstamp
 .libs
 INSTALL
 Makefile

diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ matrix:
     - TARGET="coverity"
     compiler: clang
     os: linux
-    dist: xenial
+    dist: bionic
     sudo: required
     group: edge
     addons:
@@ -31,7 +31,7 @@ matrix:
     - TARGET="linux-clang"
     compiler: clang
     os: linux
-    dist: xenial
+    dist: bionic
     sudo: required
     group: edge
   - name: "Linux with gcc"
@@ -42,7 +42,7 @@ matrix:
     - TARGET="linux-gcc"
     compiler: gcc
     os: linux
-    dist: xenial
+    dist: bionic
     sudo: required
     group: edge
   - name: "Linux with gcc on s390x (Docker)"
@@ -55,7 +55,7 @@ matrix:
     - TARGET="docker"
     compiler: gcc
     os: linux
-    dist: xenial
+    dist: bionic
     sudo: required
     group: edge
     services:
@@ -68,7 +68,7 @@ matrix:
     - TARGET="linux-gcc-wide-character-type"
     compiler: gcc
     os: linux
-    dist: xenial
+    dist: bionic
     sudo: required
     group: edge
   - name: "Linux with gcc without optimization"
@@ -80,7 +80,7 @@ matrix:
     - TARGET="linux-gcc-no-optimization"
     compiler: gcc
     os: linux
-    dist: xenial
+    dist: bionic
     sudo: required
     group: edge
   - name: "Linux with gcc and Python module"
@@ -91,7 +91,7 @@ matrix:
     - TARGET="linux-gcc-python"
     compiler: gcc
     os: linux
-    dist: xenial
+    dist: bionic
     sudo: required
     group: edge
   - name: "Linux with gcc and Python 2 module"
@@ -103,7 +103,7 @@ matrix:
     - TARGET="linux-gcc-python2"
     compiler: gcc
     os: linux
-    dist: xenial
+    dist: bionic
     sudo: required
     group: edge
   - name: "Linux with gcc and Python 3 module"
@@ -115,15 +115,15 @@ matrix:
     - TARGET="linux-gcc-python3"
     compiler: gcc
     os: linux
-    dist: xenial
+    dist: bionic
     sudo: required
     group: edge
   - name: "Linux with gcc and Python 2 module (setup.py)"
     env:
     - TARGET="linux-gcc-python-setup-py"
     compiler: gcc
     os: linux
-    dist: xenial
+    dist: bionic
     sudo: required
     group: edge
     python: 2.7
@@ -132,10 +132,10 @@ matrix:
     - TARGET="linux-gcc-python-setup-py"
     compiler: gcc
     os: linux
-    dist: xenial
+    dist: bionic
     sudo: required
     group: edge
-    python: 3.4
+    python: 3.6
   - name: "Linux with gcc and shared libraries"
     env:
     - CONFIGURE_OPTIONS=""
@@ -144,7 +144,7 @@ matrix:
     - TARGET="linux-gcc-shared"
     compiler: gcc
     os: linux
-    dist: xenial
+    dist: bionic
     sudo: required
     group: edge
   - name: "Linux with gcc, shared libraries and wide character type (wchar_t) support"
@@ -155,7 +155,7 @@ matrix:
     - TARGET="linux-gcc-shared-wide-character-type"
     compiler: gcc
     os: linux
-    dist: xenial
+    dist: bionic
     sudo: required
     group: edge
   - name: "Linux with gcc and static executables support"
@@ -166,7 +166,7 @@ matrix:
     - TARGET="linux-gcc-static-executables"
     compiler: gcc
     os: linux
-    dist: xenial
+    dist: bionic
     sudo: required
     group: edge
   - name: "Mac OS with clang"

diff --git a/AUTHORS b/AUTHORS
@@ -1,6 +1,6 @@
 Acknowledgements: libpff
 
-Copyright (C) 2008-2019, Joachim Metz <[email protected]>
+Copyright (C) 2008-2020, Joachim Metz <[email protected]>
 
 This code is derived from information and software contributed by:
 * Earlier work on the PST file format in libpst by

diff --git a/appveyor.yml b/appveyor.yml
@@ -37,6 +37,11 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     VisualStudioVersion: 15.0
     configuration: Release
+  - TARGET: vs2019
+    BUILD_ENVIRONMENT: msbuild
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    VisualStudioVersion: 16.0
+    configuration: Release
   - TARGET: python27
     BUILD_ENVIRONMENT: python
     PYTHON: "C:\\Python27\\python.exe"
@@ -158,7 +163,8 @@ install:
     git clone https://github.com/libyal/vstools.git ..\vstools )
 - ps: If ($env:BUILD_ENVIRONMENT -eq "msbuild") {
     .\synczlib.ps1 }
-- sh: if test ${BUILD_ENVIRONMENT} = "python"; then brew update && brew install gettext gnu-sed python3 && brew link --force gettext; fi
+- sh: if test ${BUILD_ENVIRONMENT} = "python"; then brew update && brew install gettext gnu-sed && brew link --force gettext; fi
+- sh: if test ${BUILD_ENVIRONMENT} = "python"; then brew install python3 || true; fi
 - ps: If ($env:BUILD_ENVIRONMENT -eq "python") {
     Invoke-Expression "${env:PYTHON} -m pip install -U pip setuptools twine wheel" }
 - cmd: if [%BUILD_ENVIRONMENT%]==[cygwin] (
@@ -174,29 +180,21 @@ build_script:
 - ps: If ($env:BUILD_ENVIRONMENT -eq "msbuild" -or ($env:BUILD_ENVIRONMENT -eq "python" -and $isWindows)) {
     .\synclibs.ps1;
     .\autogen.ps1 }
-- cmd: if [%TARGET%]==[vs2008] (
-    msbuild /verbosity:quiet msvscpp\libpff.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" )
-- cmd: if [%TARGET%]==[vs2010] (
-    set PYTHONPATH=..\vstools &&
-    C:\Python27\python.exe ..\vstools\scripts\msvscpp-convert.py --no-python-dll --output-format 2010 msvscpp\libpff.sln &&
-    msbuild /verbosity:quiet vs2010\libpff.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" )
-- cmd: if [%TARGET%]==[vs2012] (
-    set PYTHONPATH=..\vstools &&
-    C:\Python27\python.exe ..\vstools\scripts\msvscpp-convert.py --extend-with-x64 --output-format 2012 --python-path "C:\\Python27-x64" msvscpp\libpff.sln &&
-    msbuild /verbosity:quiet vs2012\libpff.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" )
-- cmd: if [%TARGET%]==[vs2013] (
-    set PYTHONPATH=..\vstools &&
-    C:\Python27\python.exe ..\vstools\scripts\msvscpp-convert.py --output-format 2013 msvscpp\libpff.sln &&
-    msbuild /verbosity:quiet vs2013\libpff.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" )
-- cmd: if [%TARGET%]==[vs2015] (
-    set PYTHONPATH=..\vstools &&
-    C:\Python27\python.exe ..\vstools\scripts\msvscpp-convert.py --output-format 2015 msvscpp\libpff.sln &&
-    msbuild /verbosity:quiet vs2015\libpff.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" )
-- cmd: if [%TARGET%]==[vs2017] (
-    set PYTHONPATH=..\vstools &&
-    C:\Python27\python.exe ..\vstools\scripts\msvscpp-convert.py --extend-with-x64 --no-python-dll --output-format 2017 --with-dokany msvscpp\libpff.sln &&
-    msbuild /verbosity:quiet vs2017\libpff.sln /property:Platform=Win32 /property:PlatformToolset=v141 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" &&
-    msbuild /verbosity:quiet vs2017\libpff.sln /property:Platform=x64 /property:PlatformToolset=v141 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" )
+- ps: If ($env:TARGET -eq "vs2008") {
+    .\build.ps1 -VisualStudioVersion 2008 -VSToolsOptions "" }
+- ps: If ($env:TARGET -eq "vs2010") {
+    .\build.ps1 -VisualStudioVersion 2010 -VSToolsOptions "--no-python-dll" }
+- ps: If ($env:TARGET -eq "vs2012") {
+    .\build.ps1 -VisualStudioVersion 2012 -VSToolsOptions "--extend-with-x64 --python-path C:\\Python27-x64" }
+- ps: If ($env:TARGET -eq "vs2013") {
+    .\build.ps1 -VisualStudioVersion 2013 -VSToolsOptions "" }
+- ps: If ($env:TARGET -eq "vs2015") {
+    .\build.ps1 -VisualStudioVersion 2015 -VSToolsOptions "" }
+- ps: If ($env:TARGET -eq "vs2017") {
+    .\build.ps1 -VisualStudioVersion 2017 -Platform Win32 -VSToolsOptions "--extend-with-x64 --no-python-dll --with-dokany";
+    .\build.ps1 -VisualStudioVersion 2017 -Platform x64 -VSToolsOptions "--extend-with-x64 --no-python-dll --with-dokany" }
+- ps: If ($env:TARGET -eq "vs2019") {
+    .\build.ps1 -VisualStudioVersion 2019 -VSToolsOptions "--extend-with-x64 --no-python-dll --with-dokany" }
 - cmd: if [%BUILD_ENVIRONMENT%]==[python] (
     "%PYTHON%" setup.py bdist_msi bdist_wheel )
 - sh: if test ${BUILD_ENVIRONMENT} = "python"; then ./synclibs.sh && ./autogen.sh && ./configure ${CONFIGURE_OPTIONS} && make > /dev/null; fi