upgrade to Qt 5.9.2 + Qt WebEngine

CMakeCompiler.txt

@@ -13,6 +13,15 @@
 #
 #
 
+# include guard
+if(RSTUDIO_CMAKE_COMPILER_INCLUDED)
+   return()
+endif()
+set(RSTUDIO_CMAKE_COMPILER_INCLUDED YES)
+
+# require position independent code for CMake targets
+set(CMAKE_POSITION_INDEPENDENT_CODE Yes)
+
 # use clang on osx
 if(APPLE)
 
@@ -26,13 +35,46 @@ if(APPLE)
 
 endif()
 
-# use Rtools on Windows (mainly for Qt Creator)
-if(WIN32 AND NOT DEFINED RSTUDIO_PACKAGE_BUILD)
-  set(RTOOLS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../dependencies/windows/Rtools33")
-  string(REGEX REPLACE "/" "\\\\" RTOOLS_TOOLCHAIN_32BIT_PATH "${RTOOLS_PATH}/mingw_32/bin")
-  set(ENV{PATH} "${RTOOLS_TOOLCHAIN_32BIT_PATH}")
-  set(WINDRES "${RTOOLS_TOOLCHAIN_32BIT_PATH}\\windres.exe")
-  message(STATUS "The PATH is $ENV{PATH}")
+# require C++11 (or C++14 for MSVC)
+if(MSVC)
+
+  # use C++14 (MSVC doesn't support C++11)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++14")
+
+  # ensure that we're using linker flags compatible with
+  # the version of Boost that will be linked in
+  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+     set(ITERATOR_DEBUG_LEVEL 0)
+     set(LINKER_FLAG "/MD")
+  else()
+     set(ITERATOR_DEBUG_LEVEL 2)
+     set(LINKER_FLAG "/MDd")
+  endif()
+
+  foreach(RELEASE_TYPE "" "_DEBUG" "_RELEASE" "_MINSIZEREL" "_RELWITHDEBINFO")
+    foreach(FLAG CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
+      string(REGEX REPLACE "/MDd?" "${LINKER_FLAG}" ${FLAG}${RELEASE_TYPE} "${${FLAG}${RELEASE_TYPE}}")
+    endforeach()
+  endforeach()
+
+  # disable CMake's automatic manifest generation (we always provide our own)
+  foreach(TYPE EXE MODULE SHARED)
+    set(CMAKE_${TYPE}_LINKER_FLAGS "${CMAKE_${TYPE}_LINKER_FLAGS} /MANIFEST:NO")
+  endforeach()
+
+  # multi-process compilation
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+
+  # silence some warnings (mostly out of our control) + set debug level
+  add_definitions(
+    -D_CRT_NONSTDC_NO_DEPRECATE
+    -D_CRT_SECURE_NO_WARNINGS
+    -D_SCL_SECURE_NO_WARNINGS
+    -D_ITERATOR_DEBUG_LEVEL=${ITERATOR_DEBUG_LEVEL}
+    )
+
+else()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 endif()
 
 if(NOT DEFINED WINDRES)

CMakeGlobals.txt

@@ -13,6 +13,12 @@
 #
 #
 
+# include guard
+if(RSTUDIO_CMAKE_GLOBALS_INCLUDED)
+   return()
+endif()
+set(RSTUDIO_CMAKE_GLOBALS_INCLUDED YES)
+
 # version info
 if ("$ENV{RSTUDIO_VERSION_MAJOR}" STREQUAL "")
   set(CPACK_PACKAGE_VERSION_MAJOR "99")
@@ -39,11 +45,12 @@ endif()
 
 # default to debug builds
 if(NOT CMAKE_BUILD_TYPE)
+   message(STATUS "CMake build type not set; defaulting to debug build")
    set(CMAKE_BUILD_TYPE "Debug")
 endif()
 
-# enable testing on all builds unless specifically disabled
-if (NOT RSTUDIO_UNIT_TESTS_DISABLED)
+# enable testing on debug builds
+if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT RSTUDIO_UNIT_TESTS_DISABLED)
   set(RSTUDIO_UNIT_TESTS_ENABLED true)
   add_definitions(-DRSTUDIO_UNIT_TESTS_ENABLED)
 endif()
@@ -64,10 +71,15 @@ if( ${RSTUDIO_TARGET} STREQUAL "Development" OR ${RSTUDIO_TARGET} STREQUAL "Desk
 endif()
 
 # set session64 if specified
-if (${RSTUDIO_TARGET} STREQUAL "SessionWin64")
+if(RSTUDIO_TARGET STREQUAL "SessionWin64")
    set(RSTUDIO_SESSION_WIN64 TRUE)
 endif()
 
+# prefer 64bit session when using 64bit toolchain
+if(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(RSTUDIO_SESSION_WIN64 TRUE)
+endif()
+
 # record git revision hash (cache it since we don't use this in development
 # mode and we don't want it to force rebuilds there)
 if(NOT RSTUDIO_SESSION_WIN64 AND NOT RSTUDIO_GIT_REVISION_HASH)
@@ -163,4 +175,5 @@ endif()
 # make sure the CMAKE_INSTALL_PREFIX uses a cmake style path
 file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX)
 
-
+# include utilities
+include(RStudioCMakeUtils)

CMakeLists.txt

@@ -13,12 +13,12 @@
 #
 #
 
-# set compiler
-include(CMakeCompiler.txt)
-
 cmake_minimum_required(VERSION 2.6)
 project (RStudio)
 
+# set compiler
+include(CMakeCompiler.txt)
+
 # project globals
 include(CMakeGlobals.txt)
 

Jenkinsfile

@@ -142,13 +142,11 @@ messagePrefix = "Jenkins ${env.JOB_NAME} build: <${env.BUILD_URL}display/redirec
 try {
     timestamps {
         def containers = [
-          [os: 'precise',  arch: 'amd64',  flavor: 'desktop', variant: 'trusty'],
           [os: 'precise',  arch: 'amd64',  flavor: 'server',  variant: ''],
           [os: 'centos6',  arch: 'x86_64', flavor: 'server',  variant: ''],
           [os: 'centos6',  arch: 'x86_64', flavor: 'server',  variant: 'SLES'],
           [os: 'centos7',  arch: 'x86_64', flavor: 'desktop', variant: ''],
-          [os: 'xenial',   arch: 'amd64',  flavor: 'desktop', variant: 'xenial'],
-          [os: 'xenial',   arch: 'amd64',  flavor: 'server', variant: 'xenial'],
+          [os: 'trusty',   arch: 'amd64',  flavor: 'desktop', variant: ''],
           [os: 'debian9',  arch: 'x86_64', flavor: 'server', variant: 'stretch']
         ]
         containers = limit_builds(containers)

cmake/modules/FindLibR.cmake

@@ -29,7 +29,7 @@ if(APPLE)
       set(LIBR_EXECUTABLE "${LIBR_HOME}/R" CACHE PATH "R executable")
    else()
       get_filename_component(_LIBR_LIBRARIES "${LIBR_LIBRARIES}" REALPATH)
-      get_filename_component(_LIBR_LIBRARIES_DIR "${_LIBR_LIBRARIES}" DIRECTORY)
+      get_filename_component(_LIBR_LIBRARIES_DIR "${_LIBR_LIBRARIES}" PATH)
       set(LIBR_EXECUTABLE "${_LIBR_LIBRARIES_DIR}/../bin/R")
       execute_process(
          COMMAND ${LIBR_EXECUTABLE} "--slave" "--vanilla" "-e" "cat(R.home())"
@@ -118,11 +118,19 @@ else()
 
       # set library hint path based on whether  we are doing a special session 64 build
       if(LIBR_FIND_WINDOWS_64BIT)
+         set(LIBR_ARCH "x64")
          set(LIBRARY_ARCH_HINT_PATH "${LIBR_HOME}/bin/x64")
       else()
+         set(LIBR_ARCH "i386")
          set(LIBRARY_ARCH_HINT_PATH "${LIBR_HOME}/bin/i386")
       endif()
 
+      # call dll2lib.R to ensure export files are generated
+      execute_process(
+         COMMAND "${LIBR_HOME}/bin/${LIBR_ARCH}/Rscript.exe" "dll2lib.R"
+         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/tools"
+         RESULT_VARIABLE LIBR_DLL2LIB_RESULT)
+
    endif()
 
    # look for the R executable
@@ -186,6 +194,7 @@ find_package_handle_standard_args(LibR DEFAULT_MSG
 
 if(LIBR_FOUND)
    message(STATUS "Found R: ${LIBR_HOME}")
+   get_filename_component(LIBR_BIN_DIR "${LIBR_EXECUTABLE}" PATH CACHE)
 endif()
 
 # mark low-level variables from FIND_* calls as advanced

cmake/modules/RStudioCMakeUtils.cmake

@@ -0,0 +1,28 @@
+include(CMakeParseArguments)
+
+function(download URL FILE)
+
+   get_filename_component(FILENAME "${FILE}" NAME)
+   if (EXISTS "${FILE}")
+      message(STATUS "${FILENAME} already exists; skipping download")
+      return()
+   endif()
+
+   # perform the download
+   message(STATUS "Downloading ${FILENAME}")
+   file(DOWNLOAD "${URL}" "${FILE}" STATUS STATUS)
+
+   # check status
+   list(GET STATUS 0 EC)
+   list(GET STATUS 1 MSG)
+   if(NOT EC EQUAL 0)
+      message(FATAL_ERROR "Download failed: ${MSG}")
+   endif()
+   message(STATUS "Downloading ${FILENAME} - Success")
+
+endfunction()
+
+function(install_process)
+   cmake_parse_arguments(install_process "" "" "COMMAND" ${ARGN})
+   install(CODE "execute_process(COMMAND ${install_process_COMMAND} WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\")")
+endfunction()

dependencies/linux/install-qt-sdk

@@ -28,19 +28,7 @@ else
   QT_ARCH=x86
 fi
 
-# presume 5.4.0
-QT_VERSION=5.4.0
-
-# test for libgstreamer
-which apt-cache > /dev/null
-if [ $? == 0 ]; then
-  # debian (currently no test for CentOS based systems)
-  apt-cache show libgstreamer1.0 > /dev/null
-  if [ $? == 0 ]; then
-    QT_VERSION=5.4.2
-  fi
-fi
-
+QT_VERSION=5.9.2
 QT_SDK_BINARY=QtSDK-${QT_VERSION}-${QT_ARCH}.tar.gz
 QT_SDK_URL=https://s3.amazonaws.com/rstudio-buildtools/$QT_SDK_BINARY
 

dependencies/osx/install-dependencies-osx

@@ -3,7 +3,7 @@
 #
 # install-dependencies-osx
 #
-# Copyright (C) 2009-12 by RStudio, Inc.
+# Copyright (C) 2009-18 by RStudio, Inc.
 #
 # Unless you have received this program directly from RStudio pursuant
 # to the terms of a commercial license agreement with RStudio, then
@@ -26,6 +26,11 @@ cd ../common
 ./install-common
 cd ../osx
 
+# desktop dependencies (qt)
+if [ "$1" != "--exclude-qt-sdk" ]
+then
+   ./install-qt-sdk-osx
+fi
 
 # enable PAM
-sudo cp /etc/pam.d/ftpd /etc/pam.d/rstudio
+sudo cp /etc/pam.d/cups /etc/pam.d/rstudio

dependencies/osx/install-qt-sdk-osx

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+#
+# install-qt-sdk-osx
+#
+# Copyright (C) 2009-18 by RStudio, Inc.
+#
+# Unless you have received this program directly from RStudio pursuant
+# to the terms of a commercial license agreement with RStudio, then
+# this program is licensed to you under the terms of version 3 of the
+# GNU Affero General Public License. This program is distributed WITHOUT
+# ANY EXPRESS OR IMPLIED WARRANTY, INCLUDING THOSE OF NON-INFRINGEMENT,
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Please refer to the
+# AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details.
+#
+#
+
+# This archive includes the files required to build against Qt. It
+# was created by installing Qt via an interactive installer, and
+# manually removing components not needed by RStudio.
+
+QT_VERSION=5.9.2
+QT_SDK_BINARY=QtSDK-${QT_VERSION}-mac.tar.gz
+QT_SDK_URL=https://s3.amazonaws.com/rstudio-buildtools/$QT_SDK_BINARY
+
+# set Qt SDK dir if not already defined
+if [ -z "$QT_SDK_DIR" ]; then
+  QT_SDK_DIR=~/Qt${QT_VERSION}
+fi
+
+if ! test -e $QT_SDK_DIR
+then
+   # download and install
+   curl -L $QT_SDK_URL > /tmp/$QT_SDK_BINARY
+   cd `dirname $QT_SDK_DIR`
+   tar xzf /tmp/$QT_SDK_BINARY
+   rm /tmp/$QT_SDK_BINARY
+else
+   echo "Qt $QT_VERSION SDK already installed"
+fi
+

dependencies/windows/.gitignore

@@ -11,3 +11,4 @@ winutils/
 rtools*
 winpty*/
 openssl*/
+*.zip

dependencies/windows/install-boost.cmd

@@ -1,4 +1,5 @@
 @echo off
 cd install-boost
-R --vanilla --slave -f install-boost.R
+R --vanilla --slave -f install-boost.R --args debug static
+R --vanilla --slave -f install-boost.R --args release static
 cd ..