Browse Source

Applied updates

tags/20180714
Joachim Metz 2 years ago
parent
commit
8fae6b990e
7 changed files with 53 additions and 16 deletions
  1. +17
    -0
      .codecov.yml
  2. +3
    -3
      .travis.yml
  3. +1
    -1
      configure.ac
  4. +10
    -5
      libpff.spec.in
  5. +10
    -3
      runtests.sh
  6. +9
    -3
      setup.py
  7. +3
    -1
      synczlib.ps1

+ 17
- 0
.codecov.yml View File

@@ -7,4 +7,21 @@ coverage:
patch: true
changes: false
ignore:
- "libbfio/*"
- "libcdata/*"
- "libcerror/*"
- "libcfile/*"
- "libclocale/*"
- "libcnotify/*"
- "libcpath/*"
- "libcsplit/*"
- "libcthreads/*"
- "libfcache/*"
- "libfdata/*"
- "libfdatetime/*"
- "libfguid/*"
- "libfmapi/*"
- "libfvalue/*"
- "libfwnt/*"
- "libuna/*"
- "tests/*"

+ 3
- 3
.travis.yml View File

@@ -35,11 +35,11 @@ matrix:
- env: TARGET="macos-clang"
compiler: clang
os: osx
osx_image: xcode8.1
osx_image: xcode8.3
- env: TARGET="macos-gcc"
compiler: gcc
os: osx
osx_image: xcode8.1
osx_image: xcode8.3
- env: TARGET="shared"
compiler: gcc
os: linux
@@ -52,8 +52,8 @@ before_install:
- 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 ${TARGET} = "shared"; then ./syncsharedlibs.sh --use-head; 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
script:
- if test ${TRAVIS_OS_NAME} = "linux"; then export PATH=$(echo $PATH | tr ":" "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s/::/:/g"); fi


+ 1
- 1
configure.ac View File

@@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )

AC_INIT(
[libpff],
[20171008],
[20171129],
[joachim.metz@gmail.com])

AC_CONFIG_SRCDIR(


+ 10
- 5
libpff.spec.in View File

@@ -67,12 +67,14 @@ rm -rf %{buildroot}

%files
%defattr(644,root,root,755)
%doc AUTHORS COPYING NEWS README
%license COPYING
%doc AUTHORS README
%attr(755,root,root) %{_libdir}/*.so.*

%files devel
%defattr(644,root,root,755)
%doc AUTHORS COPYING NEWS README ChangeLog
%license COPYING
%doc AUTHORS README ChangeLog
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/*.so
@@ -82,21 +84,24 @@ rm -rf %{buildroot}

%files python
%defattr(644,root,root,755)
%doc AUTHORS COPYING NEWS README
%license COPYING
%doc AUTHORS README
%{_libdir}/python2*/site-packages/*.a
%{_libdir}/python2*/site-packages/*.la
%{_libdir}/python2*/site-packages/*.so

%files python3
%defattr(644,root,root,755)
%doc AUTHORS COPYING NEWS README
%license COPYING
%doc AUTHORS README
%{_libdir}/python3*/site-packages/*.a
%{_libdir}/python3*/site-packages/*.la
%{_libdir}/python3*/site-packages/*.so

%files tools
%defattr(644,root,root,755)
%doc AUTHORS COPYING NEWS README
%license COPYING
%doc AUTHORS README
%attr(755,root,root) %{_bindir}/*
%{_mandir}/man1/*



+ 10
- 3
runtests.sh View File

@@ -1,7 +1,7 @@
#!/bin/bash
# Script that runs the tests
#
# Version: 20170717
# Version: 20171127

EXIT_SUCCESS=0;
EXIT_FAILURE=1;
@@ -174,6 +174,13 @@ run_configure_make_check_python()

run_setup_py_tests()
{
# Skip this test when running Cygwin on AppVeyor.
if test -n "${APPVEYOR}" && test ${TARGET} = "cygwin";
then
echo "Running: 'setup.py build' skipped";

return ${EXIT_SUCCESS};
fi
PYTHON=$1;

${PYTHON} setup.py build;
@@ -260,7 +267,7 @@ then
PYTHON2=`which python2 2> /dev/null`;

# Note that "test -x" on Mac OS X will succeed if the argument is not set.
if test ! -z ${PYTHON2} && test -x ${PYTHON2};
if test -n "${PYTHON2}" && test -x ${PYTHON2};
then
export PYTHON_VERSION=2;

@@ -291,7 +298,7 @@ then
PYTHON3=`which python3 2> /dev/null`;

# Note that "test -x" on Mac OS X will succeed if the argument is not set.
if test ! -z ${PYTHON3} && test -x ${PYTHON3};
if test -n "${PYTHON3}" && test -x ${PYTHON3};
then
export PYTHON_VERSION=3;



+ 9
- 3
setup.py View File

@@ -1,7 +1,7 @@
#!/usr/bin/env python
#
# Script to build and install Python-bindings.
# Version: 20160316
# Version: 20171105

from __future__ import print_function
import glob
@@ -166,10 +166,10 @@ class custom_sdist(sdist):


class ProjectInformation(object):
"""Class to define the project information."""
"""Project information."""

def __init__(self):
"""Initializes a project information object."""
"""Initializes project information."""
super(ProjectInformation, self).__init__()
self.include_directories = []
self.library_name = None
@@ -300,6 +300,12 @@ if platform.system() == "Windows":
# shared libaries since pip does not integrate well with the system package
# management.
for library_name in project_information.library_names:
for source_file in glob.glob(os.path.join(library_name, "*.[ly]")):
generated_source_file = "{0:s}.c".format(source_file[:-2])
if not os.path.exists(generated_source_file):
raise RuntimeError("Missing generated source file: {0:s}".format(
generated_source_file))

source_files = glob.glob(os.path.join(library_name, "*.c"))
SOURCES.extend(source_files)



+ 3
- 1
synczlib.ps1 View File

@@ -1,6 +1,6 @@
# Script that synchronizes zlib.
#
# Version: 20170114
# Version: 20171105

Function DownloadFile($Url, $Destination)
{
@@ -50,6 +50,8 @@ If (Test-Path ${ExtractedPath})
}
ExtractZip -Filename ${Filename}

Remove-Item -Path ${Filename} -Force

If (Test-Path ${DestinationPath})
{
Remove-Item -Path ${DestinationPath} -Force -Recurse


Loading…
Cancel
Save