Skip to content
Permalink
Browse files
[build] bring shaded lib/jruby.jar back and limit lib/jruby-truffle.j…
…ar to truffle
  • Loading branch information
mkristian committed Jan 27, 2015
1 parent 576ecb3 commit 4f534b8bba5e247bca8861d96fc2eba939a48685
Showing 4 changed files with 18 additions and 16 deletions.
@@ -245,6 +245,17 @@
end


plugin :shade do
execute_goals( 'shade',
:id => 'create lib/jruby.jar',
:phase => 'package',
'relocations' => [ { 'pattern' => 'org.objectweb',
'shadedPattern' => 'org.jruby.org.objectweb' } ],
'outputFile' => '${jruby.basedir}/lib/jruby.jar',
'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
'mainClass' => 'org.jruby.Main' } ] )
end

[ :osgi, :dist, :'jruby-jars', :main, :all, :complete, :release, :jruby_complete_jar_extended ].each do |name|
profile name do
plugin :shade do
@@ -532,7 +532,7 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<id>create lib/jruby.jar</id>
<id>pack lib/jruby.jar</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
@@ -544,7 +544,7 @@
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
</relocations>
<outputFile>${jruby.basedir}/lib/jruby-truffle.jar</outputFile>
<outputFile>${jruby.basedir}/lib/jruby.jar</outputFile>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.jruby.Main</mainClass>
@@ -10,7 +10,7 @@

'jruby.basedir' => '${basedir}/..' )

jar 'org.jruby:jruby-core', '${project.version}'
jar 'org.jruby:jruby-core', '${project.version}', :scope => 'provided'

jar 'com.oracle:truffle:0.6'
jar 'com.oracle:truffle-dsl-processor:0.6', :scope => 'provided'
@@ -37,13 +37,9 @@

plugin :shade do
execute_goals( 'shade',
:id => 'pack jruby.jar',
:id => 'create lib/jruby-truffle.jar',
:phase => 'package',
'relocations' => [ { 'pattern' => 'org.objectweb',
'shadedPattern' => 'org.jruby.org.objectweb' } ],
'outputFile' => '${jruby.basedir}/lib/jruby.jar',
'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
'mainClass' => 'org.jruby.Main' } ] )
'outputFile' => '${jruby.basedir}/lib/jruby-truffle.jar' )
end

build do
@@ -19,6 +19,7 @@
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.oracle</groupId>
@@ -75,18 +76,12 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<id>create lib/jruby-truffle.jar</id>
<id>pack lib/jruby-truffle.jar</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<includes>
<include>com.oracle:truffle</include>
<include>com.oracle:truffle-dsl-processor</include>
</includes>
</artifactSet>
<outputFile>${jruby.basedir}/lib/jruby-truffle.jar</outputFile>
</configuration>
</execution>

0 comments on commit 4f534b8

Please sign in to comment.