On Sat, Sep 19, 2015 at 02:28:10PM +0200, Bertrand Marc wrote: > Hi Chen, > > I did not build a complete debian package. I only built rstudio from > source, using only debian packages as build-dependencies (listed in the > control file attached to my previous message). > > I needed to tweak a file (see patch attached) to build it without > downloading external dependencies. > > We still need to check the resources directory and find a way to make > rstudio use system librairies instead of downloading everything. This > should probably be asked upstream.
Hi, I just put all the code from Bertrand to [0]. Need some tweak to make it buildable. [0] git://anonscm.debian.org/collab-maint/rstudio.git > > Good luck ! > Bertrand > > Le 19/09/2015 05:45, ChangZhuo Chen a écrit : > > Hi Bertrand, > > > > Could you provide the full buildable source for rstudio? It will be very > > useful to make rstudio into Debian. You can upload it to mentor [0] or > > other source repository. > > > > [0] https://mentors.debian.net/ > > > > --- CMakeLists.txt 2015-09-12 00:51:17.000000000 +0200 > +++ rstudio-0.99.682/src/cpp/session/CMakeLists.txt 2015-09-16 > 22:01:49.925022916 +0200 > @@ -19,18 +19,6 @@ > > # verify that install-dictionaries, install-mathjax, install-pandoc, > # and install-rmarkdown have been run > -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-23") > - message(FATAL_ERROR "Mathjax 2.3 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() > -if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect") > - message(FATAL_ERROR "rsconnect package not found (re-run > install-dependencies script to install)") > -endif() > > > # verify libclang is installed > @@ -39,11 +27,11 @@ > else() > set(LIBCLANG_VERSION "3.5") > endif() > -set(LIBCLANG_DIR > "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") > +set(LIBCLANG_DIR "/usr/lib/llvm-3.5/include/clang/") > 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") > +set(LIBCLANG_HEADERS_DIR "/usr/lib/llvm-3.5/include/clang/") > if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") > message(FATAL_ERROR "libclang builtin-headers not found (re-run > install-dependencies script to install)") > endif() > @@ -390,14 +378,6 @@ > 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-23" > - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") > - > # install pandoc > if(RSTUDIO_PACKAGE_BUILD_SLES) > # when producing a SUSE Linux Enterpise build, we want to install the > @@ -415,10 +395,6 @@ > install(FILES ${RSCONNECT_PACKAGE} > DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/R/packages) > > - # install PDF.js > - install(DIRECTORY "resources/pdfjs" > - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) > - > # install DataTables > install(DIRECTORY "resources/grid" > DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) > @@ -427,24 +403,6 @@ > install(DIRECTORY "resources/help_resources" > DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) > > - # install libclang > - if(WIN32) > - file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/libclang.*") > - install(PROGRAMS ${LIBCLANG_32_FILES} > - DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) > - file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/libclang.*") > - install(PROGRAMS ${LIBCLANG_64_FILES} > - DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) > - else() > - file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*") > - install(PROGRAMS ${LIBCLANG_FILES} > - DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang) > - endif() > - > - # install libclang builtin-headers > - install(DIRECTORY > "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" > - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") > - > # install 64 bit binaries if we are on win64 > if(WIN32) > if(NOT ("$ENV{PROGRAMW6432}" STREQUAL "")) -- ChangZhuo Chen (陳昌倬) <czc...@debian.org> Debian Developer Key fingerprint = EC9F 905D 866D BE46 A896 C827 BE0C 9242 03F4 552D
signature.asc
Description: Digital signature