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

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

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


Commits:
7c67bd00 by Jérôme Charaoui at 2022-12-01T10:22:48-05:00
d/rules: fix DEB_VERSION_UPSTREAM suffix

- - - - -
2fbf3845 by Jérôme Charaoui at 2022-12-01T12:22:35-05:00
d/rules: include default gem specs in package

This allows jgem to display the list of gems installed into stdlib.

- - - - -
68b60fa2 by Jérôme Charaoui at 2022-12-01T21:29:36-05:00
d/rules: provide bin/irb

This executable is expected by Puppet, so it should be provided.

See the jruby-utils-clojure testsuite.

- - - - -


3 changed files:

- debian/jruby.install
- debian/rules
- debian/tests/jgem


Changes:

=====================================
debian/jruby.install
=====================================
@@ -1,5 +1,6 @@
 target/package/bin/ast                  usr/share/jruby/bin
 target/package/bin/gem                  usr/share/jruby/bin
+target/package/bin/irb                  usr/share/jruby/bin
 target/package/bin/jgem                 usr/share/jruby/bin
 target/package/bin/jirb                 usr/share/jruby/bin
 target/package/bin/jirb_swing           usr/share/jruby/bin


=====================================
debian/rules
=====================================
@@ -11,7 +11,7 @@ export RUBYGEMS=lib/target/rubygems
 
 execute_after_dh_auto_clean:
 	@rm -rf ./lib/ruby/gems
-	@rm -f ./lib/jruby.jar ./bin/jruby
+	@rm -f ./lib/jruby.jar ./bin/jruby ./bin/irb
 	-cd ./spec/ffi/fixtures/ && rm -f *.o *.so
 	# we should perhaps make some attempt to cleanup lib/ruby/stdlib
 	# but it becomes so intertwined with the gem-installed libs that
@@ -49,6 +49,7 @@ execute_before_dh_auto_configure:
 		$(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
 
 execute_after_dh_auto_configure:
 	# install maven-repo symlinks to fix jruby-stdlib dependency resolution
@@ -77,15 +78,17 @@ override_dh_prep:
 	# unpack dist tarball in package target directory
 	tar zxf $(DIST_TARBALL) -C $(DIST_TARGET_DIR) --strip-components=1
 	# prepare package bin/ and jni/
-	# and cleanup stdlib-incorporated gems
 	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/*			\
 		&& chmod 0755 ./bin/*													\
 		&& echo "-Djruby.openssl.load.jars=false" >> ./bin/.jruby.module_opts	\
-		&& mkdir -p ./lib/jni/													\
-		&& rm -rf ./lib/ruby/gems/shared/* )
+		&& mkdir -p ./lib/jni/ )
+	# copy default gem gemspecs
+	mkdir -p $(DIST_TARGET_DIR)/lib/ruby/gems/shared/specifications/default
+	cp -a $(RUBYGEMS)/specifications/*	\
+		$(DIST_TARGET_DIR)/lib/ruby/gems/shared/specifications/default
 
 execute_after_dh_install:
 	# install additional maven poms and jars
@@ -95,7 +98,7 @@ execute_after_dh_install:
 		./maven/jruby/target/jruby-$(DEB_VERSION_UPSTREAM:+ds=).jar
 	mh_installpom -pjruby ./maven/jruby-complete/pom.xml
 	mh_installjar -pjruby ./maven/jruby-complete/pom.xml \
-		./maven/jruby-complete/target/jruby-complete-$(DEB_VERSION_UPSTREAM).jar
+		./maven/jruby-complete/target/jruby-complete-$(DEB_VERSION_UPSTREAM:+ds=).jar
 	# remove bundled font files from stdlib (rdoc templates)
 	find debian/jruby/usr/share/jruby/lib/ruby/stdlib -name \*.ttf -type f -print -delete
 


=====================================
debian/tests/jgem
=====================================
@@ -4,5 +4,10 @@
 
 set -e
 
+# check if default local gems exist
+# (specific gem not important)
+jgem list | grep '^json'
+
+# check if we can install a new gem
 sudo jgem install rake
 jgem list | grep -q "^rake ([0-9\.]\+)"



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

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