Skip to content

Commit d30ce87

Browse files
monkstonemonkstone
committed
java build for travis
1 parent 15e861e commit d30ce87

File tree

5 files changed

+104
-65
lines changed

5 files changed

+104
-65
lines changed

‎.travis.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
language: ruby
2-
sudo: false
1+
language: java
32
dist: trusty
43

5-
rvm:
6-
- jruby-9.2.7.0
74
jdk:
85
- openjdk11
96
os:

‎Rakefile

+1-12
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,9 @@ HOME_DIR = ENV['HOME']
44

55
task default: %i[init compile install test gem]
66

7-
def create_manifest
8-
title = 'Implementation-Title: PiCrate'
9-
version = "Implementation-Version: #{PiCrate::VERSION}"
10-
File.open('MANIFEST.MF', 'w') do |f|
11-
f.puts(title)
12-
f.puts(version)
13-
f.puts('Class-Path: gluegen-rt.jar jog-all.jar')
14-
end
15-
end
16-
177
# depends on installed processing, with processing on path
18-
desc 'Create Manifest and Copy Jars'
8+
desc 'Copy Jars'
199
task :init do
20-
create_manifest
2110
# for Archlinux etc
2211
processing_root = File.dirname(`readlink -f $(which processing)`)
2312
# alternative for debian linux etc

‎pom.rb

+35-19
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,38 @@
3535
jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
3636
end
3737

38-
plugin( :resources, '2.7',
39-
'encoding' => 'UTF-8' )
40-
plugin( :compiler, '3.8.0',
41-
'release' => '8' )
42-
plugin( :pmd, '3.3',
43-
'sourceEncoding' => 'utf-8',
44-
'minimumTokens' => '100',
45-
'targetJdk' => '${compileSource}' )
46-
build do
47-
resource do
48-
directory '${source.directory}/java'
49-
includes ['**/**/*.glsl', '**/*.jnilib']
50-
excludes '**/**/*.java'
51-
end
52-
resource do
53-
directory '${source.directory}/resources'
54-
includes ['**/*.png', '*.txt']
55-
end
56-
end
38+
pom 'org.jruby:jruby:9.2.7.0'
39+
jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
40+
jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
41+
jar 'org.processing:video:3.0.2'
42+
43+
overrides do
44+
plugin :resources, '2.7'
45+
plugin :dependency, '2.8'
46+
plugin( :compiler, '3.8.0', 'release' => '8' )
47+
plugin(
48+
:javadoc,
49+
'2.10.4',
50+
'detectOfflineLinks' => 'false',
51+
'links' => [ '${processing.api}', '${jruby.api}' ]
52+
)
53+
plugin(
54+
:jar, '3.1.0',
55+
'archive' => {
56+
'manifestEntries' => { 'Class-Path' => 'gluegen-rt.jar jog-all.jar' }
57+
}
58+
)
59+
end
60+
61+
build do
62+
resource do
63+
directory '${source.directory}/main/java'
64+
includes '**/**/*.glsl', '**/*.jnilib'
65+
excludes '**/**/*.java'
66+
end
67+
resource do
68+
directory '${source.directory}/main/resources'
69+
includes '**/*.png', '*.txt'
70+
excludes
71+
end
72+
end

‎pom.xml

+64-27
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,32 @@ DO NOT MODIFIY - GENERATED CODE
9494
<artifactId>gluegen-rt-main</artifactId>
9595
<version>${jogl.version}</version>
9696
</dependency>
97+
<dependency>
98+
<groupId>org.jruby</groupId>
99+
<artifactId>jruby</artifactId>
100+
<version>9.2.7.0</version>
101+
<type>pom</type>
102+
</dependency>
103+
<dependency>
104+
<groupId>org.jogamp.jogl</groupId>
105+
<artifactId>jogl-all</artifactId>
106+
<version>${jogl.version}</version>
107+
</dependency>
108+
<dependency>
109+
<groupId>org.jogamp.gluegen</groupId>
110+
<artifactId>gluegen-rt-main</artifactId>
111+
<version>${jogl.version}</version>
112+
</dependency>
113+
<dependency>
114+
<groupId>org.processing</groupId>
115+
<artifactId>video</artifactId>
116+
<version>3.0.2</version>
117+
</dependency>
97118
</dependencies>
98119
<build>
99120
<resources>
100121
<resource>
101-
<directory>${source.directory}/java</directory>
122+
<directory>${source.directory}/main/java</directory>
102123
<includes>
103124
<include>**/**/*.glsl</include>
104125
<include>**/*.jnilib</include>
@@ -108,37 +129,53 @@ DO NOT MODIFIY - GENERATED CODE
108129
</excludes>
109130
</resource>
110131
<resource>
111-
<directory>${source.directory}/resources</directory>
132+
<directory>${source.directory}/main/resources</directory>
112133
<includes>
113134
<include>**/*.png</include>
114135
<include>*.txt</include>
115136
</includes>
116137
</resource>
117138
</resources>
118-
<plugins>
119-
<plugin>
120-
<artifactId>maven-resources-plugin</artifactId>
121-
<version>2.7</version>
122-
<configuration>
123-
<encoding>UTF-8</encoding>
124-
</configuration>
125-
</plugin>
126-
<plugin>
127-
<artifactId>maven-compiler-plugin</artifactId>
128-
<version>3.8.0</version>
129-
<configuration>
130-
<release>8</release>
131-
</configuration>
132-
</plugin>
133-
<plugin>
134-
<artifactId>maven-pmd-plugin</artifactId>
135-
<version>3.3</version>
136-
<configuration>
137-
<sourceEncoding>utf-8</sourceEncoding>
138-
<minimumTokens>100</minimumTokens>
139-
<targetJdk>${compileSource}</targetJdk>
140-
</configuration>
141-
</plugin>
142-
</plugins>
139+
<pluginManagement>
140+
<plugins>
141+
<plugin>
142+
<artifactId>maven-resources-plugin</artifactId>
143+
<version>2.7</version>
144+
</plugin>
145+
<plugin>
146+
<artifactId>maven-dependency-plugin</artifactId>
147+
<version>2.8</version>
148+
</plugin>
149+
<plugin>
150+
<artifactId>maven-compiler-plugin</artifactId>
151+
<version>3.8.0</version>
152+
<configuration>
153+
<release>8</release>
154+
</configuration>
155+
</plugin>
156+
<plugin>
157+
<artifactId>maven-javadoc-plugin</artifactId>
158+
<version>2.10.4</version>
159+
<configuration>
160+
<detectOfflineLinks>false</detectOfflineLinks>
161+
<links>
162+
<link>${processing.api}</link>
163+
<link>${jruby.api}</link>
164+
</links>
165+
</configuration>
166+
</plugin>
167+
<plugin>
168+
<artifactId>maven-jar-plugin</artifactId>
169+
<version>3.1.0</version>
170+
<configuration>
171+
<archive>
172+
<manifestEntries>
173+
<Class-Path>gluegen-rt.jar jog-all.jar</Class-Path>
174+
</manifestEntries>
175+
</archive>
176+
</configuration>
177+
</plugin>
178+
</plugins>
179+
</pluginManagement>
143180
</build>
144181
</project>

‎src/main/java/processing/opengl/PGraphicsOpenGL.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5352,9 +5352,9 @@ protected void backgroundImpl() {
53525352
// showWarning() and showException() available from PGraphics.
53535353

53545354
/**
5355-
* Report on anything from glError().
5356-
* Don't use this inside glBegin/glEnd otherwise it'll
5357-
* throw an GL_INVALID_OPERATION error.
5355+
* Report on anything from glError().Don't use this inside glBegin/glEnd
5356+
* otherwise it'll throw an GL_INVALID_OPERATION error.
5357+
* @param where
53585358
*/
53595359
protected void report(String where) {
53605360
if (!hints[DISABLE_OPENGL_ERRORS]) {

0 commit comments

Comments
 (0)