[Git][java-team/jruby][master] 2 commits: ruby-scanf is needed for the tests

[Louis-Philippe Véronneau]

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


Commits:
37cac93a by Louis-Philippe Véronneau at 2021-01-07T12:14:03-05:00
ruby-scanf is needed for the tests

- - - - -
aee7d3c4 by Louis-Philippe Véronneau at 2021-01-07T19:00:05-05:00
d/rules: package missing libs in the final .deb, as jruby needs them

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -58,6 +58,7 @@ Build-Depends:
  ruby-json (>= 2.3.0+dfsg),
  ruby-test-unit,
  ruby-rake-ant,
+ ruby-scanf,
  ruby-cmath,
 Standards-Version: 4.3.0
 Homepage: http://jruby.org/


=====================================
debian/rules
=====================================
@@ -32,6 +32,24 @@ override_dh_auto_configure:
 	# save POM files before being patched, otherwise sometimes they are not cleanly
 	# restored and this will prevent twice in a row builds to work
 	cp ./pom.xml ./bak && cp ./core/pom.xml ./bak/core && cp ./lib/pom.xml ./bak/lib
+	cd ./lib/ruby/stdlib/ && for gem in csv fileutils; do \
+		cp -a /usr/lib/ruby/2.7.0/$$gem* ./ ; \
+	done
+	cd ./lib/ruby/stdlib/ && for gem in psych json jar; do \
+		cp -a /usr/lib/ruby/vendor_ruby/$$gem* ./ ; \
+	done
+	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/rake-ant*/lib/ant.rb \
+		/usr/share/rubygems-integration/all/gems/rspec-*/lib/rspec* \
+		/usr/share/rubygems-integration/all/gems/cmath-*/lib/cmath.rb \
+		/usr/share/rubygems-integration/all/gems/scanf-*/lib/scanf.rb \
+		/usr/lib/ruby/2.7.0/webrick* \
+		/usr/lib/ruby/2.7.0/ipaddr.rb \
+		./
+	mkdir lib/ruby/gems
+	ln -s lib/ruby/stdlib lib/ruby/gems/shared
 	dh_auto_configure
 
 override_dh_auto_build:
@@ -68,29 +86,12 @@ prepare-tests:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	# this just copies some needed gems and their dependencies to the
 	# lib directory, so tests can load all their needed dependencies
-	cd ./lib/ruby/stdlib/ && for gem in csv fileutils; do \
-		cp -a /usr/lib/ruby/2.7.0/$$gem* ./ ; \
-	done
-	cd ./lib/ruby/stdlib/ && for gem in psych json jar; do \
-		cp -a /usr/lib/ruby/vendor_ruby/$$gem* ./ ; \
-	done
-	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/rake-ant*/lib/ant.rb \
-		/usr/share/rubygems-integration/all/gems/rspec-*/lib/rspec* \
-		/usr/share/rubygems-integration/all/gems/cmath-*/lib/cmath.rb \
-		/usr/lib/ruby/2.7.0/webrick* \
-		/usr/lib/ruby/2.7.0/ipaddr.rb \
-		./
 	cd ./lib/ruby/stdlib/ && \
 		cp -aL /usr/share/jruby/lib/ruby/stdlib/*openssl* ./ \
 		&& for lib in bouncycastle/bcpkix/debian bouncycastle/bcprov/debian yaml/snakeyaml/1.x; do \
 			mkdir -p ./org/$$lib ; \
 			cp $(MAVEN_REPO)/org/$$lib/$$(echo $$lib | cut -f2-3 -d/ --output-delimiter=-).jar ./org/$$lib ; \
 		done
-	mkdir lib/ruby/gems
-	ln -s lib/ruby/stdlib lib/ruby/gems/shared
 endif
 	
 



View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/288906b95205e23bcb585303ff336527dd60e76e...aee7d3c479d303cdd7ce55d2be0963ed1cff447f

-- 
View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/288906b95205e23bcb585303ff336527dd60e76e...aee7d3c479d303cdd7ce55d2be0963ed1cff447f
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/20210108/9531f9a0/attachment.html>