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: d4e1da32ebef^
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 53e9ed1b3d04
Choose a head ref
  • 3 commits
  • 10 files changed
  • 1 contributor

Commits on Mar 1, 2015

  1. create usual bin archive as well one where jar files are pack200 comp… 

    …ressed

added bin/unpack200.sh which can be used to unpack all the jar files after
extracting the archive
    @mkristian
    mkristian committed Mar 1, 2015
    Copy the full SHA
    d4e1da3 View commit details

  2. added check of file size of distribtion artifacts 

    granularity is 1M so if things fail is either because natural growth or
something happened again which let the filesize explode.
    @mkristian
    mkristian committed Mar 1, 2015
    Copy the full SHA
    0859944 View commit details

  3. [build] generated pom.xml

    @mkristian
    mkristian committed Mar 1, 2015
    Copy the full SHA
    53e9ed1 View commit details
2 changes: 2 additions & 0 deletions bin/unpack200.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
find . -name '*.pack.gz' | sed 's/\(.*\).pack.gz/\1.pack.gz \1.jar/' | xargs -L1 unpack200 --remove-pack-file
14 changes: 1 addition & 13 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -38,19 +38,7 @@
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-readline</artifactId>
<version>1.0.dev-SNAPSHOT</version>
<type>gem</type>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-ripper</artifactId>
<version>2.1.0.dev-SNAPSHOT</version>
<version>1.0</version>
<type>gem</type>
<exclusions>
<exclusion>
31 changes: 24 additions & 7 deletions maven/jruby-dist/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -48,12 +48,26 @@
'outputDirectory' => '${project.build.directory}' } ] )
end

execute :pack200 do |ctx|
jruby_home = Dir[ File.join( ctx.project.build.directory.to_pathname,
'META-INF/jruby.home/**/*.jar' ) ]
gem_home = Dir[ File.join( ctx.project.build.directory.to_pathname,
'rubygems-provided/**/*.jar' ) ]
lib_dir = Dir[ File.join( ctx.basedir.to_pathname,
'../../lib/*.jar' ) ]

(jruby_home + gem_home + lib_dir).each do |f|
file = f.sub /.jar$/, ''
unless File.exists?( file + '.pack.gz' )
puts "pack200 #{f.sub(/.*jruby.home./, '').sub(/.*rubygems-provided./, '')}"
`pack200 #{file}.pack.gz #{file}.jar`
end
end
end

execute :fix_executable_bits do |ctx|
Dir[ File.join( ctx.project.build.directory.to_pathname,
'META-INF',
'jruby.home',
'bin',
'*' ) ].each do |f|
'META-INF/jruby.home/bin/*' ) ].each do |f|
unless f.match /.(bat|exe|dll)$/
puts f
File.chmod( 0755, f ) rescue nil
@@ -71,9 +85,12 @@

phase :package do
plugin( :assembly, '2.4',
'tarLongFileMode' => 'gnu',
'descriptors' => [ 'src/main/assembly/jruby.xml' ] ) do
execute_goals( 'single' )
:recompressZippedFiles => true,
'tarLongFileMode' => 'gnu' ) do
execute_goals( 'single', :id => 'jar',
'descriptors' => [ 'src/main/assembly/bin.xml' ] )
execute_goals( 'single', :id => 'pack200',
'descriptors' => [ 'src/main/assembly/bin200.xml' ] )
end
end

48 changes: 37 additions & 11 deletions maven/jruby-dist/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -12,10 +12,9 @@
<name>JRuby Dist</name>
<properties>
<tesla.dump.readonly>true</tesla.dump.readonly>
<jruby.plugins.version>1.0.3</jruby.plugins.version>
<jruby.plugins.version>1.0.8</jruby.plugins.version>
<main.basedir>${project.parent.parent.basedir}</main.basedir>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<tesla.version>0.1.1</tesla.version>
</properties>
<dependencies>
<dependency>
@@ -70,17 +69,33 @@
<version>2.4</version>
<executions>
<execution>
<id>jar</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>pack200</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin200.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
<configuration>
<recompressZippedFiles>true</recompressZippedFiles>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptors>
<descriptor>src/main/assembly/jruby.xml</descriptor>
</descriptors>
</configuration>
</plugin>
<plugin>
@@ -89,8 +104,19 @@
<plugin>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-maven-plugin</artifactId>
<version>${tesla.version}</version>
<version>0.1.1</version>
<executions>
<execution>
<id>pack200</id>
<phase>prepare-package</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>pack200</taskId>
<nativePom>pom.rb</nativePom>
</configuration>
</execution>
<execution>
<id>fix_executable_bits</id>
<phase>prepare-package</phase>
@@ -118,7 +144,7 @@
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-ruby</artifactId>
<version>${tesla.version}</version>
<version>0.1.1</version>
</dependency>
</dependencies>
</plugin>
@@ -180,7 +206,7 @@
<plugin>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-maven-plugin</artifactId>
<version>${tesla.version}</version>
<version>0.1.1</version>
<executions>
<execution>
<id>prepare_sources_for_it</id>
@@ -198,7 +224,7 @@
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-ruby</artifactId>
<version>${tesla.version}</version>
<version>0.1.1</version>
</dependency>
</dependencies>
</plugin>
@@ -239,7 +265,7 @@
<plugin>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-maven-plugin</artifactId>
<version>${tesla.version}</version>
<version>0.1.1</version>
<executions>
<execution>
<id>pack_sources</id>
@@ -257,7 +283,7 @@
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-ruby</artifactId>
<version>${tesla.version}</version>
<version>0.1.1</version>
</dependency>
</dependencies>
</plugin>
39 changes: 39 additions & 0 deletions maven/jruby-dist/src/main/assembly/bin.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>bin</id>
<baseDirectory>jruby-${project.version}</baseDirectory>

<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>

<componentDescriptors>
<componentDescriptor>src/main/assembly/common.xml</componentDescriptor>
</componentDescriptors>

<fileSets>
<fileSet>
<directory>${project.build.directory}/META-INF/jruby.home</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**/*.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/rubygems-provided</directory>
<outputDirectory>/lib/ruby/gems/shared</outputDirectory>
<includes>
<include>**/*.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.parent.parent.basedir}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>lib/*.jar</include>
</includes>
</fileSet>
</fileSets>
</assembly>
39 changes: 39 additions & 0 deletions maven/jruby-dist/src/main/assembly/bin200.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>bin200</id>
<baseDirectory>jruby-${project.version}</baseDirectory>

<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>

<componentDescriptors>
<componentDescriptor>src/main/assembly/common.xml</componentDescriptor>
</componentDescriptors>

<fileSets>
<fileSet>
<directory>${project.build.directory}/META-INF/jruby.home</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**/*.pack.gz</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/rubygems-provided</directory>
<outputDirectory>/lib/ruby/gems/shared</outputDirectory>
<includes>
<include>**/*.pack.gz</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.parent.parent.basedir}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>lib/*.pack.gz</include>
</includes>
</fileSet>
</fileSets>
</assembly>
20 changes: 9 additions & 11 deletions maven/jruby-dist/src/main/assembly/jruby.xml → ...n/jruby-dist/src/main/assembly/common.xml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>bin</id>
<baseDirectory>jruby-${project.version}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<component>
<fileSets>
<fileSet>
<directory>${project.build.directory}/META-INF/jruby.home</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>**/.jrubydir</exclude>
<exclude>**/*.pack.gz</exclude>
<exclude>**/*.jar</exclude>
</excludes>
</fileSet>
<fileSet>
@@ -23,14 +17,18 @@
<include>specifications/*</include>
<include>gems/**/*</include>
</includes>
<excludes>
<exclude>**/.jrubydir</exclude>
<exclude>**/*.pack.gz</exclude>
<exclude>**/*.jar</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${project.parent.parent.basedir}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>LICENSE*</include>
<include>COPYING*</include>
<include>lib/jruby.jar</include>
<include>lib/jni/**/*</include>
<include>samples/**/*</include>
<include>docs/**/*</include>
@@ -47,4 +45,4 @@
</excludes>
</fileSet>
</fileSets>
</assembly>
</component>
2 changes: 1 addition & 1 deletion maven/jruby-stdlib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -88,7 +88,7 @@

resource do
directory '${jruby_home}'
includes 'bin/ast*', 'bin/gem*', 'bin/irb*', 'bin/jgem*', 'bin/jirb*', 'bin/jruby*', 'bin/rake*', 'bin/ri*', 'bin/rdoc*', 'bin/testrb*', 'lib/ruby/stdlib/**', 'lib/ruby/truffle/**'
includes 'bin/ast*', 'bin/gem*', 'bin/irb*', 'bin/jgem*', 'bin/jirb*', 'bin/jruby*', 'bin/rake*', 'bin/ri*', 'bin/rdoc*', 'bin/testrb*', 'lib/ruby/stdlib/**', 'lib/ruby/truffle/**', 'bin/unpack200.sh'
excludes 'bin/jruby', 'bin/jruby*_*', 'bin/jruby*-*', '**/.*', 'lib/ruby/stdlib/rubygems/defaults/jruby_native.rb'
target_path '${jruby.complete.home}'
end
6 changes: 3 additions & 3 deletions maven/jruby-stdlib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<jruby.complete.home>${project.build.outputDirectory}/META-INF/jruby.home</jruby.complete.home>
<jruby_home>${basedir}/../..</jruby_home>
<tesla.version>0.1.1</tesla.version>
</properties>
<build>
<resources>
@@ -46,6 +45,7 @@
<include>bin/testrb*</include>
<include>lib/ruby/stdlib/**</include>
<include>lib/ruby/truffle/**</include>
<include>bin/unpack200.sh</include>
</includes>
<excludes>
<exclude>bin/jruby</exclude>
@@ -77,7 +77,7 @@
<plugin>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-maven-plugin</artifactId>
<version>${tesla.version}</version>
<version>0.1.1</version>
<executions>
<execution>
<id>fix shebang on gem bin files and add *.bat files</id>
@@ -117,7 +117,7 @@
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-ruby</artifactId>
<version>${tesla.version}</version>
<version>0.1.1</version>
</dependency>
</dependencies>
</plugin>
Loading