[jruby] 01/04: Install jruby-core-noasm Maven artifact

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch master
in repository jruby.

commit b15cee1df1252784ead41259e276b0978a1114fe
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Wed Aug 5 18:38:24 2015 -0300

    Install jruby-core-noasm Maven artifact
---
 debian/changelog |  3 ++-
 debian/rules     | 25 ++++++++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 367a84c..045a9a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ jruby (1.7.21-3) UNRELEASED; urgency=medium
     - Added a lintian override for codeless-jar warning.
   * Install jruby-noasm Maven artifact.
   * Install correct jruby-core Maven artifact.
+  * Install jruby-core-noasm Maven artifact.
 
- -- Miguel Landaeta <nomadium at debian.org>  Tue, 04 Aug 2015 22:54:21 -0300
+ -- Miguel Landaeta <nomadium at debian.org>  Wed, 05 Aug 2015 20:33:49 -0300
 
 jruby (1.7.21-2) unstable; urgency=high
 
diff --git a/debian/rules b/debian/rules
index 63e238e..f2b6c25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,10 @@ override_dh_auto_build:
 	mkdir -p lib/jni
 	$(DEB_MAVEN_INVOKE) -Pdist package
 
-override_dh_auto_install:
+# this got ugly fast
+# there must be a better way to do this
+override_dh_prep:
+	dh_prep
 	mkdir -p target/package
 	tar zxf ./maven/jruby-dist/target/jruby-dist-$(DEB_VERSION_UPSTREAM)-bin.tar.gz \
 	  -C target/package --strip-components=1
@@ -44,15 +47,27 @@ override_dh_auto_install:
 	rm target/package/lib/ruby/2.0/rdoc/generator/template/darkfish/js/jquery.js
 	mkdir -p target/package/lib/ruby/gems/shared/
 	cd target/package/lib/ruby/gems/shared/ && mkdir -p cache gems specifications
+	rm -rf target/package/tool/nailgun/*
+	for platform in i386-Linux x86_64-Linux arm-Linux; do \
+		mkdir -p target/package/lib/jni/$$platform ; \
+	done
+
+override_dh_auto_install:
 	mh_installpom -pjruby --no-parent core/pom.xml
 	mh_installjar -pjruby --java-lib  core/pom.xml core/target/jruby-core-$(DEB_VERSION_UPSTREAM).jar
 	mh_installpom -pjruby --no-parent maven/jruby-noasm/pom.xml
 	mh_installpom -pjruby --no-parent maven/jruby-stdlib/pom.xml
 	mh_installjar -pjruby maven/jruby-stdlib/pom.xml maven/jruby-stdlib/target/jruby-stdlib-$(DEB_VERSION_UPSTREAM).jar
-	rm -rf target/package/tool/nailgun/*
-	for platform in i386-Linux x86_64-Linux arm-Linux; do \
-		mkdir -p target/package/lib/jni/$$platform ; \
-	done
+
+override_dh_install:
+	dh_install
+	dh_install core/target/jruby-core-$(DEB_VERSION_UPSTREAM)-noasm.jar \
+		usr/share/maven-repo/org/jruby/jruby-core/$(DEB_VERSION_UPSTREAM)
+
+override_dh_link:
+	dh_link
+	dh_link usr/share/maven-repo/org/jruby/jruby-core/$(DEB_VERSION_UPSTREAM)/jruby-core-$(DEB_VERSION_UPSTREAM)-noasm.jar \
+		usr/share/maven-repo/org/jruby/jruby-core/debian/jruby-core-debian-noasm.jar
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git