Commit 9d0e6659 authored by Julien Lamy's avatar Julien Lamy
Browse files

New upstream version 0.9.2

parent 9e16abb1

.ci/brew/build

+19 −1
Original line number Diff line number Diff line
@@ -5,6 +5,20 @@ set -ev 
export Python=${Python:?}

export WORKSPACE=${WORKSPACE:?}



PYTHON_EXECUTABLE="/usr/local/bin/python${Python}"

PYTHON_PREFIX=$(${PYTHON_EXECUTABLE} -c 'import sys;print(sys.prefix)')

PYTHON_VERSION="$(${PYTHON_EXECUTABLE} -c 'import sys;print(sys.version[:3])')"

PYTHON_VERSION_NO_DOT=$(echo ${PYTHON_VERSION} | sed 's/\.//')

PYTHON_INCLUDE_DIR=$(${PYTHON_EXECUTABLE} -c 'from distutils import sysconfig;print(sysconfig.get_python_inc(True))')

PYTHON_LIBRARY=${PYTHON_PREFIX}/lib/libpython${PYTHON_VERSION}.dylib



if [ "${Python}" = "2" ]

then

    Boost_PYTHON_LIBRARY=/usr/local/lib/libboost_python.dylib

else

    Boost_PYTHON_LIBRARY=/usr/local/lib/libboost_python${PYTHON_VERSION_NO_DOT}.dylib

fi



mkdir build

mkdir install

cd build
@@ -13,7 +27,11 @@ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/opt/icu4c/lib/pkgconf 


cmake \

  -D CMAKE_INSTALL_PREFIX="${WORKSPACE}/install" \

  -D PYTHON_LIBRARY=/usr/local/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib \

  -D PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} \

  -D PYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR} \

  -D PYTHON_LIBRARY=${PYTHON_LIBRARY} \

  -D Boost_PYTHON_LIBRARY_DEBUG=${Boost_PYTHON_LIBRARY} \

  -D Boost_PYTHON_LIBRARY_RELEASE=${Boost_PYTHON_LIBRARY} \

  ${CMAKE_OPTIONS} \

  ..

make ${MAKE_OPTIONS} install

.ci/brew/install

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ import sys 


brew_conflicting = ["json-c"]

brew_required = [

    "boost", "boost-python", "cmake", "cppcheck", "dcmtk", "icu4c", "jsoncpp",

    "lcov", "log4cpp", "pkg-config", "python"+os.environ["Python"]

    "boost", "boost-python", "boost-python3", "cmake", "cppcheck", "dcmtk",

    "icu4c", "jsoncpp", "lcov", "log4cpp", "pkg-config", "python", "python@2"

]



pip_required = ["cpp-coveralls", "nose"]

.ci/brew/post_build

+7 −2
Original line number Diff line number Diff line
@@ -7,5 +7,10 @@ export WORKSPACE=${WORKSPACE:?} 


cd build



export PYTHONPATH=${WORKSPACE}/install/$(python${Python} -c "from distutils.sysconfig import *; print(get_python_lib(True, prefix=''))")

../tests/run --no-network --nose ~/Library/Python/${Python}*/bin/nosetests
 
PYTHON_EXECUTABLE="/usr/local/bin/python${Python}"

PYTHON_VERSION="$(${PYTHON_EXECUTABLE} -c 'import sys;print(sys.version[:3])')"

LOCAL_PYTHON_PREFIX="$(${PYTHON_EXECUTABLE} -c 'from distutils.sysconfig import *; print(get_python_lib(True, prefix=str()))')"



export PYTHONPATH=${WORKSPACE}/install/${LOCAL_PYTHON_PREFIX}

export PATH=~/Library/Python/${PYTHON_VERSION}/bin:${PATH}

../tests/run --no-network --nose nosetests-${PYTHON_VERSION}

.ci/deb/install

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ PACKAGES="${PACKAGES} libdcmtk2-dev libicu-dev libjsoncpp-dev liblog4cpp5-dev zl 
# Dependencies of Python wrappers

PACKAGES="${PACKAGES} libboost-python-dev ${PYTHON_PREFIX}-dev"

# Dependencies of unit tests

PACKAGES="${PACKAGES} dcmtk libboost-test-dev ${PYTHON_PREFIX}-nose"

PACKAGES="${PACKAGES} dcmtk libboost-test-dev ${PYTHON_PREFIX}-pip ${PYTHON_PREFIX}-nose"

# Coverage and static analysis

PACKAGES="${PACKAGES} cppcheck lcov wget"

.ci/deb/post_build

+4 −4
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ cp ${DIRECTORY}/filtered.info "${WORKSPACE}/build/coverage.info" 
./lcov_cobertura ${DIRECTORY}/filtered.info -b "${WORKSPACE}"

rm -rf ${DIRECTORY}



cppcheck -q --xml --xml-version=2 --enable=all \

  -i "${WORKSPACE}/tests/tools" \

  "${WORKSPACE}/src/" "${WORKSPACE}/tests/" "${WORKSPACE}/wrappers/" \

  2> ${WORKSPACE}/build/cppcheck.xml
 
#cppcheck -q --xml --xml-version=2 --enable=all \

#  -i "${WORKSPACE}/tests/tools" \

#  "${WORKSPACE}/src/" "${WORKSPACE}/tests/" "${WORKSPACE}/wrappers/" \

#  2> ${WORKSPACE}/build/cppcheck.xml