From 3c9f189a672453f32b57b94687ae4eec77f43781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Sat, 30 May 2020 14:09:30 +0200
Subject: [PATCH] unbundle dependencies common
---
src/cpp/session/CMakeLists.txt | 29 -----------------------------
1 file changed, 29 deletions(-)
diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
index 8f0daa5..628d968 100644
--- a/src/cpp/session/CMakeLists.txt
+++ b/src/cpp/session/CMakeLists.txt
@@ -17,18 +17,6 @@ project (SESSION)
add_subdirectory(workers)
-# verify that install-dictionaries, install-mathjax, install-pandoc,
-# and install-rmarkdown have been run as required
-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries")
- message(FATAL_ERROR "Dictionaries not found (re-run install-dependencies script to install)")
-endif()
-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27")
- message(FATAL_ERROR "Mathjax 2.7 not found (re-run install-dependencies script to install)")
-endif()
-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
-endif()
-
# verify embedded packages are available
foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
@@ -496,14 +484,6 @@ if (NOT RSTUDIO_SESSION_WIN32)
install(FILES ${R_MODULE_SRC_FILES}
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/R/modules)
- # install hunspell dictionaries
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries"
- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
-
- # install mathjax for local html preview
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27"
- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
-
# icons for database connections
install(DIRECTORY "resources/connections"
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
@@ -516,15 +496,6 @@ if (NOT RSTUDIO_SESSION_WIN32)
install(DIRECTORY "resources/dependencies"
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
- # install pandoc
- set(PANDOC_VERSION "2.7.3" CACHE INTERNAL "Pandoc version")
-
- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
- install(FILES ${PANDOC_FILES}
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc)
-
# install embedded packages
foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
--
2.25.2