Merge pull request jruby#9198 from headius/syslog_bundled_gem

Move syslog to bundled gems

Author: headius

.gitignore

@@ -29,7 +29,6 @@ failures
 .debug.properties
 .redcar
 /.rbx/
-build
 build.properties
 build_graph.png
 core/src/main/java/org/jruby/runtime/Constants.java
@@ -118,7 +117,6 @@ lib/ruby/stdlib/stringio*
 lib/ruby/stdlib/strscan*
 lib/ruby/stdlib/subspawn*
 lib/ruby/stdlib/syntax_suggest*
-lib/ruby/stdlib/syslog*
 lib/ruby/stdlib/tempfile.rb
 lib/ruby/stdlib/time.rb
 lib/ruby/stdlib/timeout*

lib/pom.rb

@@ -83,8 +83,6 @@ def log(message = nil)
   ['strscan', '3.1.7'],
   ['subspawn', '0.1.1'], # has 3 transitive deps:
   ['subspawn-posix', '0.1.1'],
-  # temporarily a default gem until https://github.com/jruby/jruby/pull/9197
-  ['syslog', '0.4.0'],
   ['ffi-binary-libfixposix', '0.5.1.1'],
   ['ffi-bindings-libfixposix', '0.5.1.0'],
   ['syntax_suggest', '2.0.2'],
@@ -143,6 +141,7 @@ def log(message = nil)
   ['rexml', '3.4.4'],
   ['rinda', '0.2.0'],
   ['rss', '0.3.1'],
+  ['syslog', '0.4.0'],
   ['test-unit', '3.6.7']
   # Depends on many CRuby internals
   # ['typeprof', '0.30.1'],
@@ -213,6 +212,10 @@ def log(message = nil)
 
     log "using jruby #{JRUBY_VERSION}"
 
+    # force platform to match build JRuby
+    Gem.set_target_rbconfig(File.join(File.dirname(__FILE__), "ruby/stdlib/jruby/build/rbconfig.rb"))
+    Gem.instance_variable_set :@ruby_api_version, Gem.target_rbconfig['ruby_version']
+
     target = ctx.project.build.directory.to_pathname
     gem_home = File.join(target, 'rubygems')
     gems = File.join(gem_home, 'gems')
@@ -251,6 +254,7 @@ def build_extensions
         say 'Skipping native extensions.'
 
         FileUtils.mkdir_p File.dirname(@spec.gem_build_complete_path)
+        p @spec.gem_build_complete_path
         FileUtils.touch @spec.gem_build_complete_path
       end
     end

lib/pom.xml

@@ -642,19 +642,6 @@ DO NOT MODIFY - GENERATED CODE
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>syslog</artifactId>
-      <version>0.4.0</version>
-      <type>gem</type>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>rubygems</groupId>
-          <artifactId>jar-dependencies</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>ffi-binary-libfixposix</artifactId>
@@ -1110,6 +1097,19 @@ DO NOT MODIFY - GENERATED CODE
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>syslog</artifactId>
+      <version>0.4.0</version>
+      <type>gem</type>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>test-unit</artifactId>
@@ -1191,7 +1191,6 @@ DO NOT MODIFY - GENERATED CODE
           <include>specifications/strscan-3.1.7*</include>
           <include>specifications/subspawn-0.1.1*</include>
           <include>specifications/subspawn-posix-0.1.1*</include>
-          <include>specifications/syslog-0.4.0*</include>
           <include>specifications/ffi-binary-libfixposix-0.5.1.1*</include>
           <include>specifications/ffi-bindings-libfixposix-0.5.1.0*</include>
           <include>specifications/syntax_suggest-2.0.2*</include>
@@ -1227,6 +1226,7 @@ DO NOT MODIFY - GENERATED CODE
           <include>specifications/rexml-3.4.4*</include>
           <include>specifications/rinda-0.2.0*</include>
           <include>specifications/rss-0.3.1*</include>
+          <include>specifications/syslog-0.4.0*</include>
           <include>specifications/test-unit-3.6.7*</include>
           <include>gems/rubygems-update-3.7.2*/**/*</include>
           <include>gems/benchmark-0.4.0*/**/*</include>
@@ -1275,7 +1275,6 @@ DO NOT MODIFY - GENERATED CODE
           <include>gems/strscan-3.1.7*/**/*</include>
           <include>gems/subspawn-0.1.1*/**/*</include>
           <include>gems/subspawn-posix-0.1.1*/**/*</include>
-          <include>gems/syslog-0.4.0*/**/*</include>
           <include>gems/ffi-binary-libfixposix-0.5.1.1*/**/*</include>
           <include>gems/ffi-bindings-libfixposix-0.5.1.0*/**/*</include>
           <include>gems/syntax_suggest-2.0.2*/**/*</include>
@@ -1311,6 +1310,7 @@ DO NOT MODIFY - GENERATED CODE
           <include>gems/rexml-3.4.4*/**/*</include>
           <include>gems/rinda-0.2.0*/**/*</include>
           <include>gems/rss-0.3.1*/**/*</include>
+          <include>gems/syslog-0.4.0*/**/*</include>
           <include>gems/test-unit-3.6.7*/**/*</include>
           <include>cache/rubygems-update-3.7.2*</include>
           <include>cache/benchmark-0.4.0*</include>
@@ -1359,7 +1359,6 @@ DO NOT MODIFY - GENERATED CODE
           <include>cache/strscan-3.1.7*</include>
           <include>cache/subspawn-0.1.1*</include>
           <include>cache/subspawn-posix-0.1.1*</include>
-          <include>cache/syslog-0.4.0*</include>
           <include>cache/ffi-binary-libfixposix-0.5.1.1*</include>
           <include>cache/ffi-bindings-libfixposix-0.5.1.0*</include>
           <include>cache/syntax_suggest-2.0.2*</include>
@@ -1395,6 +1394,7 @@ DO NOT MODIFY - GENERATED CODE
           <include>cache/rexml-3.4.4*</include>
           <include>cache/rinda-0.2.0*</include>
           <include>cache/rss-0.3.1*</include>
+          <include>cache/syslog-0.4.0*</include>
           <include>cache/test-unit-3.6.7*</include>
         </includes>
       </resource>

lib/ruby/stdlib/jruby/build/rbconfig.rb

@@ -0,0 +1,13 @@
+# This file is used by JRuby's build to override the RubyGems platform
+
+module RbConfig
+    build_props = {}
+    File.open(File.join(__FILE__, "../../../../../../default.build.properties")) do |file|
+      build_props = java.util.Properties.new
+      build_props.load(file.to_input_stream)
+    end
+
+    CONFIG = {}
+    CONFIG['ruby_version'] = build_props["version.ruby.major"] + '.0'
+    CONFIG['arch'] = 'universal-java'
+end