[build] include ext/ in the bootstrap profile

the gem build in ext/ are only used to be included into the stdlib and is only a way to "modularize" the codebase. these ext/ gems are not published any more to sonatype.org repo. so everything needs to build locally - travis, development machine, etc
jruby · Jan 17, 2015 · e792e98 · e792e98
1 parent 2e489f2
commit e792e98
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 22 deletions.
diff --git a/ext/.gitignore b/ext/.gitignore
@@ -1,2 +1,3 @@
 pkg
 *.jar
+*gemspec.xml
diff --git a/ext/readline/Mavenfile b/ext/readline/Mavenfile
@@ -25,7 +25,7 @@ jar 'org.jruby:jruby:1.7.11', :scope => :provided
 
 properties( 'gem.home' => '${basedir}/../target/rubygems',
             'gem.path' => '${gem.home}',
-            'jruby.plugins.version' => '1.0.5',
+            'jruby.plugins.version' => '1.0.7',
             'tesla.dump.pom' => 'pom.xml',
             'tesla.dump.readonly' => true )
 

diff --git a/ext/readline/pom.xml b/ext/readline/pom.xml
@@ -28,7 +28,7 @@
     <tesla.dump.readonly>true</tesla.dump.readonly>
     <gem.path>${gem.home}</gem.path>
     <gem.home>${basedir}/../target/rubygems</gem.home>
-    <jruby.plugins.version>1.0.5</jruby.plugins.version>
+    <jruby.plugins.version>1.0.7</jruby.plugins.version>
     <tesla.dump.pom>pom.xml</tesla.dump.pom>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
   </properties>

diff --git a/ext/ripper/Mavenfile b/ext/ripper/Mavenfile
@@ -25,7 +25,7 @@ jar 'org.jruby:jruby:1.7.11', :scope => :provided
 
 properties( 'gem.home' => '${basedir}/../target/rubygems',
             'gem.path' => '${gem.home}',
-            'jruby.plugins.version' => '1.0.5',
+            'jruby.plugins.version' => '1.0.7',
             'tesla.dump.pom' => 'pom.xml',
             'tesla.dump.readonly' => true )
 

diff --git a/ext/ripper/pom.xml b/ext/ripper/pom.xml
@@ -28,7 +28,7 @@
     <tesla.dump.readonly>true</tesla.dump.readonly>
     <gem.path>${gem.home}</gem.path>
     <gem.home>${basedir}/../target/rubygems</gem.home>
-    <jruby.plugins.version>1.0.5</jruby.plugins.version>
+    <jruby.plugins.version>1.0.7</jruby.plugins.version>
     <tesla.dump.pom>pom.xml</tesla.dump.pom>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
   </properties>

diff --git a/maven/jruby-jars/Mavenfile b/maven/jruby-jars/Mavenfile
@@ -5,11 +5,11 @@ gemspec
 
 version = File.read( File.join( basedir, '..', '..', 'VERSION' ) ).strip
 
-inherit "org.jruby:jruby-artifacts:#{version}"
-
-ruby_version = model.version
+# maven does treats prereleased version as snapshot - undo it here
+ruby_version = model.version.sub( /-SNAPSHOT/, '' )
+self.version nil
 
-model.version = nil
+inherit "org.jruby:jruby-artifacts:#{version}"
 
 name "JRuby Jars Gem"
 
@@ -38,10 +38,10 @@ properties( 'tesla.dump.pom' => 'pom.xml',
   end
 
 execute 'copy jruby.jar', 'prepare-package' do |ctx|
-  FileUtils.cp( File.join( ctx.project.properties[ 'jruby_home' ],
-                           'lib',
-                           'jruby.jar' ),
-                File.join( ctx.project.basedir.to_s, 
+  source = File.expand_path( ctx.project.properties[ 'jruby_home' ].to_pathname )
+  # TODO somehow the lib/jruby.jar gets moved away to avoid conflicts
+  FileUtils.cp( Dir[ File.join( source, 'lib/jruby*.jar' ) ].first,
+                File.join( ctx.project.basedir.to_pathname, 
                            'lib',
                            "jruby-core-#{ctx.project.version}.jar" ) )
 end

diff --git a/pom.rb b/pom.rb
@@ -206,7 +206,7 @@
   [ 'bootstrap', 'bootstrap-no-launcher' ].each do |name|
     profile name do
 
-      modules [ 'test' ]
+      modules [ 'ext', 'test' ]
 
     end
   end
@@ -241,16 +241,23 @@
     end
   end
 
-  all_modules = [ 'test', 'maven' ]
+  profile 'jruby_complete_jar_extended' do
 
-  [ 'all', 'jruby_complete_jar_extended' ].each do |name|
-    profile name do
+    modules [ 'test', 'maven' ]
 
-      modules all_modules
+    build do
+      default_goal 'install'
+    end
+  end
 
-      build do
-        default_goal 'install'
-      end
+  all_modules = [ 'ext', 'test', 'maven' ]
+
+  profile 'all' do
+
+    modules all_modules
+
+    build do
+      default_goal 'install'
     end
   end
 

diff --git a/pom.xml b/pom.xml
@@ -601,12 +601,14 @@
     <profile>
       <id>bootstrap</id>
       <modules>
+        <module>ext</module>
         <module>test</module>
       </modules>
     </profile>
     <profile>
       <id>bootstrap-no-launcher</id>
       <modules>
+        <module>ext</module>
         <module>test</module>
       </modules>
     </profile>
@@ -737,7 +739,7 @@
       </properties>
     </profile>
     <profile>
-      <id>all</id>
+      <id>jruby_complete_jar_extended</id>
       <build>
         <defaultGoal>install</defaultGoal>
       </build>
@@ -747,11 +749,12 @@
       </modules>
     </profile>
     <profile>
-      <id>jruby_complete_jar_extended</id>
+      <id>all</id>
       <build>
         <defaultGoal>install</defaultGoal>
       </build>
       <modules>
+        <module>ext</module>
         <module>test</module>
         <module>maven</module>
       </modules>
@@ -762,6 +765,7 @@
         <defaultGoal>clean</defaultGoal>
       </build>
       <modules>
+        <module>ext</module>
         <module>test</module>
         <module>maven</module>
       </modules>