missed bits re: no longer embedding rmarkdown

kevinushey · kevinushey · commit eecd9388c4e9 · 2017-06-19T22:35:56.000-07:00
diff --git a/dependencies/common/install-packages.cmd b/dependencies/common/install-packages.cmd
@@ -10,7 +10,7 @@ set "PATH=C:\Program Files (x86)\Git\bin;%PATH%"
 set PATH=%PATH%;%CD%\tools
 
 call:install rsconnect master --no-build-vignettes
-call:install rmarkdown master --no-build-vignettes
+REM call:install rmarkdown master --no-build-vignettes
 
 GOTO:EOF
 
diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
@@ -18,7 +18,7 @@ project (SESSION)
 add_subdirectory(workers)
 
 # verify that install-dictionaries, install-mathjax, install-pandoc,
-# and install-rmarkdown have been run
+# 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()
@@ -28,9 +28,9 @@ endif()
 if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
   message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
 endif()
-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown")
-  message(FATAL_ERROR "rmarkdown package not found (re-run install-dependencies script to install)")
-endif()
+# if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown")
+#   message(FATAL_ERROR "rmarkdown package not found (re-run install-dependencies script to install)")
+# endif()
 if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect")
   message(FATAL_ERROR "rsconnect package not found (re-run install-dependencies script to install)")
 endif()
@@ -470,9 +470,9 @@ if (NOT RSTUDIO_SESSION_WIN64)
            DESTINATION  ${RSTUDIO_INSTALL_BIN}/pandoc)
 
    # install rmarkdown package
-   file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
-   install(FILES ${RMARKDOWN_PACKAGE}
-           DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/R/packages)
+   # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
+   # install(FILES ${RMARKDOWN_PACKAGE}
+   #         DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/R/packages)
 
    # install rsconnect package
    file(GLOB RSCONNECT_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect*.tar.gz")
