You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@couchdb.apache.org by wo...@apache.org on 2017/03/18 16:53:39 UTC
couchdb-ci git commit: fix CentOS LaTeX and SM185 installs,
update Debian Sphinx install
Repository: couchdb-ci
Updated Branches:
refs/heads/master 7562f79ee -> 7c1034191
fix CentOS LaTeX and SM185 installs, update Debian Sphinx install
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/7c103419
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/7c103419
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/7c103419
Branch: refs/heads/master
Commit: 7c10341916d0b59178b353ffbfad05a70ebc3076
Parents: 7562f79
Author: Joan Touzet <wo...@apache.org>
Authored: Sat Mar 18 01:17:56 2017 -0700
Committer: Joan Touzet <wo...@apache.org>
Committed: Sat Mar 18 01:17:56 2017 -0700
----------------------------------------------------------------------
.../roles/dependencies-centos/tasks/latex.yml | 7 ++-----
.../dependencies-centos/tasks/spidermonkey.yml | 19 +------------------
ansible/roles/dependencies-debian/tasks/main.yml | 6 +++++-
3 files changed, 8 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/7c103419/ansible/roles/dependencies-centos/tasks/latex.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/dependencies-centos/tasks/latex.yml b/ansible/roles/dependencies-centos/tasks/latex.yml
index b2a01b4..7563353 100644
--- a/ansible/roles/dependencies-centos/tasks/latex.yml
+++ b/ansible/roles/dependencies-centos/tasks/latex.yml
@@ -39,14 +39,11 @@
command: "{{ item }}/install-tl --profile=/tmp/texlive.profile chdir={{ item }}"
with_items: "{{ dir_name.stdout_lines }}"
- name: install additional TeX packages
- command: tlmgr install capt-of framed multirow needspace threeparttable titlesec upquote wrapfig
+ command: tlmgr install capt-of environ eqparbox fncychap framed multirow needspace tabulary threeparttable titlesec trimspaces upquote wrapfig
# remove docs dir - this has no benefit for our use case and makes the
# container 500 MB bigger
-- name: find LaTeX docs dir
- shell: ls -d /usr/local/texlive/*
- register: docdir_name
- name: delete LaTeX docs
file:
- path: "{{docdir_name}}/texmf-dist/doc"
+ path: /usr/local/texlive/2015/texmf-dist/doc
state: absent
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/7c103419/ansible/roles/dependencies-centos/tasks/spidermonkey.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/dependencies-centos/tasks/spidermonkey.yml b/ansible/roles/dependencies-centos/tasks/spidermonkey.yml
index 27c8e03..8bfca73 100644
--- a/ansible/roles/dependencies-centos/tasks/spidermonkey.yml
+++ b/ansible/roles/dependencies-centos/tasks/spidermonkey.yml
@@ -25,7 +25,7 @@
dest: /opt
copy: no
- name: configure Spidermonkey 1.8.5
- command: ./configure
+ command: ./configure --prefix=/usr
args:
chdir: /opt/js-1.8.5/js/src
- name: make Spidermonkey 1.8.5
@@ -36,20 +36,3 @@
command: make install
args:
chdir: /opt/js-1.8.5/js/src
-
-# This prevents
-# error while loading shared libraries:
-# libmozjs185.so.1.0: cannot open shared object file
-# during CouchDB make later.
-- name: set LD_LIBRARY_PATH (otherwise libmozjs185.so.1.0 is not found)
- copy:
- content: "export LD_LIBRARY_PATH=/usr/local/lib"
- dest: /etc/profile.d/library_path.sh
-
-# add symbolic link (otherwise CouchDB make complains about not being able to
-# find jsapi.h)
-- name: link /usr/include/js to /usr/local/include/js
- file:
- path: /usr/include/js
- src: /usr/local/include/js
- state: link
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/7c103419/ansible/roles/dependencies-debian/tasks/main.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/dependencies-debian/tasks/main.yml b/ansible/roles/dependencies-debian/tasks/main.yml
index 1aa1ade..93bd734 100644
--- a/ansible/roles/dependencies-debian/tasks/main.yml
+++ b/ansible/roles/dependencies-debian/tasks/main.yml
@@ -28,6 +28,7 @@
- git
- pkg-config
- python
+ - python-pip
# dependencies for make couch, except erlang
- name: install packages required to build CouchDB
@@ -50,9 +51,12 @@
apt: name={{item}} state=present install_recommends=no
with_items:
- help2man
- - python-sphinx
- texlive-latex-base
- texlive-latex-recommended
- texlive-latex-extra
- texlive-fonts-recommended
- texinfo
+
+# also required for make docs
+- name: install up to date version of sphinx via pip
+ shell: pip install sphinx==1.5.3