[jruby] 02/04: Install jruby-complete Maven artifact
Miguel Landaeta
nomadium at moszumanska.debian.org
Thu Sep 17 13:41:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to branch master
in repository jruby.
commit 0769fd14c36930f88cbe0c00ab3f188a3f3c42b8
Author: Miguel Landaeta <nomadium at debian.org>
Date: Wed Sep 16 21:07:51 2015 -0300
Install jruby-complete Maven artifact
---
debian/changelog | 5 +-
debian/control | 3 +-
debian/jruby.poms | 1 +
.../0010-Disable-maven-invoker-plugin.patch | 57 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 28 +++++++++--
6 files changed, 90 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 045a9a7..cd58af9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ jruby (1.7.21-3) UNRELEASED; urgency=medium
* Install jruby-noasm Maven artifact.
* Install correct jruby-core Maven artifact.
* Install jruby-core-noasm Maven artifact.
+ * Install jruby-complete Maven artifact.
+ * Add B-D on libmaven-install-plugin-java.
+ * Add versioned B-D on maven (>= 3.3~).
- -- Miguel Landaeta <nomadium at debian.org> Wed, 05 Aug 2015 20:33:49 -0300
+ -- Miguel Landaeta <nomadium at debian.org> Mon, 14 Sep 2015 19:55:26 -0300
jruby (1.7.21-2) unstable; urgency=high
diff --git a/debian/control b/debian/control
index db5e1cb..e407bde 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,7 @@ Build-Depends: ant-optional,
libmaven-compiler-plugin-java (>= 3.2~),
libmaven-dependency-plugin-java,
libmaven-exec-plugin-java,
+ libmaven-install-plugin-java,
libmaven-invoker-plugin-java,
libmaven-shade-plugin-java,
libproperties-maven-plugin-java,
@@ -44,7 +45,7 @@ Build-Depends: ant-optional,
libyaml-snake-java,
libyecht-java (>= 1.0~),
locales-all,
- maven,
+ maven (>= 3.3~),
maven-debian-helper,
maven-repo-helper,
nailgun (>= 0.9.1~),
diff --git a/debian/jruby.poms b/debian/jruby.poms
index dd4839a..0081c75 100644
--- a/debian/jruby.poms
+++ b/debian/jruby.poms
@@ -5,4 +5,5 @@ maven/jruby-stdlib/pom.xml
maven/jruby-noasm/pom.xml
ext/readline/pom.xml
maven/jruby-dist/pom.xml
+maven/jruby-complete/pom.xml
test/pom.xml
diff --git a/debian/patches/0010-Disable-maven-invoker-plugin.patch b/debian/patches/0010-Disable-maven-invoker-plugin.patch
new file mode 100644
index 0000000..c1ef479
--- /dev/null
+++ b/debian/patches/0010-Disable-maven-invoker-plugin.patch
@@ -0,0 +1,57 @@
+From: Miguel Landaeta <nomadium at debian.org>
+Date: Mon, 14 Sep 2015 22:02:55 -0300
+Subject: Disable maven-invoker-plugin usage for some jruby module builds
+Forwarded: no
+
+diff --git a/maven/jruby-complete/pom.xml b/maven/jruby-complete/pom.xml
+index 42b1913..7679027 100644
+--- a/maven/jruby-complete/pom.xml
++++ b/maven/jruby-complete/pom.xml
+@@ -86,9 +86,13 @@
+ </instructions>
+ </configuration>
+ </plugin>
++ <!-- I'm not quite sure yet but I suspect there is an incompatibility
++ with this plugin or its configuration used for this build and Maven 3.
++ I had to disabled it, otherwise jruby FTFBS!
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ </plugin>
++ -->
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+@@ -217,6 +221,7 @@
+ </activation>
+ <build>
+ <plugins>
++ <!--
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+@@ -227,6 +232,7 @@
+ </pomExcludes>
+ </configuration>
+ </plugin>
++ -->
+ </plugins>
+ </build>
+ </profile>
+diff --git a/maven/jruby-stdlib/pom.xml b/maven/jruby-stdlib/pom.xml
+index 1943a10..ad83a92 100644
+--- a/maven/jruby-stdlib/pom.xml
++++ b/maven/jruby-stdlib/pom.xml
+@@ -75,9 +75,13 @@
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ </plugin>
++ <!-- I'm not quite sure yet but I suspect there is an incompatibility
++ with this plugin or its configuration used for this build and Maven 3.
++ I had to disabled it, otherwise jruby FTFBS!
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ </plugin>
++ -->
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
diff --git a/debian/patches/series b/debian/patches/series
index 2070d07..ff1ca8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
#0007-Enable-mri19-test-suite.patch
0008-Disable-some-failing-user-tests-in-pbuilder.patch
0009-Disable-bigdecimal-divmod-spec-failing-test.patch
+0010-Disable-maven-invoker-plugin.patch
diff --git a/debian/rules b/debian/rules
index f2b6c25..babc982 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,20 +19,40 @@ override_dh_auto_clean:
mh_unpatchpoms -pjruby
mh_clean
rm -f lib/jruby.jar bin/jruby
- for subp in stdlib dist; do \
+ for subp in stdlib dist complete; do \
rm -rf ./maven/jruby-$$subp/target ; \
done
rm -rf ./test/target/
rm -rf -- ./rubyspec_temp/
rm -rf -- "$(DEB_MAVEN_REPO)"
+ # this ugly hack is due to mh_unpatchpoms not restoring some POMs
+ # if you want to build jruby twice in a row, you need to restore
+ # everything correctly
+ -cd maven.bak && for pom in `find ./jruby-* -type f`; do \
+ cp $$pom $(CURDIR)/maven/$$pom ; \
+ done
+ -cd maven.bak && cp ./test/pom.xml $(CURDIR)/test/pom.xml
+ rm -rf maven.bak
+
override_dh_auto_configure:
+ # this ugly hack is due to mh_unpatchpoms not restoring some POMs
+ # if you want to build jruby twice in a row, you need to restore
+ # everything correctly
+ mkdir -p maven.bak
+ cd maven.bak && mkdir -p jruby-complete jruby-stdlib test
+ cp maven/jruby-complete/pom.xml maven.bak/jruby-complete
+ cp maven/jruby-stdlib/pom.xml maven.bak/jruby-stdlib
+ cp test/pom.xml maven.bak/test
+
/usr/share/maven-debian-helper/copy-repo.sh "$(CURDIR)/debian"
mh_patchpoms -pjruby --debian-build --keep-pom-version \
--maven-repo="$(DEB_MAVEN_REPO)" --build-no-docs
override_dh_auto_build:
mkdir -p lib/jni
+ mkdir -p $(CURDIR)/maven/jruby-complete/target/classes
+ $(DEB_MAVEN_INVOKE) -Pcomplete
$(DEB_MAVEN_INVOKE) -Pdist package
# this got ugly fast
@@ -55,9 +75,11 @@ override_dh_prep:
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
+ for subp in noasm stdlib complete; do \
+ mh_installpom -pjruby --no-parent maven/jruby-$$subp/pom.xml ; \
+ done
mh_installjar -pjruby maven/jruby-stdlib/pom.xml maven/jruby-stdlib/target/jruby-stdlib-$(DEB_VERSION_UPSTREAM).jar
+ mh_installjar -pjruby maven/jruby-complete/pom.xml maven/jruby-complete/target/jruby-complete-$(DEB_VERSION_UPSTREAM).jar
override_dh_install:
dh_install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git
More information about the pkg-java-commits
mailing list