From ccae937e11826e10d38272591a8db16209351439 Mon Sep 17 00:00:00 2001 From: Tarn Burton Date: Sun, 22 May 2016 12:56:35 -0400 Subject: [PATCH 1/5] Added instructions for Arch --- README.rst | 51 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/README.rst b/README.rst index cc4fd222e7..e1bd83e01a 100644 --- a/README.rst +++ b/README.rst @@ -15,7 +15,7 @@ Kasper Peeters **source code documentation**: http://kpeeters.github.io/cadabra2 This repository holds the 2.x series of the Cadabra computer -algebra system. It is slowly getting ready for public consumption, but +algebra system. It is slowly getting ready for public consumption, but expect some rough edges. Cadabra was designed specifically for the solution of problems @@ -35,15 +35,15 @@ Linux (Debian/Ubuntu/Mint) On Debian/Ubuntu you can install all that is needed with:: - sudo apt-get install cmake python3-dev g++ libpcre3 libpcre3-dev libgmp3-dev + sudo apt-get install cmake python3-dev g++ libpcre3 libpcre3-dev libgmp3-dev sudo apt-get install libgtkmm-3.0-dev libboost-all-dev libgmp-dev sudo apt-get install python-sympy libsqlite3-dev uuid-dev sudo apt-get install texlive texlive-latex-extra python3-matplotlib python3-mpmath dvipng -The configuration script will warn you if dependencies are missing. +The configuration script will warn you if dependencies are missing. To build the documentation locally, you need:: - sudo apt-get install doxygen libjs-mathjax + sudo apt-get install doxygen libjs-mathjax This is the development platform and issues are typically first fixed here. You can use either g++ or the clang++ compiler. @@ -56,13 +56,23 @@ On Fedora/CentOS/Scientific Linux you can install the dependencies with:: sudo yum install cmake gcc-c++ python-devel pcre-devel gmp-devel sudo yum install libuuid-devel sqlite-devel - sudo yum install gtkmm30-devel boost-devel + sudo yum install gtkmm30-devel boost-devel sudo yum install texlive python3-matplotlib This platform receives less testing so please get in touch if you run into any issues. You can use either g++ or the clang++ compiler. +Linux (Arch/Manjaro/Arch Derivatives) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +On Arch/Manjaro/Arch Derivative Linux you can install the dependencies by using an automated build +program such as ``yaourt`` or by specifying the ``-s`` flag with ``makepkg``. + +This platform receives less testing so please get in touch if you run +into any issues. You can use either g++ or the clang++ compiler. + + OS X ~~~~ @@ -70,10 +80,10 @@ Cadabra builds with the standard Apple compiler, but in order to build on OS X you need a number of packages from Homebrew (see http://brew.sh). Install these packages with:: - brew install cmake boost pcre gmp python3 + brew install cmake boost pcre gmp python3 brew uninstall boost-python - brew install boost-python --with-python3 - brew install pkgconfig ossp-uuid + brew install boost-python --with-python3 + brew install pkgconfig ossp-uuid brew install gtkmm3 adwaita-icon-theme The uninstall of boost-python in the 2nd line is to ensure that you @@ -99,7 +109,7 @@ development platform. Installation instructions ------------------------- -Once you have the required prerequisites installed, you can build +Once you have the required prerequisites installed, you can build Cadabra, on all supported platforms, using the standard:: mkdir build @@ -107,7 +117,7 @@ Cadabra, on all supported platforms, using the standard:: cmake .. make -This will build all binaries relevant for your platform. You will get +This will build all binaries relevant for your platform. You will get warned when dependencies are missing. Use:: sudo make install @@ -121,12 +131,27 @@ while the command-line version is called:: cadabra2 +Installation instructions for Arch/Manjaro/Arch Derivatives +----------------------------------------------------------- + +The development package for Arch Linux is `cadabra2-git `. +Building and installing (including dependencies) can be accomplished with a front end to ``pacman`` such as +``yaourt`` with:: + + yaourt -Sy cadabra2-git + +This can be done using manually using ``makepkg`` with:: + + curl -L -O https://aur.archlinux.org/cgit/aur.git/snapshot/cadabra2-git.tar.gz + tar -xvf cadabra2-git.tar.gz + cd cadabra2-git + makepkg -sri + +For more information regarding building on Arch Linux see the `Arch Wiki `. + Tutorials and other help ------------------------ Please consult http://cadabra.science/ for tutorial-style notebooks and all other documentation. - - - From a014358d2ebf61463a0b138d8bdb5b7411ac51f2 Mon Sep 17 00:00:00 2001 From: Tarn Burton Date: Sun, 22 May 2016 13:02:51 -0400 Subject: [PATCH 2/5] Small language tweaks. --- README.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index e1bd83e01a..6aa52988cd 100644 --- a/README.rst +++ b/README.rst @@ -147,7 +147,8 @@ This can be done using manually using ``makepkg`` with:: cd cadabra2-git makepkg -sri -For more information regarding building on Arch Linux see the `Arch Wiki `. +Please consult the `Arch Wiki ` +for more information regarding installing packages from the AUR. Tutorials and other help From 069be988b48ec0ad1c05b72718ebd2cc72e54c81 Mon Sep 17 00:00:00 2001 From: Yitzchak Date: Mon, 30 May 2016 14:45:42 -0400 Subject: [PATCH 3/5] Fix for TeX Live TEXMFLOCAL TeX Live TEXMFLOCAL has multiple paths separated by a colon. Last path in list appears to be "/usr/share/.." --- frontend/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/CMakeLists.txt b/frontend/CMakeLists.txt index 5db18c6c8a..9d4f352203 100644 --- a/frontend/CMakeLists.txt +++ b/frontend/CMakeLists.txt @@ -20,6 +20,8 @@ endif(GTKMM3_FOUND) # endif(APPLE) execute_process(COMMAND kpsewhich -var-value=TEXMFLOCAL OUTPUT_VARIABLE INSTALL_LATEX_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) +string(REPLACE ":" ";" INSTALL_LATEX_DIR ${INSTALL_LATEX_DIR}) +list(GET INSTALL_LATEX_DIR -1 INSTALL_LATEX_DIR) set(INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}/tex/latex/cadabra2") message("-- Installing LaTeX style files in ${INSTALL_LATEX_DIR}") install(DIRECTORY DESTINATION ${INSTALL_LATEX_DIR} DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE From 3d99d4822686b0cce20e2d4a0b54ac4b2420e15f Mon Sep 17 00:00:00 2001 From: Yitzchak Date: Fri, 3 Jun 2016 16:04:20 -0400 Subject: [PATCH 4/5] FIx for clang? --- frontend/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/CMakeLists.txt b/frontend/CMakeLists.txt index 9d4f352203..9656dd055b 100644 --- a/frontend/CMakeLists.txt +++ b/frontend/CMakeLists.txt @@ -20,7 +20,7 @@ endif(GTKMM3_FOUND) # endif(APPLE) execute_process(COMMAND kpsewhich -var-value=TEXMFLOCAL OUTPUT_VARIABLE INSTALL_LATEX_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) -string(REPLACE ":" ";" INSTALL_LATEX_DIR ${INSTALL_LATEX_DIR}) +string(REPLACE ":" ";" INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}") list(GET INSTALL_LATEX_DIR -1 INSTALL_LATEX_DIR) set(INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}/tex/latex/cadabra2") message("-- Installing LaTeX style files in ${INSTALL_LATEX_DIR}") From 0fd25a75cf7dc9333c84be34567a931ca51130ec Mon Sep 17 00:00:00 2001 From: Yitzchak Date: Sun, 5 Jun 2016 06:59:46 -0400 Subject: [PATCH 5/5] Added TeX installation --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 07ea307885..21bcd7de79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,8 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated ossp-uuid || brew upgrade ossp-uuid; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pcre jsoncpp python3 gtkmm3 gnome-icon-theme; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install boost-python --with-python3; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget http://mirror.ctan.org/systems/mac/mactex/BasicTeX.pkg -O "/tmp/BasicTeX.pkg"; sudo installer -pkg "/tmp/BasicTeX.pkg" -target /; rm /tmp/BasicTeX.pkg; export PATH=/usr/texbin:$PATH; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y texlive-latex-base; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then if [[ "`${CC} --version |grep gcc`" != "" ]]; then sudo apt-get install --yes doxygen graphviz texlive-font-utils; ./config/publish-doxygen; fi; fi install: