Skip to content

Commit

Permalink
Applied updates
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Dec 12, 2019
1 parent bf52061 commit 7da14c3
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 23 deletions.
11 changes: 0 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .travis/before_install.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
# Script to run before_install step on Travis-CI
#
# Version: 20190808
# Version: 20191209

# Exit on error.
set -e;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions .travis/script.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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] (
Expand All @@ -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 &&
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )

AC_INIT(
[libpff],
[20191204],
[20191212],
[[email protected]])

AC_CONFIG_SRCDIR(
Expand Down
8 changes: 4 additions & 4 deletions libpff/libpff_codepage.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions synclibs.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
# Script that synchronizes the local library dependencies
#
# Version: 20180728
# Version: 20191204

EXIT_SUCCESS=0;
EXIT_FAILURE=1;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 7da14c3

Please sign in to comment.