Skip to content

Commit e4a3392

Browse files
committed
Build xapian.
python3-xapian was installed. But for some reason it's not used. So build xapian and try to get the xapian tests to be run.
1 parent 532f7f9 commit e4a3392

File tree

1 file changed

+20
-23
lines changed

1 file changed

+20
-23
lines changed

.travis.yml

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -44,34 +44,31 @@ addons:
4444
# - sourceline: ppa:xapian-backports/ppa
4545

4646
packages:
47-
# # Required to build/install the xapian-binding
48-
# - libxapian-dev
49-
# # Required to install gpg
47+
# Required to build/install the xapian-binding
48+
- libxapian-dev
49+
# Required to install gpg
5050
- swig
5151
# Required to build gpgme.
5252
- gpgsm
5353

5454
before_install:
55-
- if [[ $TRAVIS_PYTHON_VERSION == "2."* ]]; then sudo apt-get install python-xapian; else sudo apt-get install python3-xapian; fi
56-
57-
# - echo "$TRAVIS_PYTHON_VERSION"
58-
# # Sphinx required to build the xapian python bindings. Use 1.8.5 on
59-
# # older python and newest on newer.
60-
# - if [[ $TRAVIS_PYTHON_VERSION == "2."* ]]; then pip install sphinx==1.8.5; fi
61-
# - if [[ $TRAVIS_PYTHON_VERSION == '3.'* ]] ; then pip install sphinx; fi
62-
# - if [[ $TRAVIS_PYTHON_VERSION == "nightly" ]]; then pip install sphinx; fi
63-
# - sudo apt-get update && sudo apt-get upgrade libxapian-dev libxapian
64-
# - XAPIAN_VER=$(dpkg -l libxapian-dev | tail -n 1 | awk '{print $3}' | cut -d '-' -f 1); echo $XAPIAN_VER
65-
# - cd /tmp
66-
# - curl -s -O https://oligarchy.co.uk/xapian/$XAPIAN_VER/xapian-bindings-$XAPIAN_VER.tar.xz
67-
# - tar -Jxvf xapian-bindings-$XAPIAN_VER.tar.xz
68-
# - cd xapian-bindings-$XAPIAN_VER/
69-
# - echo $TRAVIS_PYTHON_VERSION
70-
# - if [[ $TRAVIS_PYTHON_VERSION == "2."* ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python; fi
71-
# - if [[ $TRAVIS_PYTHON_VERSION == "3."* ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python3; fi
72-
# - if [[ $TRAVIS_PYTHON_VERSION == "nightly" ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python3; fi
73-
# - if [[ $TRAVIS_PYTHON_VERSION == "pypy3" ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python3; fi
74-
# - make && make install
55+
- echo "$TRAVIS_PYTHON_VERSION"
56+
# Sphinx required to build the xapian python bindings. Use 1.8.5 on
57+
# older python and newest on newer.
58+
- if [[ $TRAVIS_PYTHON_VERSION == "2."* ]]; then pip install sphinx==1.8.5; fi
59+
- if [[ $TRAVIS_PYTHON_VERSION == '3.'* ]] ; then pip install sphinx; fi
60+
- if [[ $TRAVIS_PYTHON_VERSION == "nightly" ]]; then pip install sphinx; fi
61+
- XAPIAN_VER=$(dpkg -l libxapian-dev | tail -n 1 | awk '{print $3}' | cut -d '-' -f 1); echo $XAPIAN_VER
62+
- cd /tmp
63+
- curl -s -O https://oligarchy.co.uk/xapian/$XAPIAN_VER/xapian-bindings-$XAPIAN_VER.tar.xz
64+
- tar -Jxvf xapian-bindings-$XAPIAN_VER.tar.xz
65+
- cd xapian-bindings-$XAPIAN_VER/
66+
- echo $TRAVIS_PYTHON_VERSION
67+
- if [[ $TRAVIS_PYTHON_VERSION == "2."* ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python; fi
68+
- if [[ $TRAVIS_PYTHON_VERSION == "3."* ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python3; fi
69+
- if [[ $TRAVIS_PYTHON_VERSION == "nightly" ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python3; fi
70+
- if [[ $TRAVIS_PYTHON_VERSION == "pypy3" ]]; then ./configure --prefix=$VIRTUAL_ENV --with-python3; fi
71+
- make && make install
7572

7673
- PATH=$VIRTUAL_ENV/bin:$PATH
7774

0 commit comments

Comments
 (0)