Skip to content

Commit afa7dd1

Browse files
committed
Merge branch 'ctrimble-feature_travis-build'
2 parents 2b9e54e + 9062c58 commit afa7dd1

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.travis.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
language: java
2+
23
jdk:
3-
- oraclejdk8
4-
- openjdk6
5-
# before_install:
6-
# - sudo apt-get update -qq
7-
# - sudo apt-get install -y pocl pocl-opencl-icd
8-
# - "export DISPLAY=:99.0"
9-
# - "sh -e /etc/init.d/xvfb start"
4+
- oraclejdk8
5+
- openjdk6
6+
7+
env:
8+
- MAVEN_OPTS=-Xmx512m CL_LOG_ERRORS=stdout
9+
10+
before_install:
11+
- sudo apt-get update -qq
12+
- sudo apt-get install -qq fglrx=2:8.960-0ubuntu1 opencl-headers

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[![Join the chat at https://gitter.im/nativelibs4java/JavaCL](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/nativelibs4java/JavaCL?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/nativelibs4java/JavaCL.svg?branch=feature_travis-build)](https://travis-ci.org/nativelibs4java/JavaCL)
2+
13
[JavaCL](http://javacl.googlecode.com) provides OpenCL bindings for Java. It wraps low-level bindings in a clean object-oriented API, which adds a few goodies.
24

35
A comprehensive documentation is available on its [WebSite](javacl.googlecode.com) and [Wiki](https://code.google.com/p/javacl/wiki/FAQ?tm=6).
@@ -6,8 +8,6 @@ It was previously hosted on [ochafik/nativelibs4java](http://github.com/ochafik/
68

79
# Quick links
810

9-
[![Join the chat at https://gitter.im/nativelibs4java/JavaCL](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/nativelibs4java/JavaCL?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
10-
1111
* [CHANGELOG](./CHANGELOG.md)
1212
* [FAQ](http://code.google.com/p/javacl/wiki/FAQ)
1313
* [JavaDoc](http://nativelibs4java.sourceforge.net/javacl/api/stable/)

0 commit comments

Comments
 (0)