Skip to content

Commit db06eda

Browse files
dcwhitedcwhite
authored
Merge pull request #1991 from SCIInstitute/travis-updates
Travis updates
2 parents 208e1b0 + 6685189 commit db06eda

File tree

7 files changed

+51
-40
lines changed

7 files changed

+51
-40
lines changed

‎.travis.yml‎

Lines changed: 40 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,45 +6,71 @@ matrix:
66
dist: trusty
77
sudo: required
88
compiler: gcc
9-
env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
9+
env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF QT5=OFF
1010
- os: linux
1111
dist: trusty
1212
sudo: required
1313
compiler: clang
14-
env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
14+
env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF QT5=OFF
1515
- os: linux
1616
dist: xenial
1717
sudo: required
1818
compiler: clang
19-
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
19+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
20+
# - os: linux
21+
# dist: xenial
22+
# compiler: clang
23+
# env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=OFF
24+
# - os: linux
25+
# dist: bionic
26+
# compiler: clang
27+
# env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
2028
- os: osx
21-
osx_image: xcode7.2
22-
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
29+
osx_image: xcode7.3
30+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
2331
- os: osx
2432
osx_image: xcode8.3
25-
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
33+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
2634
- os: osx
27-
osx_image: xcode9.3
28-
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
35+
osx_image: xcode9.4
36+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
2937
- os: osx
3038
osx_image: xcode10.1
31-
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
39+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
40+
- os: osx
41+
osx_image: xcode10.3
42+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
43+
- os: osx
44+
osx_image: xcode11
45+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
3246
- os: osx
3347
osx_image: xcode7.2
34-
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF
48+
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=OFF
3549
- os: osx
3650
osx_image: xcode10.1
37-
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF
51+
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=ON
52+
- os: osx
53+
osx_image: xcode11
54+
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=ON
3855

3956
before_install:
4057
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then date -u; fi
4158
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then uname -a; fi
42-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build libqt4-dev qt4-qmake libqt4-opengl-dev; fi
43-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 30 scripts/getQt4Mac.sh; fi
59+
60+
install:
61+
- if [[ "$QT5" = "OFF" && "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build libqt4-dev qt4-qmake libqt4-opengl-dev; fi
62+
- if [[ "$QT5" = "ON" && "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build qt5-qmake qtbase5-dev; fi
63+
- if [[ "$QT5" = "OFF" && "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 30 scripts/getQt4Mac.sh; fi
64+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja; fi
65+
# TODO: figure out/test ccache
66+
#- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi
67+
# Verify qt 5.13, maybe not upgrade
68+
- if [[ "$QT5" = "ON" && "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt || true; fi
69+
- if [[ "$QT5" = "ON" && "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade qt || true; fi
4470

4571
script:
4672
- cd bin
47-
- cmake -GNinja -DTRAVIS_BUILD:BOOL=ON -DUSER_PYTHON_VERSION="${PYTHON_VERSION}" -DWITH_OSPRAY:BOOL=${OSPRAY_BUILD} ../Superbuild
73+
- cmake -GNinja -DTRAVIS_BUILD:BOOL=ON -DUSER_PYTHON_VERSION="${PYTHON_VERSION}" -DWITH_OSPRAY:BOOL=${OSPRAY_BUILD} -DQT5_BUILD:BOOL=${QT5} -DQt5_PATH=$(brew --prefix qt) ../Superbuild
4874
- travis_wait 80 ninja
4975
- cd SCIRun
5076
- ./Algorithm_Layer_Test

‎Superbuild/Superbuild.cmake‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,12 @@ OPTION(TRAVIS_BUILD "Slim build for Travis CI" OFF)
111111
MARK_AS_ADVANCED(TRAVIS_BUILD)
112112

113113
IF(TRAVIS_BUILD)
114+
SET(BUILD_TESTING OFF)
115+
SET(DOWNLOAD_TOOLKITS OFF)
116+
SET(BUILD_WITH_SCIRUN_DATA OFF)
114117
IF(APPLE)
115-
SET(BUILD_TESTING OFF)
116-
SET(DOWNLOAD_TOOLKITS OFF)
117-
SET(BUILD_WITH_SCIRUN_DATA OFF)
118+
# build everything; qt flag is in travis.yml
118119
ELSE()
119-
SET(QT5_BUILD OFF) # need to check this one
120-
SET(BUILD_TESTING OFF)
121-
SET(DOWNLOAD_TOOLKITS OFF)
122-
SET(BUILD_WITH_SCIRUN_DATA OFF)
123-
124120
IF(CMAKE_C_COMPILER_ID MATCHES "GNU")
125121
SET(BUILD_HEADLESS ON)
126122
SET(BUILD_WITH_PYTHON OFF)

‎scripts/getQt4Mac.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
brew tap cartr/qt4 || true
44
brew tap cartr/qt4
55
brew tap-pin cartr/qt4
6-
brew install cartr/qt4/qt ninja
6+
brew install cartr/qt4/qt

‎src/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\-(beta.[A-Za-z0-9_]+)\\-?.*" "\\1" VERS
119119
#MESSAGE(STATUS "Git version patch name: " "${VERSION_PATCH}")
120120

121121
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMake/Modules/Version.cc.in
122-
${CMAKE_CURRENT_SOURCE_DIR}/Core/Application/Version.cc)
123-
set(version_file "${CMAKE_CURRENT_SOURCE_DIR}/Core/Application/Version.cc")
122+
${CMAKE_CURRENT_BINARY_DIR}/Core/Application/Version.cc)
123+
set(version_file "${CMAKE_CURRENT_BINARY_DIR}/Core/Application/Version.cc")
124124

125125

126126
########################################################################

‎src/Core/Application/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/Core/Application/Application.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,17 @@ namespace Core
5050
/// @class Application
5151
/// @brief Application is the thread that processes all the actions in the program.
5252

53-
class Application;
54-
class ApplicationPrivate;
53+
struct ApplicationPrivate;
5554
typedef boost::shared_ptr<ApplicationPrivate> ApplicationPrivateHandle;
5655

5756

58-
class SCISHARE Application : boost::noncopyable //: public EventHandler, public RecursiveLockable
57+
class SCISHARE Application : boost::noncopyable
5958
{
6059
CORE_SINGLETON( Application );
6160

6261
private:
6362
Application();
64-
virtual ~Application();
63+
~Application();
6564

6665
public:
6766
void readCommandLine(int argc, const char* argv[]);
@@ -113,8 +112,6 @@ class SCISHARE Application : boost::noncopyable //: public EventHandler, public
113112
// static int GetMajorVersion();
114113
// static int GetMinorVersion();
115114
// static int GetPatchVersion();
116-
// static bool Is64Bit();
117-
// static bool Is32Bit();
118115
// static std::string GetApplicationName();
119116
// static std::string GetReleaseName();
120117
// static std::string GetApplicationNameAndVersion();

‎src/include/sci_defs/version_testdefs.h.in‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Copyright (c) 2015 Scientific Computing and Imaging Institute,
77
University of Utah.
88
9-
9+
1010
Permission is hereby granted, free of charge, to any person obtaining a
1111
copy of this software and associated documentation files (the "Software"),
1212
to deal in the Software without restriction, including without limitation
@@ -35,12 +35,5 @@
3535
#define SCIRUN_PATCH @SCIRUN_VERSION_PATCH@
3636

3737
#define SCIRUN_VERSION "@SCIRUN_VERSION_STRING@"
38-
#define SCIRUN_RCFILE_SUBVERSION "0"
39-
40-
#define SCIRUN_TCL_PACKAGE_VERSION "@SCIRUN_TCL_VERSION@"
41-
42-
#define SCIRUN_SVN_REVISION "@SCIRUN_SVN_WC_REVISION@"
43-
#define SCIRUN_SVN_URL "@SCIRUN_SVN_WC_URL@"
4438

4539
#endif
46-

0 commit comments

Comments
 (0)