This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch experimental in repository jruby.
commit c053e2c67e7960af270f58e0bd9d278bd4694a4e Author: Miguel Landaeta <[email protected]> Date: Tue May 26 11:52:56 2015 -0300 Put maven3 settings in a separate file --- debian/changelog | 2 +- debian/maven3.mk | 19 +++++++++++++++++++ debian/rules | 22 ++-------------------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index d02b107..7e38e66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,7 +45,7 @@ jruby (1.7.19-1) UNRELEASED; urgency=medium minified copy. This is to avoid lintian warnings, during build time a link symbolic to libjs-jquery is deployed. - -- Miguel Landaeta <[email protected]> Mon, 25 May 2015 23:14:28 -0300 + -- Miguel Landaeta <[email protected]> Tue, 26 May 2015 11:51:28 -0300 jruby (1.5.6-10) unstable; urgency=medium diff --git a/debian/maven3.mk b/debian/maven3.mk new file mode 100644 index 0000000..446106a --- /dev/null +++ b/debian/maven3.mk @@ -0,0 +1,19 @@ +MAVEN_HOME = /usr/share/maven +DEB_MAVEN_ARGS := -Pdist +DEB_CLASSPATH = $(MAVEN_HOME)/boot/plexus-classworlds-2.x.jar +DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -classpath $(DEB_CLASSPATH) \ + $(JAVA_OPTS) -Dclassworlds.conf=$(CURDIR)/debian/m2.conf \ + org.codehaus.plexus.classworlds.launcher.Launcher \ + -s/etc/maven2/settings-debian.xml \ + -Dmaven.repo.local=$(DEB_MAVEN_REPO) \ + $(if $(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS)) + +maven-sanity-check: + @if ! test -x "$(JAVACMD)"; then \ + echo "You must specify a valid JAVA_HOME or JAVACMD!"; \ + exit 1; \ + fi + @if ! test -r "$(MAVEN_HOME)/boot/plexus-classworlds-2.x.jar"; then \ + echo "You must specify a valid MAVEN_HOME directory!"; \ + exit 1; \ + fi diff --git a/debian/rules b/debian/rules index 03a2087..88827f2 100755 --- a/debian/rules +++ b/debian/rules @@ -2,37 +2,19 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/maven.mk +include $(CURDIR)/debian/maven3.mk #JAVA_HOME := /usr/lib/jvm/default-java # upstream code directly from git repo builds with # openjdk-7-jdk, I have to find out how/why JAVA_HOME := /usr/lib/jvm/java-8-openjdk-$(DEB_BUILD_ARCH) -MAVEN_HOME = /usr/share/maven -DEB_MAVEN_ARGS := -Pdist -DEB_CLASSPATH = $(MAVEN_HOME)/boot/plexus-classworlds-2.x.jar -DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -classpath $(DEB_CLASSPATH) \ - $(JAVA_OPTS) -Dclassworlds.conf=$(CURDIR)/debian/m2.conf \ - org.codehaus.plexus.classworlds.launcher.Launcher \ - -s/etc/maven2/settings-debian.xml \ - -Dmaven.repo.local=$(DEB_MAVEN_REPO) \ - $(if $(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS)) - -maven-sanity-check: - @if ! test -x "$(JAVACMD)"; then \ - echo "You must specify a valid JAVA_HOME or JAVACMD!"; \ - exit 1; \ - fi - @if ! test -r "$(MAVEN_HOME)/boot/plexus-classworlds-2.x.jar"; then \ - echo "You must specify a valid MAVEN_HOME directory!"; \ - exit 1; \ - fi pre-build:: mkdir -p lib/jni common-install-prehook-indep:: mkdir -p target/package - tar zxf ./maven/jruby-dist/target/jruby-dist-1.7.19-bin.tar.gz -C target/package --strip-components=1 + tar zxf ./maven/jruby-dist/target/jruby-dist-$(DEB_UPSTREAM_VERSION)-bin.tar.gz -C target/package --strip-components=1 cd target/package/bin && mv jruby.sh jruby cd target/package/bin && chmod 0755 * rm target/package/lib/ruby/2.0/rdoc/generator/template/darkfish/js/jquery.js -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
