Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aa596f445842
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c650822f2f91
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Mar 19, 2015

  1. [build] some build fixes truffle, jruby-jars, check_versions 

    * fixes some typo in jruby-jars build
* no more attache jruby-truffle-complete artifact
* some adjustments in check_versions.sh
    @mkristian
    mkristian committed Mar 19, 2015
    Copy the full SHA
    ff27f70 View commit details

  2. [build] do not declare gems as compile dependency

    @mkristian
    mkristian committed Mar 19, 2015
    Copy the full SHA
    c650822 View commit details
Showing with 30 additions and 47 deletions.
  1. +10 −6 lib/pom.rb
  2. +12 −14 lib/pom.xml
  3. +2 −2 maven/jruby-jars/Mavenfile
  4. +1 −1 maven/jruby-jars/pom.xml
  5. +5 −11 test/check_versions.sh
  6. +0 −13 truffle/pom.rb
16 changes: 10 additions & 6 deletions lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ def to_pathname
end

# just depends on jruby-core so we are sure the jruby.jar is in place
jar "org.jruby:jruby-core:#{version}", :scope => 'provided'
jar "org.jruby:jruby-core:#{version}", :scope => 'test'

repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
:id => 'rubygems-releases' )
@@ -85,14 +85,18 @@ def to_pathname

# tell maven to download the respective gem artifacts
default_gems.each do |g|
dependency 'rubygems', g.name, g.version, :type => 'gem' do
# use provided scope so it is not a real dependency for runtime
dependency 'rubygems', g.name, g.version, :type => 'gem', :scope => :provided do
exclusion 'rubygems:jar-dependencies'
end
end

gem 'ruby-maven', '3.1.1.0.8', :scope => :provided

plugin :dependency, :useRepositoryLayout => true, :outputDirectory => 'ruby/stdlib', :excludeGroupIds => 'rubygems', :includeScope => :runtime do
default_gemnames = default_gems.collect { |g| g.name }

# TODO no hardcoded group-ids
plugin :dependency, :useRepositoryLayout => true, :outputDirectory => 'ruby/stdlib', :excludeGroupIds => 'rubygems', :includeScope => :provided do
execute_goal 'copy-dependencies', :phase => 'package'
end

@@ -114,7 +118,7 @@ def to_pathname
ruby_dir = File.join( ctx.project.basedir.to_pathname, 'ruby' )
FileUtils.mkdir_p( default_specs )

# have an empty openssl.rb so we do not run in trob=uble with not having
# have an empty openssl.rb so we do not run in trouble with not having
# jopenssl which is part of the default gems
lib_dir = File.join( target, 'lib' )
openssl = File.join( lib_dir, 'openssl.rb' )
@@ -138,7 +142,7 @@ def to_pathname
ctx.project.artifacts.select do |a|
a.group_id == 'rubygems' || a.group_id == 'org.jruby.gems'
end.each do |a|
ghome = a.scope == 'compile' ? gem_home : jruby_gems
ghome = default_gemnames.member?( a.artifact_id ) ? gem_home : jruby_gems
if Dir[ File.join( ghome, 'cache', File.basename( a.file.to_pathname ).sub( /.gem/, '*.gem' ) ) ].empty?
puts a.file.to_pathname
# do not set bin_dir since its create absolute symbolic links
@@ -205,7 +209,7 @@ def to_pathname
specfile = Dir[ File.join( specs, specfile_wildcard ) ].first

unless specfile
raise Errno::ENOENT, "gemspec #{specfile_wildcard} not found; dependency unspecified in lib/pom.xml?"
raise Errno::ENOENT, "gemspec #{specfile_wildcard} not found in #{specs}; dependency unspecified in lib/pom.xml?"
end

specname = File.basename( specfile )
26 changes: 12 additions & 14 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -23,13 +23,14 @@
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<scope>provided</scope>
<scope>test</scope>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<version>0.9.6</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
@@ -42,6 +43,7 @@
<artifactId>jruby-readline</artifactId>
<version>1.0</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
@@ -54,6 +56,7 @@
<artifactId>rake</artifactId>
<version>${rake.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
@@ -66,6 +69,7 @@
<artifactId>rdoc</artifactId>
<version>${rdoc.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
@@ -78,6 +82,7 @@
<artifactId>json</artifactId>
<version>${json.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
@@ -90,6 +95,7 @@
<artifactId>jar-dependencies</artifactId>
<version>0.1.8</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
@@ -102,6 +108,7 @@
<artifactId>minitest</artifactId>
<version>${minitest.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
@@ -114,6 +121,7 @@
<artifactId>test-unit</artifactId>
<version>${test-unit.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
@@ -126,6 +134,7 @@
<artifactId>power_assert</artifactId>
<version>${power_assert.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
@@ -138,6 +147,7 @@
<artifactId>psych</artifactId>
<version>2.0.9-SNAPSHOT</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
@@ -216,18 +226,6 @@
</filesets>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<skipInstallation>true</skipInstallation>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -242,7 +240,7 @@
<useRepositoryLayout>true</useRepositoryLayout>
<outputDirectory>ruby/stdlib</outputDirectory>
<excludeGroupIds>rubygems</excludeGroupIds>
<includeScope>runtime</includeScope>
<includeScope>provided</includeScope>
</configuration>
</plugin>
<plugin>
4 changes: 2 additions & 2 deletions maven/jruby-jars/Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -28,9 +28,9 @@ properties( 'tesla.dump.pom' => 'pom.xml',
'tesla.dump.readonly' => true,
'jruby.plugins.version' => '1.0.7',
# we share the already installed gems
'gem.home' => '${jruby.home}/lib/ruby/gems/shared',
'gem.home' => '${jruby_home}/lib/ruby/gems/shared',
# need jruby_home but not jruby.home as name otherwise
# tesla-plugin will pick the jruby from jruby.home
# polyglot-plugin will pick the jruby from jruby.home
'jruby_home' => '${basedir}/../../' )

unless version =~ /-SNAPSHOT/
2 changes: 1 addition & 1 deletion maven/jruby-jars/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ freezing to) a specific jruby-complete jar version.</description>
</scm>
<properties>
<tesla.dump.readonly>true</tesla.dump.readonly>
<gem.home>${jruby.home}/lib/ruby/gems/shared</gem.home>
<gem.home>${jruby_home}/lib/ruby/gems/shared</gem.home>
<jruby.plugins.version>1.0.7</jruby.plugins.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<jruby_home>${basedir}/../../</jruby_home>
16 changes: 5 additions & 11 deletions test/check_versions.sh
View file
Original file line number Diff line number Diff line change
@@ -63,24 +63,18 @@ function check {
}

check test/target/jruby-tests-$jar_version.jar 1
check maven/jruby-stdlib/target/jruby-stdlib-$jar_version.jar 8
check maven/lib/target/jruby-stdlib-$jar_version.jar 8
check maven/jruby-jars/pkg/jruby-jars-$gem_version.gem 25
check maven/jruby-jars/lib/jruby-core-$jar_version-complete.jar 12
check maven/jruby-jars/lib/jruby-core-$jar_version-complete.jar 13
check maven/jruby-jars/lib/jruby-truffle-$jar_version-complete.jar 9
check maven/jruby-jars/lib/jruby-stdlib-$jar_version.jar 8
check maven/jruby-complete/target/jruby-complete-$jar_version.jar 27
check maven/jruby/target/jruby-$jar_version.jar 1
check maven/jruby-noasm/target/jruby-noasm-$jar_version.jar 9
check maven/jruby-dist/target/jruby-dist-$jar_version-bin.tar.gz 37 jruby-$jar_version
check maven/jruby/target/jruby-$jar_version.jar 9
check maven/jruby-dist/target/jruby-dist-$jar_version-bin.tar.gz 38 jruby-$jar_version
check maven/jruby-dist/target/jruby-dist-$jar_version-bin200.tar.gz 17 jruby-$jar_version
check maven/jruby-dist/target/jruby-dist-$jar_version-src.tar.gz 8 jruby-$jar_version
check maven/jruby-dist/target/jruby-dist-$jar_version-src.zip 13 jruby-$jar_version
check maven/jruby-dist/target/jruby-dist-$jar_version-bin.zip 38 jruby-$jar_version
check maven/jruby-dist/target/jruby-dist-$jar_version-bin200.zip 18 jruby-$jar_version
check core/target/jruby-core-$jar_version-noasm.jar 9
check core/target/jruby-core-$jar_version.jar 9
check core/target/jruby-core-$jar_version-complete.jar 12
check truffle/target/jruby-truffle-$jar_version.jar 8
check truffle/target/jruby-truffle-$jar_version-complete.jar 8
check truffle/target/jruby-truffle-$jar_version.jar 9

exit "${failed[0]}"
13 changes: 0 additions & 13 deletions truffle/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -49,17 +49,4 @@
includes '**/*rb'
end
end

[ :dist, :'jruby-jars', :all, :release ].each do |name|
profile name do
plugin :shade do
execute_goals( 'shade',
:id => 'pack jruby-truffle-complete.jar',
:phase => 'verify',
:artifactSet => { :includes => [ 'com.oracle:truffle' ] },
:shadedArtifactAttached => 'true',
:shadedClassifierName => 'complete' )
end
end
end
end