ENH: Update ThreadWeaver to version 5.46.0.

starviewer-medical · Mar 5, 2020 · aaa6713 · aaa6713
1 parent cc9ab69
commit aaa6713
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -55,9 +55,9 @@ matrix:
  - PATH="$QTDIR/bin:$PATH"
  - LDFLAGS=-L$QTDIR/lib
  - CPPFLAGS=-I$QTDIR/include
- - wget -nv --directory-prefix=$HOME http:https://trueta.udg.edu/apt/macos/devel/0.15/starviewer-sdk-macos-0.15-3.tar.xz
+ - wget -nv --directory-prefix=$HOME http:https://trueta.udg.edu/apt/macos/devel/0.15/starviewer-sdk-macos-0.15-4.tar.xz
  - mkdir ~/sdk-0.15
- - tar xf ~/starviewer-sdk-macos-0.15-3.tar.xz -C ~/sdk-0.15
+ - tar xf ~/starviewer-sdk-macos-0.15-4.tar.xz -C ~/sdk-0.15
 
  script:
  - cd starviewer

diff --git a/Dockerfile b/Dockerfile
@@ -10,9 +10,9 @@ RUN apt-get install -qq libwrap0 libwrap0-dev zlib1g zlib1g-dev libssl-dev
 RUN rm -rf /var/lib/apt/lists/*
 RUN unset DEBIAN_FRONTEND
 
-RUN wget -nv --directory-prefix=/ http:https://trueta.udg.edu/apt/ubuntu/devel/0.15/starviewer-sdk-linux-0.15-3.tar.xz
+RUN wget -nv --directory-prefix=/ http:https://trueta.udg.edu/apt/ubuntu/devel/0.15/starviewer-sdk-linux-0.15-4.tar.xz
 RUN mkdir /sdk-0.15
-RUN tar xf /starviewer-sdk-linux-0.15-3.tar.xz -C /sdk-0.15
+RUN tar xf /starviewer-sdk-linux-0.15-4.tar.xz -C /sdk-0.15
 
 ENV SDK_INSTALL_PREFIX /sdk-0.15/usr/local
 ENV LD_LIBRARY_PATH /sdk-0.15/usr/local/lib:/sdk-0.15/usr/local/lib/x86_64-linux-gnu

diff --git a/appveyor.yml b/appveyor.yml
@@ -21,13 +21,13 @@ install:
 - ps: |
  # Setup precompiled SDK
 
- $source = "http:https://trueta.udg.edu/apt/windows/devel/0.15/starviewer-sdk-win$env:BITS-0.15-3.7z"
- $destination = "c:\starviewer-sdk-win$env:BITS-0.15-3.7z"
+ $source = "http:https://trueta.udg.edu/apt/windows/devel/0.15/starviewer-sdk-win$env:BITS-0.15-4.7z"
+ $destination = "c:\starviewer-sdk-win$env:BITS-0.15-4.7z"
  Invoke-WebRequest $source -OutFile $destination
 
  7z x $destination -oc:\ > 7z-output.txt
 
- $env:PATH = "$env:QTDIR\bin;c:\vtk\8.1.1\bin;c:\gdcm\2.8.6\bin;c:\ThreadWeaver\5.3.0\bin;$env:PATH"
+ $env:PATH = "$env:QTDIR\bin;c:\vtk\8.1.1\bin;c:\gdcm\2.8.6\bin;c:\ThreadWeaver\5.46.0\bin;$env:PATH"
 
 
  # Setup jom

diff --git a/sdk/library_versions.txt b/sdk/library_versions.txt
@@ -9,4 +9,4 @@ Si existeix vol dir que cal aplicar tots els patch que hi hagi en aquest directo
 - ITK 4.13.0
 - VTK 8.1.1
 - gdcm 2.8.6
-- ThreadWeaver 5.3.0
+- ThreadWeaver 5.46.0
diff --git a/sdk/scripts/unix/config/ecm.sh b/sdk/scripts/unix/config/ecm.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SOURCE_DIR="$SOURCE_DIR_BASE/threadweaver-5.3.0/extra-cmake-modules-1.3.0"
+SOURCE_DIR="$SOURCE_DIR_BASE/threadweaver-5.46.0/extra-cmake-modules-5.46.0"
 BUILD_DIR=$SOURCE_DIR
 
 ################ Nothing should need to be changed below this line ################

diff --git a/sdk/scripts/unix/config/threadweaver.sh b/sdk/scripts/unix/config/threadweaver.sh
@@ -3,7 +3,7 @@
 # Call ecm configuration script to make sure ECMCMAKEDIR is set
 . "$SCRIPTS_ROOT/config/ecm.sh"
 
-SOURCE_DIR="$SOURCE_DIR_BASE/threadweaver-5.3.0"
+SOURCE_DIR="$SOURCE_DIR_BASE/threadweaver-5.46.0"
 
 if [ $BUILD_TYPE = debug ]
 then

diff --git a/sdk/scripts/unix/sdk_download.sh b/sdk/scripts/unix/sdk_download.sh
@@ -58,14 +58,14 @@ do
  'https://freefr.dl.sourceforge.net/project/itk/itk/4.13/InsightToolkit-4.13.0.tar.xz'
  ;;
  ecm)
- download_and_verify ea8b6a648b7b2dc313df709940813c22ed5b68d2f7bef30acbaf2a83a6e4c723 \
- 'extra-cmake-modules-1.3.0.tar.xz' \
- 'https://download.kde.org/Attic/frameworks/5.3.0/extra-cmake-modules-1.3.0.tar.xz'
+ download_and_verify e5da3e1b67e19d7b8b5b1d867bb1e9a54d902d718e55148f3296da9f9a18c275 \
+ 'extra-cmake-modules-5.46.0.tar.xz' \
+ 'https://download.kde.org/stable/frameworks/5.46/extra-cmake-modules-5.46.0.tar.xz'
  ;;
  threadweaver)
- download_and_verify c15818ec6e6320bea79a0d44e29cb4fc19a0e0d428cccb979d6c3104ec65a838 \
- 'threadweaver-5.3.0.tar.xz' \
- 'https://download.kde.org/Attic/frameworks/5.3.0/threadweaver-5.3.0.tar.xz'
+ download_and_verify f858d1f4b7d567e0cfba00b56e15af75e0552a1d6e7afb6925bacf3964f7cd7e \
+ 'threadweaver-5.46.0.tar.xz' \
+ 'https://download.kde.org/stable/frameworks/5.46/threadweaver-5.46.0.tar.xz'
  ;;
  esac
 done
diff --git a/sdk/scripts/unix/sdk_extract.sh b/sdk/scripts/unix/sdk_extract.sh
@@ -35,11 +35,11 @@ do
  tar -C "${SOURCE_DIR_BASE}" -xvf "${DOWNLOAD_PREFIX}/InsightToolkit-4.13.0.tar.xz"
  ;;
  ecm)
- mkdir -p "${SOURCE_DIR_BASE}/threadweaver-5.3.0"
- tar -C "${SOURCE_DIR_BASE}/threadweaver-5.3.0" -xvf "${DOWNLOAD_PREFIX}/extra-cmake-modules-1.3.0.tar.xz"
+ mkdir -p "${SOURCE_DIR_BASE}/threadweaver-5.46.0"
+ tar -C "${SOURCE_DIR_BASE}/threadweaver-5.46.0" -xvf "${DOWNLOAD_PREFIX}/extra-cmake-modules-5.46.0.tar.xz"
  ;;
  threadweaver)
- tar -C "${SOURCE_DIR_BASE}" -xvf "${DOWNLOAD_PREFIX}/threadweaver-5.3.0.tar.xz"
+ tar -C "${SOURCE_DIR_BASE}" -xvf "${DOWNLOAD_PREFIX}/threadweaver-5.46.0.tar.xz"
  ;;
  esac
 done
diff --git a/sdk/scripts/windows/config/ecm.cmd b/sdk/scripts/windows/config/ecm.cmd
@@ -1,5 +1,5 @@
-set SourceDir=%SourceDirPrefix%\extra-cmake-modules-1.3.0
-set BuildDir=%BuildDirPrefix%\extra-cmake-modules-1.3.0-rel
+set SourceDir=%SourceDirPrefix%\extra-cmake-modules-5.46.0
+set BuildDir=%BuildDirPrefix%\extra-cmake-modules-5.46.0-rel
 set InstallPrefix=%SourceDir%-%Arch%
 
 REM ============== Nothing should need to be changed below this line ==============

diff --git a/sdk/scripts/windows/config/threadweaver.cmd b/sdk/scripts/windows/config/threadweaver.cmd
@@ -1,18 +1,18 @@
 REM Call ecm configuration script to make sure EcmDir is set
 call "%ScriptsRoot%\config\ecm.cmd"
 
-set SourceDir=%SourceDirPrefix%\threadweaver-5.3.0
-set BuildDir=%BuildDirPrefix%\threadweaver-5.3.0
+set SourceDir=%SourceDirPrefix%\threadweaver-5.46.0
+set BuildDir=%BuildDirPrefix%\threadweaver-5.46.0
 
 if %BuildType% == debug (
  set CMakeBuildType=Debug
  set BuildDir=%BuildDir%-deb
- set InstallPrefix=%SdkInstallPrefix%/ThreadWeaver/5.3.0d
+ set InstallPrefix=%SdkInstallPrefix%/ThreadWeaver/5.46.0d
 )
 if %BuildType% == release (
  set CMakeBuildType=RelWithDebInfo
  set BuildDir=%BuildDir%-rel
- set InstallPrefix=%SdkInstallPrefix%/ThreadWeaver/5.3.0
+ set InstallPrefix=%SdkInstallPrefix%/ThreadWeaver/5.46.0
 )
 
 REM ============== Nothing should need to be changed below this line ==============

diff --git a/starviewer/src/defaultdirectories.pri b/starviewer/src/defaultdirectories.pri
@@ -70,12 +70,12 @@ isEmpty(THREADWEAVERLIBDIR){
  exists(/etc/debian_version):unix:THREADWEAVERLIBDIR = $$SDK_INSTALL_PREFIX/lib/x86_64-linux-gnu # Debian-based systems
  !exists(/etc/debian_version):unix:THREADWEAVERLIBDIR = $$SDK_INSTALL_PREFIX/lib64 # Other systems
  macx:THREADWEAVERLIBDIR = $$SDK_INSTALL_PREFIX/lib
- win32:THREADWEAVERLIBDIR = $$SDK_INSTALL_PREFIX/ThreadWeaver/5.3.0/lib
+ win32:THREADWEAVERLIBDIR = $$SDK_INSTALL_PREFIX/ThreadWeaver/5.46.0/lib
 }
 THREADWEAVERINCLUDEDIR = $$(THREADWEAVERINCLUDEDIR)
 isEmpty(THREADWEAVERINCLUDEDIR){
  unix:THREADWEAVERINCLUDEDIR = $$SDK_INSTALL_PREFIX/include/KF5
- win32:THREADWEAVERINCLUDEDIR = $$SDK_INSTALL_PREFIX/ThreadWeaver/5.3.0/include/KF5
+ win32:THREADWEAVERINCLUDEDIR = $$SDK_INSTALL_PREFIX/ThreadWeaver/5.46.0/include/KF5
 }