Browse Source

Applied updates

master
Joachim Metz 8 months ago
parent
commit
7da14c3a54
No known key found for this signature in database GPG Key ID: D9625E5D7AD0177E
7 changed files with 12 additions and 23 deletions
  1. +0
    -11
      .travis.yml
  2. +2
    -2
      .travis/before_install.sh
  3. +2
    -2
      .travis/script.sh
  4. +1
    -1
      appveyor.yml
  5. +1
    -1
      configure.ac
  6. +4
    -4
      libpff/libpff_codepage.h
  7. +2
    -2
      synclibs.sh

+ 0
- 11
.travis.yml View File

@@ -45,17 +45,6 @@ matrix:
dist: xenial
sudo: required
group: edge
- name: "Linux with gcc on PowerPC 64-bit"
env:
- CONFIGURE_OPTIONS=""
- CFLAGS="--coverage"
- LDFLAGS="--coverage"
- TARGET="linux-gcc"
compiler: gcc
os: linux-ppc64le
dist: xenial
sudo: required
group: edge
- name: "Linux with gcc on s390x (Docker)"
env:
- DOCKERHUB_REPO="s390x/ubuntu"


+ 2
- 2
.travis/before_install.sh View File

@@ -1,7 +1,7 @@
#!/bin/sh
# Script to run before_install step on Travis-CI
#
# Version: 20190808
# Version: 20191209

# Exit on error.
set -e;
@@ -16,7 +16,7 @@ then

docker run --rm --privileged multiarch/qemu-user-static --reset -p yes;

elif test ${TRAVIS_OS_NAME} = "linux" || test ${TRAVIS_OS_NAME} = "linux-ppc64le";
elif test ${TRAVIS_OS_NAME} = "linux";
then
sudo apt-get update;
sudo apt-mark hold mysql-server-5.7 postgresql-9.4 postgresql-client-9.4 postgresql-9.5 postgresql-client-9.5 postgresql-9.6 postgresql-client-9.6 postgresql-10 postgresql-client-10;


+ 2
- 2
.travis/script.sh View File

@@ -1,12 +1,12 @@
#!/bin/sh
# Script to run script step on Travis-CI
#
# Version: 20190808
# Version: 20191209

# Exit on error.
set -e;

if test ${TRAVIS_OS_NAME} = "linux" || test ${TRAVIS_OS_NAME} = "linux-ppc64le";
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
appveyor.yml View File

@@ -174,7 +174,6 @@ build_script:
- ps: If ($env:BUILD_ENVIRONMENT -eq "msbuild" -or ($env:BUILD_ENVIRONMENT -eq "python" -and $isWindows)) {
.\synclibs.ps1;
.\autogen.ps1 }
- sh: if test ${BUILD_ENVIRONMENT} = "python"; then ./synclibs.sh && ./autogen.sh; fi
- cmd: if [%TARGET%]==[vs2008] (
msbuild /verbosity:quiet msvscpp\libpff.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" )
- cmd: if [%TARGET%]==[vs2010] (
@@ -200,6 +199,7 @@ build_script:
msbuild /verbosity:quiet vs2017\libpff.sln /property:Platform=x64 /property:PlatformToolset=v141 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" )
- cmd: if [%BUILD_ENVIRONMENT%]==[python] (
"%PYTHON%" setup.py bdist_msi bdist_wheel )
- sh: if test ${BUILD_ENVIRONMENT} = "python"; then ./synclibs.sh && ./autogen.sh; fi
- sh: if test ${BUILD_ENVIRONMENT} = "python"; then ${PYTHON} setup.py bdist_wheel; fi
- cmd: if [%BUILD_ENVIRONMENT%]==[cygwin] (
xcopy /i /q /s C:\projects\libpff C:\cygwin\home\appveyor\libpff &&


+ 1
- 1
configure.ac View File

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

AC_INIT(
[libpff],
[20191204],
[20191212],
[joachim.metz@gmail.com])

AC_CONFIG_SRCDIR(


+ 4
- 4
libpff/libpff_codepage.h View File

@@ -29,14 +29,14 @@
extern "C" {
#endif

#if !defined( HAVE_LOCAL_LIBPFF )

#include <libpff/codepage.h>

/* Define HAVE_LOCAL_LIBPFF for local use of libpff
* The definitions in <libpff/codepage.h> are copied here
* for local use of libpff
*/
#if !defined( HAVE_LOCAL_LIBPFF )

#include <libpff/codepage.h>

#else

/* The codepage definitions


+ 2
- 2
synclibs.sh View File

@@ -1,7 +1,7 @@
#!/bin/sh
# Script that synchronizes the local library dependencies
#
# Version: 20180728
# Version: 20191204

EXIT_SUCCESS=0;
EXIT_FAILURE=1;
@@ -105,7 +105,7 @@ endif

sed -i'~' "/AM_CPPFLAGS = /,/noinst_LTLIBRARIES = / { N; s/\\\\\\n.@${LOCAL_LIB_UPPER}_DLL_EXPORT@//; P; D; }" ${LOCAL_LIB_MAKEFILE_AM};
sed -i'~' "/${LOCAL_LIB}_definitions.h.in/d" ${LOCAL_LIB_MAKEFILE_AM};
sed -i'~' "/${LOCAL_LIB}.rc/d" ${LOCAL_LIB_MAKEFILE_AM};
sed -i'~' "/${LOCAL_LIB}\\.rc/d" ${LOCAL_LIB_MAKEFILE_AM};

if test ${LOCAL_LIB} = "libfplist";
then


Loading…
Cancel
Save