Applied updates

libyal · Aug 6, 2018 · af09629 · af09629
1 parent 874559f
commit af09629
Show file tree

Hide file tree

Showing 36 changed files with 1,075 additions and 377 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,10 @@ env:
    - secure: "Ni+RTiameIuVp20aoVAtVUL1PapJw9ceovXHbXACnN0YS1DiFDdhD19rGGhfjNBNqdoGVGsbNGbnaMwB3S1uFO/uhPgxD+m0URoiARwHQFLrQPn97gVz9u5UCjiNoEZO6dsOXXqjxGpBgR1kExVz+h9CTx3BFIkGjReOFLtjsD8="
 matrix:
   include:
-  - env: TARGET="coverity"
+  - name: "Coverity"
+    env:
+    - CONFIGURE_OPTIONS=""
+    - TARGET="coverity"
     compiler: clang
     os: linux
     dist: trusty
@@ -20,43 +23,257 @@ matrix:
         build_command_prepend: "./synclibs.sh && ./autogen.sh && ./configure"
         build_command: "make -j4"
         branch_pattern: master
-  - env: TARGET="linux-clang"
+  - name: "Linux with clang"
+    env:
+    - CONFIGURE_OPTIONS=""
+    - CFLAGS="--coverage"
+    - LDFLAGS="--coverage"
+    - TARGET="linux-clang"
     compiler: clang
     os: linux
     dist: trusty
     sudo: required
     group: edge
-  - env: TARGET="linux-gcc"
+  - name: "Linux with gcc"
+    env:
+    - CONFIGURE_OPTIONS=""
+    - CFLAGS="--coverage"
+    - LDFLAGS="--coverage"
+    - TARGET="linux-gcc"
     compiler: gcc
     os: linux
     dist: trusty
     sudo: required
     group: edge
-  - env: TARGET="macos-clang"
+  - name: "Linux with gcc and wide character type (wchar_t) support"
+    env:
+    - CONFIGURE_OPTIONS="--enable-wide-character-type"
+    - CFLAGS="--coverage"
+    - LDFLAGS="--coverage"
+    - TARGET="linux-gcc-wide-character-type"
+    compiler: gcc
+    os: linux
+    dist: trusty
+    sudo: required
+    group: edge
+  - name: "Linux with gcc without optimization"
+    env:
+    - CONFIGURE_OPTIONS="--enable-shared=no --enable-wide-character-type"
+    - CFLAGS="--coverage -O0"
+    - CPPFLAGS="-DOPTIMIZATION_DISABLED"
+    - LDFLAGS="--coverage"
+    - TARGET="linux-gcc-no-optimization"
+    compiler: gcc
+    os: linux
+    dist: trusty
+    sudo: required
+    group: edge
+  - name: "Linux with gcc without OpenSSL"
+    env:
+    - CONFIGURE_OPTIONS="--with-openssl=no"
+    - CFLAGS="--coverage"
+    - LDFLAGS="--coverage"
+    - TARGET="linux-gcc-no-openssl"
+    compiler: gcc
+    os: linux
+    dist: trusty
+    sudo: required
+    group: edge
+  - name: "Linux with gcc with OpenSSL EVP"
+    env:
+    - CONFIGURE_OPTIONS="--enable-openssl-evp-cipher=yes --enable-openssl-evp-md=yes"
+    - CFLAGS="--coverage"
+    - LDFLAGS="--coverage"
+    - TARGET="linux-gcc-openssl-evp"
+    compiler: gcc
+    os: linux
+    dist: trusty
+    sudo: required
+    group: edge
+  - name: "Linux with gcc with OpenSSL non-EVP"
+    env:
+    - CONFIGURE_OPTIONS="--enable-openssl-evp-cipher=no --enable-openssl-evp-md=no"
+    - CFLAGS="--coverage"
+    - LDFLAGS="--coverage"
+    - TARGET="linux-gcc-openssl"
+    compiler: gcc
+    os: linux
+    dist: trusty
+    sudo: required
+    group: edge
+  - name: "Linux with gcc and Python module"
+    env:
+    - CONFIGURE_OPTIONS="--enable-python"
+    - CFLAGS="--coverage"
+    - LDFLAGS="--coverage"
+    - TARGET="linux-gcc-python"
+    compiler: gcc
+    os: linux
+    dist: trusty
+    sudo: required
+    group: edge
+  - name: "Linux with gcc and Python 2 module"
+    env:
+    - CONFIGURE_OPTIONS="--enable-python2"
+    - CFLAGS="--coverage"
+    - LDFLAGS="--coverage"
+    - PYTHON_VERSION=2
+    - TARGET="linux-gcc-python2"
+    compiler: gcc
+    os: linux
+    dist: trusty
+    sudo: required
+    group: edge
+  - name: "Linux with gcc and Python 3 module"
+    env:
+    - CONFIGURE_OPTIONS="--enable-python3"
+    - CFLAGS="--coverage"
+    - LDFLAGS="--coverage"
+    - PYTHON_VERSION=3
+    - TARGET="linux-gcc-python3"
+    compiler: gcc
+    os: linux
+    dist: trusty
+    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: trusty
+    sudo: required
+    group: edge
+    python: 2.7
+  - name: "Linux with gcc and Python 3 module (setup.py)"
+    env:
+    - TARGET="linux-gcc-python-setup-py"
+    compiler: gcc
+    os: linux
+    dist: trusty
+    sudo: required
+    group: edge
+    python: 3.4
+  - name: "Linux with gcc and shared libraries"
+    env:
+    - CONFIGURE_OPTIONS=""
+    - CFLAGS="--coverage"
+    - LDFLAGS="--coverage"
+    - TARGET="linux-gcc-shared"
+    compiler: gcc
+    os: linux
+    dist: trusty
+    sudo: required
+    group: edge
+  - name: "Linux with gcc, shared libraries and wide character type (wchar_t) support"
+    env:
+    - CONFIGURE_OPTIONS="--enable-wide-character-type"
+    - CFLAGS="--coverage"
+    - LDFLAGS="--coverage"
+    - TARGET="linux-gcc-shared-wide-character-type"
+    compiler: gcc
+    os: linux
+    dist: trusty
+    sudo: required
+    group: edge
+  - name: "Linux with gcc and static executables support"
+    env:
+    - CONFIGURE_OPTIONS="--enable-static-executables"
+    - CFLAGS="--coverage"
+    - LDFLAGS="--coverage"
+    - TARGET="linux-gcc-static-executables"
+    compiler: gcc
+    os: linux
+    dist: trusty
+    sudo: required
+    group: edge
+  - name: "MacOS with clang"
+    env:
+    - CONFIGURE_OPTIONS=""
+    - TARGET="macos-clang"
     compiler: clang
     os: osx
     osx_image: xcode8.3
-  - env: TARGET="macos-gcc"
+  - name: "MacOS with gcc"
+    env:
+    - CONFIGURE_OPTIONS=""
+    - TARGET="macos-gcc"
+    compiler: clang
     compiler: gcc
     os: osx
     osx_image: xcode8.3
-  - env: TARGET="shared"
+  - name: "MacOS with gcc and Python module"
+    env:
+    - CONFIGURE_OPTIONS="--enable-python"
+    - TARGET="macos-gcc-python"
+    compiler: clang
     compiler: gcc
-    os: linux
-    dist: trusty
-    sudo: required
-    group: edge
+    os: osx
+    osx_image: xcode8.3
+  - name: "MacOS with gcc and Python 2 module"
+    env:
+    - 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
 before_install:
-  - if test ${TRAVIS_OS_NAME} = "linux"; then sudo apt-get update && sudo apt-mark hold oracle-java9-installer postgresql-9.2 postgresql-9.3 postgresql-9.4 postgresql-9.5 postgresql-9.6 postgresql-client postgresql-client-common postgresql-common postgresql-contrib-9.2 postgresql-contrib-9.3 postgresql-contrib-9.4 postgresql-contrib-9.5 postgresql-contrib-9.6 postgresql-doc && sudo apt-get --fix-missing -o Dpkg::Options::="--force-confold" upgrade -y --allow-unauthenticated && sudo apt-get install -y autopoint libssl-dev libfuse-dev; fi
-  - if test ${TRAVIS_OS_NAME} = "osx"; then brew update && brew install gettext gnu-sed && brew link --force gettext; fi
-  - if test ${TARGET} = "coverity"; then echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-; fi
+  - if test ${TRAVIS_OS_NAME} = "linux"; then
+      sudo apt-get update && sudo apt-mark hold oracle-java8-installer oracle-java9-installer postgresql-9.2 postgresql-9.3 postgresql-9.4 postgresql-9.5 postgresql-9.6 postgresql-client postgresql-client-common postgresql-common postgresql-contrib-9.2 postgresql-contrib-9.3 postgresql-contrib-9.4 postgresql-contrib-9.5 postgresql-contrib-9.6 postgresql-doc && sudo apt-get --fix-missing -o Dpkg::Options::="--force-confold" upgrade -y --allow-unauthenticated && sudo apt-get install -y autopoint libssl-dev libfuse-dev;
+    elif test ${TRAVIS_OS_NAME} = "osx"; then
+      brew update && brew install gettext gnu-sed && brew link --force gettext;
+    fi
+  - if test ${TARGET} = "coverity"; then
+      echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-;
+    fi
 install:
-  - if test ${TRAVIS_OS_NAME} = "osx"; then export SED="/usr/local/bin/gsed"; fi
+  - if test ${TRAVIS_OS_NAME} = "osx"; then
+      export SED="/usr/local/bin/gsed";
+    fi
   - ./synclibs.sh --use-head && ./autogen.sh
-  - if test ${TARGET} = "shared"; then ./configure > /dev/null && make > /dev/null && ./syncsharedlibs.sh --use-head; fi
-  - if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
+  - if test ${TARGET} = "linux-gcc-shared" || test ${TARGET} = "linux-gcc-shared-wide-character-type"; then
+      ./configure > /dev/null && make > /dev/null && ./syncsharedlibs.sh --use-head;
+    fi
+  - if test -x "synctestdata.sh"; then
+      ./synctestdata.sh;
+    fi
 script:
-  - if test ${TRAVIS_OS_NAME} = "linux"; then export PATH=$(echo $PATH | tr ":" "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s/::/:/g"); fi
-  - if test ${TARGET} != "coverity"; then ./runtests.sh; fi
+  - if test ${TRAVIS_OS_NAME} = "linux"; then
+      export PATH=$(echo $PATH | tr ":" "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s/::/:/g");
+    fi
+  - if test ${TARGET} = "linux-gcc-python-setup-py" || test ${TARGET} = "macos-gcc-python-setup-py"; then
+      python ./setup.py build;
+    elif test ${TARGET} != "coverity"; then
+      ./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;
+      if test ${TARGET} = "macos-gcc-pkgbuild"; then
+        VERSION=`sed '5!d; s/^ \[//;s/\],$//' configure.ac` &&
+        make install DESTDIR=${PWD}/osx-pkg &&
+        mkdir -p ${PWD}/osx-pkg/usr/share/doc/libbde &&
+        cp AUTHORS COPYING NEWS README ${PWD}/osx-pkg/usr/share/doc/libbde &&
+        pkgbuild --root osx-pkg --identifier com.github.libyal.libbde --version ${VERSION} --ownership recommended ../libbde-${VERSION}.pkg;
+      fi
+    fi
 after_success:
-  - if test ${TARGET} = "linux-gcc"; then curl -o codecov.sh -s https://codecov.io/bash && /bin/bash ./codecov.sh; fi
+  - if test ${TARGET} = "linux-gcc-no-optimization"; then
+      curl -o codecov.sh -s https://codecov.io/bash && /bin/bash ./codecov.sh -n ${TARGET} -y .codecov.yml;
+    fi
diff --git a/appveyor.yml b/appveyor.yml
@@ -104,5 +104,5 @@ test_script:
 after_test:
 - cmd: if [%TARGET%]==[mingw] (
     copy C:\projects\codecov-bash\codecov C:\MinGW\msys\1.0\home\appveyor\libbde\codecov.sh &&
-    C:\MinGW\msys\1.0\bin\bash -e -l -c "cd libbde && chmod a+x ./codecov.sh && ./codecov.sh" )
+    C:\MinGW\msys\1.0\bin\bash -e -l -c "cd libbde && chmod a+x ./codecov.sh && sed -i 's/-execdir /-exec /' ./codecov.sh && ./codecov.sh -n mingw -y .codecov.yml" )
 
diff --git a/bdetools/bdetools_libbde.h b/bdetools/bdetools_libbde.h
@@ -24,13 +24,6 @@
 
 #include <common.h>
 
-/* If Cygwin libtool DLL support is enabled set LIBBDE_DLL_IMPORT
- * before including libbde.h
- */
-#if defined( _WIN32 ) && defined( DLL_IMPORT ) && !defined( HAVE_STATIC_EXECUTABLES )
-#define LIBBDE_DLL_IMPORT
-#endif
-
 #include <libbde.h>
 
 #endif /* !defined( _BDETOOLS_LIBBDE_H ) */