[Git][java-team/jruby][master] d/patches: update 0008 to use new ruby2.7 paths.

[Louis-Philippe Véronneau]

Louis-Philippe Véronneau pushed to branch master at Debian Java Maintainers / jruby


Commits:
6aa2c20d by Louis-Philippe Véronneau at 2021-01-05T15:21:39-05:00
d/patches: update 0008 to use new ruby2.7 paths.

- - - - -


3 changed files:

- debian/changelog
- debian/patches/0008-Configure-unit-tests-to-run-at-build-time.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -18,6 +18,7 @@ jruby (9.2.14.0-1) UNRELEASED; urgency=medium
   * d/patches: delete 0007 and don't add /usr/lib/ruby/vendor_ruby to the
     jruby LOAD_PATH anymore. (Closes: #977979, #977981)
   * d/control: update to dh13.
+  * d/patches: update 0008 to use new ruby2.7 paths.
 
   [ Thomas Goirand ]
   * New upstream release.


=====================================
debian/patches/0008-Configure-unit-tests-to-run-at-build-time.patch
=====================================
@@ -3,22 +3,28 @@ Author: Miguel Landaeta <nomadium at debian.org>
 Forwarded: no
 Last-Update: 2017-02-10
 
---- a/rakelib/rspec.rake
-+++ b/rakelib/rspec.rake
-@@ -15,8 +15,9 @@
+Index: jruby/rakelib/rspec.rake
+===================================================================
+--- jruby.orig/rakelib/rspec.rake
++++ jruby/rakelib/rspec.rake
+@@ -15,9 +15,10 @@
  
  namespace :spec do
    # Put Rake on the load path for JI specs without requiring rubygems
 -  rake_location = File.join(Gem.loaded_specs['rake'].full_gem_path, "lib")
 -  gem 'rspec'
+-  require 'rspec/core/rake_task'
 +  # rake_location = File.join(Gem.loaded_specs['rake'].full_gem_path, "lib")
 +  # gem 'rspec'
-+  rake_location = '/usr/lib/ruby/vendor_ruby/rake.rb'
-   require 'rspec/core/rake_task'
++  rake_location = 'lib/ruby/stdlib/rake.rb'
++  require './lib/ruby/stdlib/rspec/core/rake_task'
  
    compile_flags = {
---- a/bin/rake
-+++ b/bin/rake
+     :default => :int,
+Index: jruby/bin/rake
+===================================================================
+--- jruby.orig/bin/rake
++++ jruby/bin/rake
 @@ -6,22 +6,28 @@
  # this file is here to facilitate running it.
  #
@@ -45,7 +51,7 @@ Last-Update: 2017-02-10
 +# end
  
 -version = ">= 0.a"
-+$LOAD_PATH << '/usr/lib/ruby/vendor_ruby'
++$LOAD_PATH << 'lib/ruby/stdlib'
  
 -if ARGV.first
 -  str = ARGV.first
@@ -64,13 +70,15 @@ Last-Update: 2017-02-10
 -load Gem.bin_path("rake", "rake", version)
 -end
 +Rake.application.run
---- a/rakelib/test.rake
-+++ b/rakelib/test.rake
-@@ -123,6 +123,7 @@
+Index: jruby/rakelib/test.rake
+===================================================================
+--- jruby.orig/rakelib/test.rake
++++ jruby/rakelib/test.rake
+@@ -123,6 +123,7 @@ namespace :test do
      t.verbose = true
      t.ruby_opts << '-Xaot.loadClasses=true' # disabled by default now
      t.ruby_opts << '-I.'
-+    t.ruby_opts << '-I/usr/lib/ruby/vendor_ruby'
++    t.ruby_opts << '-Ilib/ruby/stdlib'
      t.ruby_opts << '-J-ea'
      t.ruby_opts << '--headless'
      classpath = %w[test test/target/test-classes core/target/test-classes].join(File::PATH_SEPARATOR)


=====================================
debian/rules
=====================================
@@ -73,6 +73,7 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	cd ./lib/ruby/stdlib/ &&  cp -a \
 		/usr/share/rubygems-integration/all/gems/test-unit-*/lib/test* \
 	  /usr/share/rubygems-integration/all/gems/rake-*/lib/rake* \
+	  /usr/share/rubygems-integration/all/gems/rspec-*/lib/rspec* \
 		./
 	cd ./lib/ruby/stdlib/ && cp -a /usr/lib/ruby/vendor_ruby/jar* ./
 	cd ./lib/ruby/stdlib/ && \



View it on GitLab: https://salsa.debian.org/java-team/jruby/-/commit/6aa2c20dfc95a8dc6456953398dc31aebc28291d

-- 
View it on GitLab: https://salsa.debian.org/java-team/jruby/-/commit/6aa2c20dfc95a8dc6456953398dc31aebc28291d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210105/2a0879d9/attachment.html>