Skip to content

Commit

Permalink
fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
trolldbois committed May 7, 2017
2 parents e8d9796 + adbb21e commit 952142d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ python:

install:
# travis-ci use Ubuntu 12.04.5 LTS (Precise Pangolin) 64bit
# install snapshot version of libclang1 libclang-common-3.X-dev
- sudo apt-add-repository "deb http://llvm.org/apt/precise/ llvm-toolchain-precise main" --yes
# install snapshot version of libclang1 libclang-common-4.X-dev
- sudo apt-add-repository "deb http://apt.llvm.org/precise/ llvm-toolchain-precise-4.0 main" --yes
- sudo apt-add-repository "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu precise main" --yes
- sudo apt-get update
- sudo apt-get install libclang1-4.0 libclang-common-4.0-dev --yes --force-yes
#permission denied - sudo echo `echo "/usr/lib/llvm-3.7/lib/" >> /etc/ld.so.conf.d/llvm-dev.conf`
#permission denied - sudo echo `echo "/usr/lib/llvm-4.0/lib/" >> /etc/ld.so.conf.d/llvm-dev.conf`
# Fixes libclang installation because libclang is named in Ubuntu 12.04 to 14.10 as libclang.so.1,
# however python-clang expects the library is named libclang.so
# libclang.so is hardcoded in https://github.com/trolldbois/python-clang/blob/master/clang/cindex.py#L3361
Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setup(
name="clang",
version="4.0",
version="4.0.post1",
description="libclang python bindings",
long_description=open("README.txt").read(),
url="http://clang.llvm.org/",
Expand All @@ -17,9 +17,7 @@
"License :: OSI Approved :: University of Illinois/NCSA Open Source License",
"Development Status :: 5 - Production/Stable",
"Topic :: Software Development :: Compilers",
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
"Programming Language :: Python :: 2.7",
],
keywords=["llvm", "clang", "libclang"],
author="LLVM team",
Expand Down

0 comments on commit 952142d

Please sign in to comment.