Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Commit.
Browse files Browse the repository at this point in the history
chrisseaton committed May 27, 2016
1 parent e76d057 commit b090c99
Showing 3 changed files with 44 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ci.hocon
Original file line number Diff line number Diff line change
@@ -18,7 +18,8 @@ common: {
}

environment: {
CI: "true"
CI: "true",
JRUBY_NO_ANT: "true"
}

setup: ${common-setup}
39 changes: 39 additions & 0 deletions core/pom.rb
Original file line number Diff line number Diff line change
@@ -287,6 +287,45 @@
end
end

unless ENV['JRUBY_NO_ANT']

jruby_bin_config = [ 'run', { :id => 'copy',
'tasks' => {
'exec' => {
'@executable' => '/bin/sh',
'@osfamily' => 'unix',
'arg' => {
'@line' => '-c \'cp "${jruby.basedir}/bin/jruby.bash" "${jruby.basedir}/bin/jruby"\''
}
},
'chmod' => {
'@file' => '${jruby.basedir}/bin/jruby',
'@perm' => '755'
}
} } ]

phase :clean do
plugin :antrun do
execute_goals( *jruby_bin_config )
end
end

profile 'jruby.bash' do

activation do
file( :missing => '../bin/jruby' )
end

phase :initialize do
plugin :antrun do
execute_goals( *jruby_bin_config )
end
end

end

end

jni_config = [ 'unpack', { :id => 'unzip native',
'excludes' => 'META-INF,META-INF/*',
'artifactItems' => [ { 'groupId' => 'com.github.jnr',
3 changes: 3 additions & 0 deletions tool/travis-install.sh
Original file line number Diff line number Diff line change
@@ -7,6 +7,9 @@ if [[ -v USE_BUILD_PACK ]]
then
git clone --depth 1 https://github.com/jruby/jruby-build-pack.git
MAVEN_CLI_OPTS="-Dmaven.repo.local=jruby-build-pack/maven --offline"
cp bin/jruby.bash bin/jruby
chmod +x bin/jruby
export JRUBY_NO_ANT=yes
fi

if [[ -n "$PHASE" && $JAVA_HOME == *"java-8"* ]]

0 comments on commit b090c99

Please sign in to comment.