abilty to run against custom installed versions of R on linux (e.g. /…

…usr/local/lib/R)
rstudio · Mar 15, 2011 · 968189c · 968189c
1 parent 396299b
commit 968189c
Show file tree

Hide file tree

Showing 16 changed files with 371 additions and 222 deletions.
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
@@ -169,7 +169,7 @@ add_subdirectory(r)
 if(RSTUDIO_DESKTOP)
 
    add_subdirectory(desktop)
-   configure_file(rdesktop-dev ${CMAKE_CURRENT_BINARY_DIR}/rdesktop-dev)
+   configure_file(rdesktop-dev.in ${CMAKE_CURRENT_BINARY_DIR}/rdesktop-dev)
    configure_file(conf/rdesktop-dev.conf ${CMAKE_CURRENT_BINARY_DIR}/conf/rdesktop-dev.conf)
 
 endif()

diff --git a/src/cpp/core/Error.cpp b/src/cpp/core/Error.cpp
@@ -177,6 +177,13 @@ Error pathNotFoundError(const ErrorLocation& location)
    return systemError(boost::system::errc::no_such_file_or_directory, location);
 #endif
 }
+
+Error pathNotFoundError(const std::string& path, const ErrorLocation& location)
+{
+   Error error = pathNotFoundError(location);
+   error.addProperty("path", path);
+   return error;
+}
 
 struct ErrorLocation::Impl 
 {

diff --git a/src/cpp/core/ProgramOptions.cpp b/src/cpp/core/ProgramOptions.cpp
@@ -33,16 +33,6 @@ namespace program_options {
 
 namespace {
 
-
-void reportError(const std::string& errorMessage,
-                 const ErrorLocation& location)
-{
-   if (core::system::stderrIsTerminal())
-      std::cerr << errorMessage << std::endl;
-   else
-      core::log::logErrorMessage(errorMessage, location);
-}
-
 bool validateOptionsProvided(const variables_map& vm,
                              const options_description& optionsDescription,
                              const std::string& configFile = std::string())
@@ -67,6 +57,15 @@ bool validateOptionsProvided(const variables_map& vm,
 
 }
 
+void reportError(const std::string& errorMessage, const ErrorLocation& location)
+{
+   if (core::system::stderrIsTerminal())
+      std::cerr << errorMessage << std::endl;
+   else
+      core::log::logErrorMessage(errorMessage, location);
+}
+
+
 ProgramStatus read(const OptionsDescription& optionsDescription,
                    int argc, 
                    char * const argv[])

diff --git a/src/cpp/core/include/core/Error.hpp b/src/cpp/core/include/core/Error.hpp
@@ -124,6 +124,9 @@ Error systemError(int value,
 
 Error fileExistsError(const ErrorLocation& location);
 Error pathNotFoundError(const ErrorLocation& location);
+Error pathNotFoundError(const std::string& path,
+                        const ErrorLocation& location);
+
 
 class ErrorLocation
 {

diff --git a/src/cpp/core/include/core/ProgramOptions.hpp b/src/cpp/core/include/core/ProgramOptions.hpp
@@ -48,6 +48,9 @@ struct OptionsDescription
 ProgramStatus read(const OptionsDescription& optionsDescription,
                    int argc, 
                    char * const argv[]);
+
+void reportError(const std::string& errorMessage,
+                 const ErrorLocation& location);
 
 } // namespace program_options
 } // namespace core 

diff --git a/src/cpp/desktop/CMakeLists.txt b/src/cpp/desktop/CMakeLists.txt
@@ -77,16 +77,8 @@ if(WIN32)
 else()
   set(DESKTOP_SOURCE_FILES ${DESKTOP_SOURCE_FILES}
     DesktopPosixApplicationLaunch.cpp
+    DesktopPosixDetectRHome.cpp
   )
-  if(APPLE)
-    set(DESKTOP_SOURCE_FILES ${DESKTOP_SOURCE_FILES}
-      DesktopMacDetectRHome.cpp
-    )
-  else()
-    set(DESKTOP_SOURCE_FILES ${DESKTOP_SOURCE_FILES}
-      DesktopPosixDetectRHome.cpp
-    )
-  endif(APPLE)
 endif(WIN32)
 
 # include directories

diff --git a/src/cpp/desktop/DesktopMacDetectRHome.cpp b/src/cpp/desktop/DesktopMacDetectRHome.cpp