diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile index 03c4159fc6ba..929ce07ed0c5 100644 --- a/devel/RStudio/Makefile +++ b/devel/RStudio/Makefile @@ -1,152 +1,152 @@ # This port opens too many files during build, more than the default setting. # Its build is known to succeed with MAX_FILES_RStudio=4096 in poudriere.conf PORTNAME= RStudio DISTVERSIONPREFIX= v -DISTVERSION= 2022.02.3+492 +DISTVERSION= 2022.07.0+548 CATEGORIES= devel math java MASTER_SITES= https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \ https://s3.amazonaws.com/rstudio-buildtools/:buildtools DISTFILES= core-dictionaries.zip:dictionaries \ gin-${GIN_VERSION}.zip:buildtools \ gwt-${GWT_VERSION}.zip:buildtools \ mathjax-27.zip:buildtools MAINTAINER= yuri@FreeBSD.org COMMENT= Integrated development environment (IDE) for R LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_i386= [ERROR] Line 101: Failed to resolve 'org.rstudio.studio.client.workbench.views.vcs.common.diff.LineActionButtonRenderer.GrayResources' via deferred binding BUILD_DEPENDS= ant:devel/apache-ant \ ${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo \ node:www/node \ pandoc:textproc/hs-pandoc \ R-cran-rstudioapi>0:devel/R-cran-rstudioapi LIB_DEPENDS= libR.so:math/R \ libboost_thread.so:devel/boost-libs \ libinotify.so:devel/libinotify \ libsoci_core.so:databases/soci \ libuuid.so:misc/e2fsprogs-libuuid \ libyaml-cpp.so:devel/yaml-cpp FLAVORS= desktop server FLAVOR?= ${FLAVORS:[1]} server_PKGNAMESUFFIX= -server USES= cmake fortran localbase:ldflags pgsql pkgconfig sqlite ssl USE_JAVA= yes JAVA_VERSION= 11 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=1644, tid=0x00000000000c62b6 guarantee(val < (1U << nbits)) failed: Field too big for insn JAVA_BUILD= yes USE_GITHUB= yes GH_PROJECT= ${PORTNAME:tl} GH_TUPLE= rstudio:r2d3:v0.2.0:r2d3/dependencies/common/r2d3 \ rstudio:rmarkdown:aed26ac:rmarkdown/dependencies/common/rmarkdown \ rstudio:rsconnect:03c379b:rsconnect/dependencies/common/rsconnect \ trestletech:plumber:v0.4.6:plumber/dependencies/common/plumber CMAKE_ARGS= -DFREEBSD_RSTUDIO_VERSION:STRING=${PORTVERSION} \ -DFREEBSD_LIBDIR:STRING=${PREFIX}/lib CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE:STRING=${QMAKE} CMAKE_ARGS+= -DRSTUDIO_BOOST_SIGNALS_VERSION=2 CMAKE_ARGS+= -DFREEBSD_PORT_VERSION:STRING=${DISTVERSION} CMAKE_ARGS+= -DFREEBSD_LOCALBASE:STRING=${LOCALBASE} # SOCI package is looked up here, see patch patch-src_cpp_CMakeLists.txt CMAKE_ON= RSTUDIO_USE_SYSTEM_YAML_CPP \ RSTUDIO_USE_SYSTEM_SOCI MAKE_ENV= HOME=${WRKDIR} \ JAVA_HOME=${JAVA_HOME} \ PATH=${JAVA_HOME}/bin:${PATH} \ ANT_OPTS="-Duser.home=${WRKDIR}" GWT_VERSION= 2.8.1 GIN_VERSION= 2.1.2 .if ${FLAVOR:U} == desktop COMMENT+= (desktop UI version) USES+= desktop-file-utils qt:5 shared-mime-info USE_QT= core dbus declarative gui location network opengl printsupport quickcontrols sensors \ sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools_build qmake_build CMAKE_ARGS+= -DRSTUDIO_TARGET=Desktop INSTALL_SUBDIR= ${PORTNAME:tl} EXECUTABLE= ${PORTNAME:tl} .endif .if ${FLAVOR:U} == server COMMENT+= (web UI version) CMAKE_ARGS+= -DRSTUDIO_TARGET=Server LDFLAGS+= -linotify INSTALL_SUBDIR= ${PORTNAME:tl}-server EXECUTABLE= rserver USER= nobody SUB_LIST= USER=${USER} USE_RC_SUBR= ${PORTNAME:tl}-server .endif OPTIONS_DEFINE= WITH_QUARTO WITH_QUARTO_DESC= Build with support for Quarto WITH_QUARTO_CMAKE_BOOL= FREEBSD_QUARTO_ENABLED WITH_QUARTO_BROKEN= Quarto isn't yet ported post-extract: @${MKDIR} ${WRKSRC}/dependencies/dictionaries && ${MV} ${WRKDIR}/en_* ${WRKSRC}/dependencies/dictionaries/ @${MV} ${WRKDIR}/mathjax-* ${WRKSRC}/dependencies/ @${MKDIR} ${WRKSRC}/src/gwt/lib/gwt && ${MV} ${WRKDIR}/gwt-${GWT_VERSION} ${WRKSRC}/src/gwt/lib/gwt/${GWT_VERSION} @${MKDIR} ${WRKSRC}/src/gwt/lib/gin/${GIN_VERSION} && ${MV} ${WRKDIR}/*.jar ${WRKSRC}/src/gwt/lib/gin/${GIN_VERSION}/ post-patch: @${REINPLACE_CMD} -e ' \ s|target_link_libraries(rstudio|target_link_libraries(rstudio procstat|; \ s|get_filename_component|#get_filename_component|; \ s|set(CMAKE_PREFIX_PATH "$${QT_BIN_DIR}//..//lib//cmake")|set(CMAKE_PREFIX_PATH "${LOCALBASE}/lib/cmake")|; \ s|/usr/share/|${PREFIX}/share/|g' \ ${WRKSRC}/src/cpp/desktop/CMakeLists.txt @${REINPLACE_CMD} -e ' \ s|||' \ ${WRKSRC}/src/gwt/build.xml @${REINPLACE_CMD} -e ' \ s|rHomePaths.push_back|//rHomePaths.push_back|; \ s|//rHomePaths.push_back(FilePath("/usr/local/lib/|rHomePaths.push_back(FilePath("${PREFIX}/lib/|' \ ${WRKSRC}/src/cpp/core/r_util/RVersionsPosix.cpp @${REINPLACE_CMD} -e ' \ s|||' \ ${WRKSRC}/src/gwt/build.xml pre-build: @${CP} ${FILESDIR}/global-setenv.h ${WRKSRC}/src/cpp/desktop/ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cpp/desktop/global-setenv.h post-install: @(echo "#!/bin/sh"; \ echo ""; \ echo "if ! [ -d /proc/curproc ]; then"; \ echo " echo \"${PORTNAME} needs /proc to be mounted as procfs\" >&2"; \ echo " exit 1"; \ echo "fi"; \ echo ""; \ echo "# workaround for the problem that RStudio passes /lib with LD_LIBRARY_PATH that causes the /lib/libgcc_s.so.1 conflict with gcc"; \ echo "LD_PRELOAD=${PREFIX}/lib/gcc${GCC_DEFAULT}/libgcc_s.so JAVA_HOME=${JAVA_HOME} ${PREFIX}/lib/${INSTALL_SUBDIR}/bin/${EXECUTABLE} \"$$"@"\"" \ ) > ${STAGEDIR}${PREFIX}/bin/${EXECUTABLE} @${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${EXECUTABLE} .if ${FLAVOR:U} == desktop ${REINPLACE_CMD} -i '' -e 's|^Exec=.*/rstudio|Exec=${PREFIX}/bin/${EXECUTABLE}|' ${STAGEDIR}${PREFIX}/share/applications/${EXECUTABLE}.desktop .endif .if ${FLAVOR:U} == server ${RM} ${STAGEDIR}${LOCALBASE}/lib/${INSTALL_SUBDIR}/bin/rstudio-server # not compatible with FreeBSD .endif # Some functions expect the pandoc symlink. @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${INSTALL_SUBDIR}/bin/pandoc @cd ${STAGEDIR}${PREFIX}/lib/${INSTALL_SUBDIR}/bin/pandoc && ${LN} -s ../../../../bin/pandoc # Add $LOCALBASE/bin to PATH to allow RStudio-server to run gmake (R_HOME/etc/Renviron.site is installed, see https://stat.ethz.ch/R-manual/R-devel/library/base/html/Startup.html) .if ${FLAVOR:U} == server #@${MKDIR} ${STAGEDIR}${LOCALBASE}/lib/R/etc #@${ECHO} "PATH=\"${LOCALBASE}/bin:\$$PATH\"" > ${STAGEDIR}${LOCALBASE}/lib/R/etc/Renviron.site # it should be this way, but this fails: https://github.com/rstudio/rstudio/issues/9815 @${LN} -s ${LOCALBASE}/bin/${GMAKE} ${STAGEDIR}${PREFIX}/lib/rstudio-server/bin/postback/${GMAKE} # hack, should be as above, but at least gmake is in the path now .endif # There is a variability in .js file names due to use of random numbers, so we use the automatic plist. @${SETENV} ${CO_ENV} ${SH} ${SCRIPTSDIR}/check-stagedir.sh makeplist | ${GREP} -v ^\/ | ${SED} -e 's|%%WWWDIR%%|www/rstudio| ; s|%%CMAKE_BUILD_TYPE%%|${CMAKE_BUILD_TYPE:tl}|' > ${TMPPLIST} .include diff --git a/devel/RStudio/distinfo b/devel/RStudio/distinfo index b1dc9b3146b4..5f294d50fee3 100644 --- a/devel/RStudio/distinfo +++ b/devel/RStudio/distinfo @@ -1,19 +1,19 @@ -TIMESTAMP = 1654197748 +TIMESTAMP = 1657349042 SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 SIZE (core-dictionaries.zip) = 876339 SHA256 (gin-2.1.2.zip) = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a SIZE (gin-2.1.2.zip) = 1341053 SHA256 (gwt-2.8.1.zip) = 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7 SIZE (gwt-2.8.1.zip) = 95650299 SHA256 (mathjax-27.zip) = c56cbaa6c4ce03c1fcbaeb2b5ea3c312d2fb7626a360254770cbcb88fb204176 SIZE (mathjax-27.zip) = 3285230 -SHA256 (RStudio-rstudio-v2022.02.3+492_GH0.tar.gz) = e0e520d992445db85dc30bdfe3fb6477f50605ce96f0b89eac19b618860032d9 -SIZE (RStudio-rstudio-v2022.02.3+492_GH0.tar.gz) = 97657933 +SHA256 (RStudio-rstudio-v2022.07.0+548_GH0.tar.gz) = 51061c4b92b6ec11bc07ca01b260c0b332d5b069aefd01b012182ae4086e9983 +SIZE (RStudio-rstudio-v2022.07.0+548_GH0.tar.gz) = 100379637 SHA256 (rstudio-r2d3-v0.2.0_GH0.tar.gz) = 6355a7632134c8c9487056019a9c458db2c98d10388cf66b018d5461d0a947af SIZE (rstudio-r2d3-v0.2.0_GH0.tar.gz) = 21977747 SHA256 (rstudio-rmarkdown-aed26ac_GH0.tar.gz) = b6f6f48dd9930514204739d8957c2737f0b1d110aebf9f89fa31de10598cb29b SIZE (rstudio-rmarkdown-aed26ac_GH0.tar.gz) = 2087615 SHA256 (rstudio-rsconnect-03c379b_GH0.tar.gz) = d24b6ee49f32f650f6d10bbfc7b2f61aee258f2fbf45a43c006f9e0a726bcea6 SIZE (rstudio-rsconnect-03c379b_GH0.tar.gz) = 220711 SHA256 (trestletech-plumber-v0.4.6_GH0.tar.gz) = 7bcbfdf5a8a2e3a051d2c673ac5ac51a483ed888afe73116cba7741dbb5f63a6 SIZE (trestletech-plumber-v0.4.6_GH0.tar.gz) = 83332 diff --git a/devel/RStudio/files/patch-CMakeGlobals.txt b/devel/RStudio/files/patch-CMakeGlobals.txt index fe20cc00af7d..10b2da0c4b02 100644 --- a/devel/RStudio/files/patch-CMakeGlobals.txt +++ b/devel/RStudio/files/patch-CMakeGlobals.txt @@ -1,46 +1,46 @@ ---- CMakeGlobals.txt.orig 2022-02-16 19:26:03 UTC +--- CMakeGlobals.txt.orig 2022-07-06 19:59:49 UTC +++ CMakeGlobals.txt -@@ -159,7 +159,7 @@ endif() +@@ -168,7 +168,7 @@ 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_WIN32 AND NOT RSTUDIO_GIT_REVISION_HASH) +if(FALSE AND NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVISION_HASH) find_program(GIT_EXECUTABLE git) if(GIT_EXECUTABLE) execute_process( -@@ -170,6 +170,7 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVIS +@@ -179,6 +179,7 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVIS SET(RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}" CACHE STRING "Git Revision Hash") endif() endif() +SET(RSTUDIO_VERSION "${FREEBSD_RSTUDIO_VERSION}" CACHE STRING "FreeBSD RStudio version") # record these from Jenkins if available if("$ENV{GIT_COMMIT}" STREQUAL "") -@@ -223,7 +224,7 @@ if(LINUX AND UNAME_M STREQUAL aarch64) +@@ -254,7 +255,7 @@ elseif(IS_CENTOS7) set(QUARTO_ENABLED FALSE CACHE INTERNAL "") else() # enable by default - set(QUARTO_ENABLED TRUE CACHE INTERNAL "") + set(QUARTO_ENABLED ${FREEBSD_QUARTO_ENABLED}) add_definitions(-DQUARTO_ENABLED) endif() -@@ -298,14 +299,14 @@ else() +@@ -341,14 +342,14 @@ else() endif() # if the install prefix is /usr/local then tweak as appropriate -if(NOT DEFINED CMAKE_INSTALL_PREFIX) +if(TRUE OR NOT DEFINED CMAKE_INSTALL_PREFIX) # force to set deeper CMAKE_INSTALL_PREFIX because many files are installed into its root if(APPLE) set(CMAKE_INSTALL_PREFIX "/Applications") elseif(UNIX) - if(RSTUDIO_DESKTOP) + if(RSTUDIO_DESKTOP OR RSTUDIO_ELECTRON) - set(CMAKE_INSTALL_PREFIX "/usr/local/lib/rstudio") + set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/rstudio") else() - set(CMAKE_INSTALL_PREFIX "/usr/local/lib/rstudio-server") + set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/rstudio-server") endif() endif() endif() diff --git a/devel/RStudio/files/patch-src_cpp_core_system_PosixChildProcess.cpp b/devel/RStudio/files/patch-src_cpp_core_system_PosixChildProcess.cpp index 0eed50ff5611..c16e45354db3 100644 --- a/devel/RStudio/files/patch-src_cpp_core_system_PosixChildProcess.cpp +++ b/devel/RStudio/files/patch-src_cpp_core_system_PosixChildProcess.cpp @@ -1,23 +1,27 @@ ---- src/cpp/core/system/PosixChildProcess.cpp.orig 2017-11-16 21:40:37 UTC +--- src/cpp/core/system/PosixChildProcess.cpp.orig 2022-07-06 19:59:49 UTC +++ src/cpp/core/system/PosixChildProcess.cpp -@@ -19,14 +19,18 @@ - #include - #include - #include -+#include - - #ifdef __APPLE__ - #include +@@ -25,9 +25,12 @@ #include #include #else -#include -#include +-#include +//#include +//#include ++//#include +#include +#include +#include #endif #include +@@ -807,7 +810,7 @@ Error ChildProcess::run() + + if (options_.exitWithParent) + { +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + // set a bit indicating we want to die when our parent dies + if (::prctl(PR_SET_PDEATHSIG, SIGTERM) == -1) + LOG_ERROR(systemError(errno, ERROR_LOCATION)); diff --git a/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt b/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt index 6269c5951b93..ec905847548a 100644 --- a/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt +++ b/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt @@ -1,121 +1,99 @@ ---- src/cpp/session/CMakeLists.txt.orig 2022-02-16 19:26:03 UTC +--- src/cpp/session/CMakeLists.txt.orig 2022-07-06 19:59:49 UTC +++ src/cpp/session/CMakeLists.txt -@@ -55,20 +55,21 @@ endif() +@@ -55,19 +55,19 @@ endif() # install pandoc # - by default, we use quarto + quarto's bundled pandoc # - if quarto is not enabled, use pandoc fallback -if(QUARTO_ENABLED) -- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin") +- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools") -elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") - set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") -else() - set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/pandoc/${PANDOC_VERSION}") -endif() +#if(QUARTO_ENABLED) -+# set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin") ++# set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools") +#elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") +# set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") +#else() +# set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/pandoc/${PANDOC_VERSION}") +#endif() # validate our dependencies exist foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR RSTUDIO_DEPENDENCIES_MATHJAX_DIR - RSTUDIO_DEPENDENCIES_PANDOC_DIR -- RSTUDIO_DEPENDENCIES_QUARTO_DIR) + #RSTUDIO_DEPENDENCIES_PANDOC_DIR -+ RSTUDIO_DEPENDENCIES_QUARTO_DIR -+ ) + RSTUDIO_DEPENDENCIES_QUARTO_DIR) - # skip quarto if not enabled -@@ -95,19 +96,19 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) +@@ -95,13 +95,13 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) endforeach() # verify libclang is installed (Windows only) -if(WIN32) -- set(LIBCLANG_VERSION "5.0.2") +- set(LIBCLANG_VERSION "13.0.1") - set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") - if(NOT EXISTS "${LIBCLANG_DIR}") - message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") - endif() +-endif() +#if(WIN32) -+# set(LIBCLANG_VERSION "5.0.2") ++# set(LIBCLANG_VERSION "13.0.1") +# set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") +# if(NOT EXISTS "${LIBCLANG_DIR}") +# message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") +# endif() -+# -+# set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") -+# if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") -+# message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") -+# endif() +#endif() -- set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") -- if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") -- message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") -- endif() --endif() -- # include files file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") - -@@ -528,6 +529,9 @@ else() +@@ -528,6 +528,9 @@ else() endif() +# additional libraries +target_link_libraries(rsession -L${FREEBSD_LIBDIR} -linotify -lprocstat) + # skip libR RPATH at development time if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE) set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE) -@@ -688,10 +692,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT +@@ -697,10 +700,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT DESTINATION "${RSTUDIO_INSTALL_BIN}" USE_SOURCE_PERMISSIONS) endif() - else() - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/" - DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc" - USE_SOURCE_PERMISSIONS) + #else() + #install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/" + # DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc" + # USE_SOURCE_PERMISSIONS) endif() # install embedded packages -@@ -732,18 +736,18 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT +@@ -741,14 +744,14 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) # install libclang - if(WIN32) - file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/*") - install(PROGRAMS ${LIBCLANG_32_FILES} - DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) - file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/*") - install(PROGRAMS ${LIBCLANG_64_FILES} - DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) -- -- # install libclang builtin-headers -- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" -- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") - endif() -+# if(WIN32) -+# file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/*") -+# install(PROGRAMS ${LIBCLANG_32_FILES} -+# DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) -+# file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/*") -+# install(PROGRAMS ${LIBCLANG_64_FILES} -+# DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) -+# -+# # install libclang builtin-headers -+# install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" -+# DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") -+# endif() ++ #if(WIN32) ++ # file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/*") ++ # install(PROGRAMS ${LIBCLANG_32_FILES} ++ # DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) ++ # file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/*") ++ # install(PROGRAMS ${LIBCLANG_64_FILES} ++ # DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) ++ #endif() # install winpty on windows if(WIN32)