Skip to content

Commit eab35f1

Browse files
committed
Update project build files and readme
1 parent 2572084 commit eab35f1

File tree

8 files changed

+476
-408
lines changed

8 files changed

+476
-408
lines changed

.gitignore

+9
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,14 @@ target
2929
############
3030
*.7z
3131
*.dmg
32+
*.ear
3233
*.gz
3334
*.iso
35+
*.jar
36+
!/gradle/wrapper/gradle-wrapper.jar
3437
*.rar
3538
*.tar
39+
*.war
3640
*.zip
3741

3842
# Repository #
@@ -47,6 +51,7 @@ target
4751
# Misc #
4852
########
4953
*.bak
54+
*.tmp
5055

5156
# System #
5257
##########
@@ -56,7 +61,9 @@ Thumbs.db
5661

5762
# Project #
5863
###########
64+
.buildpath
5965
.classpath
66+
.cproject
6067
.externalToolBuilders
6168
.gradle
6269
.idea
@@ -69,3 +76,5 @@ nb-configuration.xml
6976
*.iml
7077
*.ipr
7178
*.iws
79+
*.launch
80+
*.pydevproject

.travis.yml

+28-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,32 @@
11
# Source language and JDK version to use
22
language: java
3-
jdk: oraclejdk7
3+
jdk: oraclejdk8
44

5-
# Compile and package JAR and set build properties
6-
install: mvn package -DbuildNumber=$TRAVIS_BUILD_NUMBER -DciSystem=travis -Dcommit=${TRAVIS_COMMIT:0:7}
5+
# Pre-install Maven dependencies
6+
install: mvn dependency:go-offline
77

8-
# Perform steps after compilation/test success
8+
# Compile and test source
9+
script: mvn clean -DbuildNumber=$TRAVIS_BUILD_NUMBER -DciSystem=travis -Dcommit=${TRAVIS_COMMIT:0:7}
10+
11+
# Fetch resources, run deployment goal/task, and generate Javadocs and reports
912
after_success:
10-
# Get files for use with build, namely the custom Maven settings.xml
11-
- "git clone https://github.com/flow/travis-ci-resources.git target/travis"
12-
# Check if commit is not a pull request, if repo is official, and branch is master, generate and deploy artifacts and reports
13-
- "[[ $TRAVIS_PULL_REQUEST == false ]] && [[ $TRAVIS_REPO_SLUG == flow/Caustic ]] && [[ $TRAVIS_BRANCH == master ]] && mvn javadoc:jar source:jar cobertura:cobertura coveralls:cobertura -DserviceJobId=$TRAVIS_JOB_ID deploy --settings target/travis/settings.xml"
13+
# Get files for use with build, namely the custom Maven settings.xml and scripts
14+
- "git clone https://github.com/flow/travis-ci-resources.git $HOME/build/flow/travis"
15+
# DEVELOP: Check if commit is not a pull request, if repo is official, if branch is not master; then deploy artifacts
16+
- "[[ $TRAVIS_PULL_REQUEST == false ]] && [[ $TRAVIS_REPO_SLUG == flow/caustic ]] && [[ $TRAVIS_BRANCH == develop ]] && mvn deploy --settings $HOME/build/flow/travis/settings.xml"
17+
# RELEASE: Check if commit is not a pull request, if repo is official, if branch is master; then run deployment script
18+
- "[[ $TRAVIS_PULL_REQUEST == false ]] && [[ $TRAVIS_REPO_SLUG == flow/caustic ]] && [[ $TRAVIS_BRANCH == master ]] && $HOME/build/flow/travis/deploy.sh && $HOME/build/flow/travis/gh-pages.sh"
19+
# Generate Javadocs and report for Coveralls.io
20+
- "mvn javadoc:javadoc cobertura:cobertura coveralls:report -DserviceJobId=$TRAVIS_JOB_ID"
21+
22+
# RELEASE: Deploy main JAR to GitHub Releases
23+
deploy:
24+
provider: releases
25+
api-key: $GITHUB_TOKEN
26+
file: "target/caustic-`cat version.txt`.jar"
27+
skip_cleanup: true
28+
on:
29+
branch: master
1430

1531
# Notification services
1632
notifications:
@@ -26,5 +42,7 @@ env:
2642
# Make the log output cleaner
2743
- TERM=dumb
2844
# Super secure, encrypted variables! Ssssh!
29-
- secure: "XuzfBWuHSSP0u0SOQXn8DdrEGPlxlH0w6KrOaUlcOWmG1KK/KYBuE6FYs6eEhe2Q438S83Dp4ec6mgzCS5RSaoseyZR0CC4T0NsQEPksoV37CX0vM1/kPAcilPubT0B6oO2fa4XKuCwiNflb6nw5m9hoo91I673vpjsobZBj0Fw="
30-
- secure: "aDZk1Qxvg+DaTEs+mzsQHDKAVHxiLvTLxjcfQzOIiMQj80bNTY0ntsw85CRQu6DGEPlHfb+zEjb/965HqbTomAayjEXhImun/m0+oAQXQhJoBqI2ThiGOed/KvgGyiMKoMSM71HBkEBowoUanRpNzHrC9scJHrVDei7JnvYtfVQ="
45+
- secure: "VFecbQ+pXBMbLfEDZDmT4Hsh7BP5vxQPzL3uyjKpB6ZnUw1rAkjwyTLfXT/ONdu8683gDUgbf6DawQ2TkAQBGRQjEDZL2fKp2oXw8mX0t0WKpLjL6uqC8QuRwKLOk9rWuOTiuk8IU6gNTHeD+wFatnMxKrwIc54IY+deK/Wo0PE="
46+
- secure: "RtHTH8NllkaVBFHpX8+54Vlao8FEuRCDuTkCyYq5EN+hOXTQ64lQhhQneE+L7XwFj8hP7VYEckLLZ/whkj6hXJVZw5EtYJ+WnB9OvoRa+hI48PTzCXeNd8dafNQhu32A2iIKyVdc0UmjsM/rchrLBDovdVpVzfzfnACoCNVYOlM="
47+
- secure: "bKD7Z1RbmfTRQHZ05c75a/X05QFnS51ejhCp+mpk7t9NIlWgV3xE9xhlKWS3x+A6xv8xYIrsQctex0zYxuKwZNjtb9rfeF5Yuf3PADAlDjaUykupo27jAp4Vi2SrTouMSlOmlnkDZ8b+RHI4v8Cb/Q01p1manZMAeouBtcms0tg="
48+
- secure: "Z43e9QaVLJN2v+of2K3p5NwYvn9TSG6bV4R7aLwJvMBIbDJ07LIdPGwWOJ1D2MxjhGOT/GVoyWO1ri/fO7uxAziIqes6xjoQALZOl3jlhU7VG1qEsoCtlEUZcX/CUgeKX9CK1Xg143AmrcOPLdYx7d2kXJOt/gMRToXsiUaY/x8="

README.md

+84-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,84 @@
1-
Caustic
2-
=====
3-
OpenGL rendering library developed for the Spout Platform
1+
# Caustic [![License](http://img.shields.io/badge/license-MIT-lightgrey.svg?style=flat)][License] [![Flattr this](http://img.shields.io/badge/flattr-donate-lightgrey.svg?style=flat)][Donate] [![Build Status](http://img.shields.io/travis/flow/caustic/develop.svg?style=flat)](https://travis-ci.org/flow/caustic) [![Coverage Status](http://img.shields.io/coveralls/flow/caustic/develop.svg?style=flat)](https://coveralls.io/r/flow/caustic)
2+
3+
4+
5+
## Getting Started
6+
* [Examples and code snippets](https://github.com/flow/examples/tree/master/caustic)
7+
* [Official documentation](#documentation)
8+
* [IRC support chat](http://kiwiirc.com/client/irc.esper.net/flow)
9+
* [Issues tracker](https://github.com/flow/caustic/issues)
10+
11+
## Source Code
12+
The latest and greatest source can be found here on [GitHub](https://github.com/flow/caustic). If you are using Git, use this command to clone the project:
13+
14+
git clone git://github.com/flow/caustic.git
15+
16+
Or download the latest [development archive](https://github.com/flow/caustic/archive/develop.zip) or the latest [stable archive](https://github.com/flow/caustic/archive/master.zip).
17+
18+
## Test Dependencies
19+
The following dependencies are only needed if you compiling the tests included with this project. Gotta test 'em all!
20+
* [junit:junit](https://oss.sonatype.org/#nexus-search;gav~junit~junit~~~)
21+
22+
## Building from Source
23+
This project can be built with the _latest_ [Java Development Kit](http://oracle.com/technetwork/java/javase/downloads) and [Maven](https://maven.apache.org/) or [Gradle](https://www.gradle.org/). Maven and Gradle are used to simplify dependency management, but using either of them is optional.
24+
25+
For Maven, the command `mvn clean package` will build the project and will put the compiled JAR in `target`, and `mvn clean install` will copy it to your local Maven repository.
26+
27+
For Gradle, the command `gradlew` will build the project and will put the compiled JAR in `~/build/distributions`, and `gradlew install` will copy it to your local Maven repository.
28+
29+
## Contributing
30+
Are you a talented programmer looking to contribute some code? We'd love the help!
31+
32+
* Open a pull request with your changes, following our [guidelines and coding standards](CONTRIBUTING.md).
33+
* Please follow the above guidelines for your pull request(s) accepted.
34+
* For help setting up the project, keep reading!
35+
36+
Love the project? Feel free to [donate] to help continue development! Flow projects are open-source and powered by community members, like yourself. Without you, we wouldn't be here today!
37+
38+
Don't forget to watch and star our repo to keep up-to-date with the latest Flow development!
39+
40+
## Usage
41+
If you're using [Maven](https://maven.apache.org/download.html) to manage project dependencies, simply include the following in your `pom.xml` file:
42+
43+
<dependency>
44+
<groupId>com.flowpowered</groupId>
45+
<artifactId>caustic</artifactId>
46+
<version>1.0.0-SNAPSHOT</version>
47+
</dependency>
48+
49+
If you're using [Gradle](https://www.gradle.org/) to manage project dependencies, simply include the following in your `build.gradle` file:
50+
51+
repositories {
52+
mavenCentral()
53+
}
54+
dependencies {
55+
compile 'com.flowpowered:caustic:1.0.0-SNAPSHOT'
56+
}
57+
58+
If you plan on using snapshots and do not already have the snapshot repo in your repository list, you will need to add this as well:
59+
60+
https://oss.sonatype.org/content/groups/public/
61+
62+
If you'd prefer to manually import the latest .jar file, you can get it [here](https://github.com/flow/caustic/releases).
63+
64+
## Documentation
65+
Want to get friendly with the project and put it to good use? Check out the latest [Javadocs](https://flowpowered.com/caustic).
66+
67+
To generate Javadocs with Maven, use the `mvn javadoc:javadoc` command. To view the Javadocs simply go to `target/site/apidocs/` and open `index.html` in a web browser.
68+
69+
To generate Javadocs with Gradle, use the `gradlew javadoc` command. To view the Javadocs simply go to `build/docs/javadoc/` and open `index.html` in a web browser.
70+
71+
## Version Control
72+
We've adopted the [git flow branching model](http://nvie.com/posts/a-successful-git-branching-model/) in our projects. The creators of git flow released a [short intro video](http://vimeo.com/16018419) to explain the model.
73+
74+
The `master` branch is production-ready and contains the latest tagged releases. Before a release is made, it is stagged in `release/x` branches before being pushed and tagged in the `master` branch. Small patches from `hotfix/x` branches are also pushed to `master`, and will always have a release version. The `develop` branch is pre-production, and is where we push `feature/x` branches for testing.
75+
76+
## Legal Stuff
77+
Caustic is licensed under the [MIT License][License]. Basically, you can do whatever you want as long as you include the original copyright. Please see the `LICENSE.txt` file for details.
78+
79+
## Credits
80+
* [Spout](https://spout.org/) and contributors - *where we all began, and for much of the re-licensed code.*
81+
* All the people behind [Java](http://www.oracle.com/technetwork/java/index.html), [Maven](https://maven.apache.org/), and [Gradle](https://www.gradle.org/).
82+
83+
[Donate]: https://flattr.com/submit/auto?user_id=spout&url=https://github.com/flow/caustic&title=Caustic&language=Java&tags=github&category=software
84+
[License]: https://tldrlegal.com/l/mit

android/pom.xml

+32-34
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,38 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
44

5-
<!-- Project information -->
6-
<name>Caustic Android</name>
7-
<artifactId>caustic-android</artifactId>
8-
<packaging>jar</packaging>
9-
<description>Android implementation of the Caustic rendering library API.</description>
5+
<!-- Project information -->
6+
<name>Caustic Android</name>
7+
<artifactId>caustic-android</artifactId>
8+
<packaging>jar</packaging>
9+
<description>Android implementation of the Caustic rendering library API.</description>
1010

11-
<!-- Parent information -->
12-
<parent>
13-
<groupId>org.spout</groupId>
14-
<artifactId>caustic</artifactId>
15-
<version>1.0.0-SNAPSHOT</version>
16-
</parent>
11+
<!-- Parent information -->
12+
<parent>
13+
<groupId>com.flowpowered</groupId>
14+
<artifactId>caustic</artifactId>
15+
<version>1.0.0-SNAPSHOT</version>
16+
</parent>
1717

18-
<!-- Build properties -->
19-
<properties>
20-
<project.root>..</project.root>
21-
<android.version>4.1.1.4</android.version>
22-
</properties>
18+
<!-- Build properties -->
19+
<properties>
20+
<project.root>..</project.root>
21+
<android.version>4.1.1.4</android.version>
22+
</properties>
2323

24-
<!-- Project dependencies -->
25-
<dependencies>
26-
<!-- Compile -->
27-
<dependency>
28-
<groupId>${project.groupId}</groupId>
29-
<artifactId>caustic-api</artifactId>
30-
<version>${project.version}</version>
31-
<scope>compile</scope>
32-
</dependency>
33-
<dependency>
34-
<groupId>com.google.android</groupId>
35-
<artifactId>android</artifactId>
36-
<version>${android.version}</version>
37-
<scope>compile</scope>
38-
</dependency>
39-
</dependencies>
24+
<!-- Project dependencies -->
25+
<dependencies>
26+
<!-- Transitive -->
27+
<dependency>
28+
<groupId>${project.groupId}</groupId>
29+
<artifactId>caustic-api</artifactId>
30+
<version>${project.version}</version>
31+
</dependency>
32+
<dependency>
33+
<groupId>com.google.android</groupId>
34+
<artifactId>android</artifactId>
35+
<version>${android.version}</version>
36+
</dependency>
37+
</dependencies>
4038
</project>

api/pom.xml

+31-33
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,37 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
44

5-
<!-- Project information -->
6-
<name>Caustic API</name>
7-
<artifactId>caustic-api</artifactId>
8-
<packaging>jar</packaging>
9-
<description>API for the Caustic OpenGL rendering library.</description>
5+
<!-- Project information -->
6+
<name>Caustic API</name>
7+
<artifactId>caustic-api</artifactId>
8+
<packaging>jar</packaging>
9+
<description>API for the Caustic OpenGL rendering library.</description>
1010

11-
<!-- Parent information -->
12-
<parent>
13-
<groupId>org.spout</groupId>
14-
<artifactId>caustic</artifactId>
15-
<version>1.0.0-SNAPSHOT</version>
16-
</parent>
11+
<!-- Parent information -->
12+
<parent>
13+
<groupId>com.flowpowered</groupId>
14+
<artifactId>caustic</artifactId>
15+
<version>1.0.0-SNAPSHOT</version>
16+
</parent>
1717

18-
<!-- Build properties -->
19-
<properties>
20-
<project.root>..</project.root>
21-
</properties>
18+
<!-- Build properties -->
19+
<properties>
20+
<project.root>..</project.root>
21+
</properties>
2222

23-
<!-- Project dependencies -->
24-
<dependencies>
25-
<!-- Compile -->
26-
<dependency>
27-
<groupId>net.sf.trove4j</groupId>
28-
<artifactId>trove4j</artifactId>
29-
<version>3.0.3</version>
30-
<scope>compile</scope>
31-
</dependency>
32-
<dependency>
33-
<groupId>com.flowpowered</groupId>
34-
<artifactId>flow-math</artifactId>
35-
<version>0.1.0-SNAPSHOT</version>
36-
<scope>compile</scope>
37-
</dependency>
38-
</dependencies>
23+
<!-- Project dependencies -->
24+
<dependencies>
25+
<!-- Transitive -->
26+
<dependency>
27+
<groupId>net.sf.trove4j</groupId>
28+
<artifactId>trove4j</artifactId>
29+
<version>3.0.3</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>com.flowpowered</groupId>
33+
<artifactId>flow-math</artifactId>
34+
<version>1.0.0</version>
35+
</dependency>
36+
</dependencies>
3937
</project>

0 commit comments

Comments
 (0)