[Git][java-team/jruby][master] 3 commits: d/rules:

[Jérôme Charaoui (@lavamind)]

Jérôme Charaoui pushed to branch master at Debian Java Maintainers / jruby


Commits:
467e08db by Jérôme Charaoui at 2022-12-02T17:09:58-05:00
d/rules:

Ship gemspec files of default gems so they are known by jgem.

- - - - -
2ded2d9a by Jérôme Charaoui at 2022-12-02T17:11:50-05:00
d/rules: remove attempt to load jline jar

It should be on the classpath instead, pointing to the Debian jar.

- - - - -
3622f3da by Jérôme Charaoui at 2022-12-02T17:12:34-05:00
limit shebang replacements to first line only

- - - - -


2 changed files:

- debian/rules
- debian/tests/common.sh


Changes:

=====================================
debian/rules
=====================================
@@ -44,12 +44,17 @@ execute_before_dh_auto_configure:
 	# remove bundled jars
 	# they are replaced by symlinks in $JRUBY_HOME
 	rm -rf $(RUBYGEMS)/gems/jruby-readline-*/lib/jline
+	sed -i -e "/^load \"jline\/jline.*/d"	\
+		$(RUBYGEMS)/gems/jruby-readline-*/lib/readline.rb
 	rm -rf $(RUBYGEMS)/gems/jruby-openssl-*/lib/org/bouncycastle
 	sed -i -e "/^require 'jar-dependencies'/d" -e "/^require_jar.*/d" \
 		$(RUBYGEMS)/gems/psych-*/lib/psych_jars.rb
 	# copy ruby libs to stdlib directory (see lib/pom.rb)
 	cp -a $(RUBYGEMS)/gems/*/lib/* lib/ruby/stdlib
 	cp bin/jirb bin/irb
+	# default gem specifications
+	mkdir -p lib/ruby/gems/shared/specifications/default
+	cp -a $(RUBYGEMS)/specifications/* lib/ruby/gems/shared/specifications/default
 
 execute_after_dh_auto_configure:
 	# install maven-repo symlinks to fix jruby-stdlib dependency resolution
@@ -80,8 +85,8 @@ override_dh_prep:
 	# prepare package bin/ and jni/
 	cd $(DIST_TARGET_DIR) && (         						  					\
 		cp ./bin/jruby.bash ./bin/jruby											\
-		&& sed -i 's|^#!/usr/bin/env\sbash|#!/bin/bash|' ./bin/jruby			\
-		&& sed -i 's|^#!/usr/bin/env\sjruby|#!/usr/bin/jruby|' ./bin/*			\
+		&& sed -i '1s|^#!/usr/bin/env\sbash|#!/bin/bash|' ./bin/jruby			\
+		&& sed -i '1s|^#!/usr/bin/env\sjruby|#!/usr/bin/jruby|' ./bin/*			\
 		&& chmod 0755 ./bin/*													\
 		&& echo "-Djruby.openssl.load.jars=false" >> ./bin/.jruby.module_opts	\
 		&& mkdir -p ./lib/jni/ )


=====================================
debian/tests/common.sh
=====================================
@@ -28,5 +28,5 @@ install_rspec() {
     mkdir -p ./bin
     # installing bin/rake for jruby
     sudo cp /usr/bin/rake ./bin/rake
-    sed -i 's|^#!.*|#!/usr/bin/jruby|' ./bin/rake
+    sed -i '1s|^#!.*|#!/usr/bin/jruby|' ./bin/rake
 }



View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/68b60fa27ccd24fbfd7e2216253b415b16e6f986...3622f3da94d36227e63923842d02c974f66cc318

-- 
View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/68b60fa27ccd24fbfd7e2216253b415b16e6f986...3622f3da94d36227e63923842d02c974f66cc318
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/20221202/d9bf10ac/attachment.htm>