[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. 336dd8db17e8aff64f15e55effe10ca51bb2d300

[Mathieu M. <ma...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".

The branch, release has been updated
       via  336dd8db17e8aff64f15e55effe10ca51bb2d300 (commit)
      from  b2eb2873a234895b09764a2e9c30a0a5ab89e2c2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/336dd8db17e8aff64f15e55effe10ca51bb2d300/

commit 336dd8db17e8aff64f15e55effe10ca51bb2d300
Author: Mathieu Malaterre <mat...@gm...>
Date:   Fri Apr 26 17:31:45 2019 +0200

    Import from release-2-8 branch

diff --git a/.travis.yml b/.travis.yml
index 7a73c009c..94c195800 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,68 +1,120 @@
+# https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
+# https://github.com/travis-ci/travis-ci/issues/3505
 language: cpp
 # Use the faster container-based infrastructure.
-#sudo: false
-# https://github.com/travis-ci/travis-ci/issues/9033
-sudo: true
+sudo: false
 env:
   global:
    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
    #   via the "travis encrypt" command using the project repo's public key
-   - secure: "ClIqhtIIfQPhil8GH9bnJg70rvJfuYs7Z2Aq2SrdwQsIFNvvfFD5pVxQiaYbZI3nxNclggQ50BmGB96e6jLxbbd/xlIOjcU19W2nzyP6LGkXFHDHm8FwhqqDNpfYvirAOfqgjqf7khRe3ajF33jhrLrhb5QOO5640N93pdChu1sAvI0LZv8JFIUcN7A7To3+WYc7H4CK3U8B2V8nzqcBSHDZNBGAdeVdmldwrlBtQeWBg5wJAEzzUHn0x+kltqvuoPYi2ShpaUkEfHeUWYhOT1uoyXNRAqHXiM1jhiw3JCkqaf7sUKLzyx0ozjTnYntNMggtBzavKjuYg6RhdlNdNbdsi2nxrycCOyCZcF+d4limq+yDMqoP7g/DnPag7XFgjkG/ThULPu+pEK/6nV1NqGNWFu1CqgAwPW7hGbIUADPsMEb+Bz2L2KUof2wU1cdvGK4fzsM9Qpdipbagghn4b5eGtvyBzYzoCS02AKrYfimhcm8bVmlfaMVgd6PnJ19Y1+ADCWwStwaQL2S6udh66JVGNszY/kYSmZKn51RQQDkubmGpywzeNdn7gM9u8QR9s2Lsq0GaSdptcLOPmVNSg6mQJThbMRHM/H2UrSyo7/GLr28sNNbYNweGPevsnrRJPUdG2ENWVw5rg1sD1cLm8rLlD4H2f/b97X9NCl4bLxY="
+   - secure: ClIqhtIIfQPhil8GH9bnJg70rvJfuYs7Z2Aq2SrdwQsIFNvvfFD5pVxQiaYbZI3nxNclggQ50BmGB96e6jLxbbd/xlIOjcU19W2nzyP6LGkXFHDHm8FwhqqDNpfYvirAOfqgjqf7khRe3ajF33jhrLrhb5QOO5640N93pdChu1sAvI0LZv8JFIUcN7A7To3+WYc7H4CK3U8B2V8nzqcBSHDZNBGAdeVdmldwrlBtQeWBg5wJAEzzUHn0x+kltqvuoPYi2ShpaUkEfHeUWYhOT1uoyXNRAqHXiM1jhiw3JCkqaf7sUKLzyx0ozjTnYntNMggtBzavKjuYg6RhdlNdNbdsi2nxrycCOyCZcF+d4limq+yDMqoP7g/DnPag7XFgjkG/ThULPu+pEK/6nV1NqGNWFu1CqgAwPW7hGbIUADPsMEb+Bz2L2KUof2wU1cdvGK4fzsM9Qpdipbagghn4b5eGtvyBzYzoCS02AKrYfimhcm8bVmlfaMVgd6PnJ19Y1+ADCWwStwaQL2S6udh66JVGNszY/kYSmZKn51RQQDkubmGpywzeNdn7gM9u8QR9s2Lsq0GaSdptcLOPmVNSg6mQJThbMRHM/H2UrSyo7/GLr28sNNbYNweGPevsnrRJPUdG2ENWVw5rg1sD1cLm8rLlD4H2f/b97X9NCl4bLxY=
 
 # -m32 is not supported 
 # no poppler, openjpeg, uuid, json
 # no swig
+
+# using debian-sid I get:
+# /usr/bin/ld: BFD (GNU Binutils for Ubuntu) 2.22 internal error, aborting at
+#  ../../bfd/reloc.c line 443 in bfd_get_reloc_size
 matrix:
   fast_finish: true
   include:
     - compiler: gcc
       os: linux
+      env:
+        - CFLAGS="-g -O2"
+        - CXXFLAGS="-g -O2"
+        - CMAKE_EXTRA="-DGDCM_WRAP_PYTHON:BOOL=OFF -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF"
+        - B_NAME=default
+        - CPACK_NAME=Linux
+    - compiler: gcc
+      os: linux
+        # No docbook-xsl-ns
+      addons: {apt: {packages: [default-jdk, mono-devel, swig, libcharls-dev, libvtk5-dev, libexpat-dev, libz-dev, uuid-dev, python-all-dev, libpoppler-dev, xsltproc, docbook-xsl, dcmtk]}}
       env:
         - CFLAGS="-Wall -Wextra -m64"
         - CXXFLAGS="-Wall -Wextra -m64"
-        - CMAKE_EXTRA="-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=ON -DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON -DGDCM_WRAP_PYTHON:BOOL=OFF -DGDCM_WRAP_CSHARP:BOOL=OFF -DGDCM_WRAP_JAVA:BOOL=OFF -DGDCM_WRAP_PHP:BOOL=OFF -DGDCM_USE_SYSTEM_EXPAT:BOOL=ON -DGDCM_USE_SYSTEM_JSON:BOOL=OFF -DGDCM_USE_SYSTEM_LIBXML2:BOOL=ON -DGDCM_USE_SYSTEM_OPENJPEG:BOOL=OFF -DGDCM_USE_SYSTEM_POPPLER:BOOL=OFF -DGDCM_USE_SYSTEM_UUID:BOOL=OFF -DGDCM_USE_SYSTEM_ZLIB:BOOL=ON -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF"
+        # Cant use manpage with old docbook
+        - CMAKE_EXTRA="-DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON -DGDCM_WRAP_PYTHON:BOOL=ON -DGDCM_WRAP_CSHARP:BOOL=ON -DGDCM_WRAP_JAVA:BOOL=ON -DGDCM_WRAP_PHP:BOOL=OFF -DGDCM_USE_SYSTEM_EXPAT:BOOL=ON -DGDCM_USE_SYSTEM_JSON:BOOL=OFF -DGDCM_USE_SYSTEM_LIBXML2:BOOL=ON -DGDCM_USE_SYSTEM_OPENJPEG:BOOL=OFF -DGDCM_USE_SYSTEM_POPPLER:BOOL=ON -DGDCM_USE_SYSTEM_UUID:BOOL=ON -DGDCM_USE_SYSTEM_ZLIB:BOOL=ON -DGDCM_WEAK_SWIG_CHECK:BOOL=ON -DGDCM_LEGACY_SILENT:BOOL=ON -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF"
         - B_NAME=system
+        - CPACK_NAME=Linux
     - compiler: clang
       os: linux
       env:
-        - ASAN_OPTIONS=verbosity=1:log_threads=1
-        - CFLAGS="-Wall -Wextra -m64 -fsanitize=address,undefined"
-        - CXXFLAGS="-g -Wall -Wextra -m64 -fsanitize=address,undefined"
+        - CFLAGS="-g -O0 -Wall -Wextra -m64 -fsanitize=address,undefined,shift"
+        - CXXFLAGS="-g -O0 -Wall -Wextra -m64 -fsanitize=address,undefined,shift"
         - CMAKE_EXTRA="-DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF"
         - B_NAME=fsanitize
+        - CPACK_NAME=Linux
     - compiler: clang
       os: osx
       env:
         - CFLAGS="-Wall -Wextra" # -m64 -fsanitize=address,undefined
         - CXXFLAGS="-Wall -Wextra" # -m64 -fsanitize=address,undefined
-        - CMAKE_EXTRA="-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=ON -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF"
-        - B_NAME=fsanitize
+        # http://stackoverflow.com/questions/15678153/homebrew-python-on-mac-os-x-10-8-fatal-python-error-pythreadstate-get-no-cu
+        #- CMAKE_EXTRA="-DGDCM_WRAP_PYTHON:BOOL=ON -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2.7"
+        - CMAKE_EXTRA="-DGDCM_WRAP_PYTHON:BOOL=ON -DGDCM_WRAP_CSHARP:BOOL=OFF -DGDCM_WRAP_JAVA:BOOL=ON -DGDCM_USE_SYSTEM_UUID:BOOL=ON -DGDCM_USE_SYSTEM_ZLIB:BOOL=ON -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF"
+        - B_NAME=default
+        - CPACK_NAME=Darwin
 
 before_install:
   #- env
   - cmake --version
   #- swig -version
-  # do not run the full test suite for now
-  - mv Testing/Data Testing/Data.old
+  # do not run the full test suite for now on fsanitize and osx (takes too long)
+  - if [ "$B_NAME" == "fsanitize" ]; then mv Testing/Data Testing/Data.old; fi
+  # https://docs.travis-ci.com/user/osx-ci-environment/#Environment-variables
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then mv Testing/Data Testing/Data.old; fi
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update                     ; fi
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install swig docbook-xsl   ; fi
+  # https://github.com/travis-ci/travis-ci/issues/2312
+  #- if [ "$TRAVIS_OS_NAME" == "osx" ]; then virtualenv env -p python3       ; fi
+  #- if [ "$TRAVIS_OS_NAME" == "osx" ]; then source env/bin/activate         ; fi
+  # kakadu setup for linux/system:
+  - if [ "$B_NAME" == "system" ]; then wget http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Linux-x86-64_150710.zip; fi
+  - if [ "$B_NAME" == "system" ]; then unzip KDU77_Demo_Apps_for_Linux-x86-64_150710.zip; fi
+  - if [ "$B_NAME" == "system" ]; then export PATH=$PATH:$PWD/KDU77_Demo_Apps_for_Linux-x86-64_150710; fi
 install: true
-before_script: true
-script:
-  - cmake -Wno-dev -G "Unix Makefiles" -DCMAKE_BUILD_TYPE:STRING=None -DGDCM_BUILD_TESTING:BOOL=ON -DGDCM_BUILD_APPLICATIONS:BOOL=ON -DGDCM_BUILD_SHARED_LIBS:BOOL=ON -DGDCM_ALLOW_INSOURCE_BUILD:BOOL=ON -DBUILDNAME:STRING=${TRAVIS_OS_NAME}-${TRAVIS_BRANCH}-${B_NAME} ${CMAKE_EXTRA} .
+before_script:
+  - cmake -Wno-dev -G "Unix Makefiles" -DCMAKE_BUILD_TYPE:STRING=None -DGDCM_BUILD_TESTING:BOOL=ON -DGDCM_BUILD_APPLICATIONS:BOOL=ON -DGDCM_BUILD_SHARED_LIBS:BOOL=ON -DBUILDNAME:STRING=${TRAVIS_OS_NAME}-${TRAVIS_BRANCH}-${B_NAME} ${CMAKE_EXTRA} .
   - ctest -D ExperimentalStart
+script:
   - ctest -D ExperimentalBuild -j2
   - ctest -D ExperimentalTest -j2 || true
+after_success:
   - ctest -D ExperimentalSubmit || true
-
-after_success: true
+  # prefer after_success since before_deploy is not called (conditions unmet)
+  - cpack -G TGZ
+  - cpack -G TBZ2
 after_failure: true
+
+before_deploy:
+- VTAG=$(echo $TRAVIS_TAG | cut -f2 -dv)
+deploy:
+  edge: true
+  provider: releases
+  api_key:
+    secure: R5+dbibdcgPHq6cAPC8uepifDuS3yjZu2dBB2oSeQtBZTAeN1VIfJMrF8TeQDqj2GC28RHxXm4BHwdJ2FUpBXjOS2eUE6Mto1Rbbvfi63MREnFPIAWkNyLtR2Jxq/Gzb8X05PbCWGwCNvX9eeo+qcWTpczuQvJ+/bds7MyRsk45+sUc+j7rglAbxewgijsXebCkObwaXmhqTYJwrvf2lyEnA2Jo1gL2WmK6iPjHvTOVS9JfBMqVRmlk7j8efnqag8fMCzNp1Ess5wBy5Jf58qvVs7RuuBi16s7vOOBtb9xVjcDB1KaAxc/dDQGQhRkrveBtH18ZpFrArOj6DBPbupS3+xuU4ywdYbCuGnvdpRFafBc+iNU4M81crkFUDmSPEQChBnL4wwpaYaQ1LlgdlF0r9/Rlu2/iqKe4t7rdZnkQqQ/3SNNf+x4AKnGmaSGasV/VUXstTGVrtl7hsDMzSdrVCXODao0SRv5tPSI3BgAZi7NzCJ/xv5LgA1EQVkGdTQN0ZpKZCQYfifL5K6oYDI+WlAFU0OcH+9dy4KNqF+QnzMh9iPwP0zR6BN9yE0w6ydnyNt0CkIUaxgaTtr+pHPXsmmtgXzQScESC8B9JHGocOXjT6MtyUmoP/ewlPz2G6x114PnAL7LlZ07jPqAASJwW/ZiXtBcVxv50hPhC7L80=
+  file:
+  - GDCM-$VTAG-$CPACK_NAME-x86_64.tar.gz
+  - GDCM-$VTAG-$CPACK_NAME-x86_64.tar.bz2
+  skip_cleanup: true
+  on:
+    repo: malaterre/GDCM
+    condition: $B_NAME = default
+    all_branches: true
+    tags: true
+
+# final
 after_script: true
 
 addons:
   coverity_scan:
     project:
-      name: "malaterre/GDCM"
+      name: malaterre/GDCM
       description: "Grassroots DICOM"
     notification_email: mat...@gm...
-    build_command_prepend: cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DGDCM_BUILD_SHARED_LIBS:BOOL=ON -DGDCM_ALLOW_INSOURCE_BUILD:BOOL=ON -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF ..
+    build_command_prepend: cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo
+      -DGDCM_BUILD_SHARED_LIBS:BOOL=ON ..
     build_command: cmake --build .
     branch_pattern: coverity_scan
diff --git a/appveyor.yml b/appveyor.yml
index 3cd45cabd..6b8954dd3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,7 +2,7 @@
 # http://www.appveyor.com/docs/appveyor-yml
 
 # Set build version format here instead of in the admin panel.
-version: 2.9.0.{build}
+version: 3.0.0.{build}
 
 # http://www.appveyor.com/docs/build-cache#caching-chocolatey-packages
 # https://github.com/kvirc/KVIrc/blob/master/.appveyor.yml
@@ -23,13 +23,13 @@ cache:
 
 environment:
   matrix:
-  - VS_GEN: Visual Studio 12 2013
+  - VS_GEN: Visual Studio 10 2010
     CONFIG: Release
     B_NAME: Windows-x86
     DO_REL: true
     PYTHONHOME: C:\Python27
     JAVA_HOME: C:\Program Files (x86)\Java\jdk1.7.0
-  - VS_GEN: Visual Studio 12 2013 Win64
+  - VS_GEN: Visual Studio 10 2010 Win64
     CONFIG: Release
     B_NAME: Windows-x86_64
     DO_REL: true
@@ -58,8 +58,7 @@ branches:
   - coverity_scan
 
 #You can disable builds on new tags through UI (General tab of project settings) or in appveyor.yml:
-# skip tag building since v2.7.0 will trigger an infinite loop
-skip_tags: true
+#skip_tags: true
 
 # scripts that are called at very beginning, before repo cloning
 init:
@@ -112,9 +111,9 @@ before_build:
 # scripts to run after build
 after_build:
   # create NSIS installer
-  - cpack -G NSIS -C %CONFIG% || true
+  - cpack -G NSIS -C %CONFIG%
   # create binary zip
-  - cpack -G ZIP -C %CONFIG% || true
+  - cpack -G ZIP -C %CONFIG%
   # no need for source release on github
 
 # to run your custom scripts instead of automatic MSBuild
@@ -163,13 +162,13 @@ deploy:
   - provider: GitHub
     auth_token:
       secure: 7HmfZp9O7bVdQo2hRk6FjOUs7jJosftv2rZ6JPBNzjPcAOMXDTvLqv3lvzdAzBfy
-    release: v2.9.0
-    description: 'Beta release of GDCM v$(appveyor_build_version)'
+    release: $(appveyor_repo_tag_name)
+    description: 'Release of GDCM $(appveyor_repo_tag_name)'
     # github automatically does source zip/tarball for us
     artifact: installer,zip_executable
     draft: false
-    prerelease: true
+    prerelease: false
     on:
-      branch: master                # release from master branch only
-      appveyor_repo_tag: false      # deploy on tag push only
+      branch: release               # release from release branch only
+      appveyor_repo_tag: true       # deploy on tag push only
       do_rel: true

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml  | 90 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 appveyor.yml | 23 ++++++++--------
 2 files changed, 82 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
Grassroots DICOM