[jruby] 02/07: test patch

Tony Mancill tmancill at moszumanska.debian.org
Tue Oct 28 06:35:02 GMT 2014


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

tmancill pushed a commit to branch master
in repository jruby.

commit f8127490f0d34584176d38f8dd002d7188ba7781
Author: tony mancill <tmancill at debian.org>
Date:   Sun Sep 7 05:42:33 2014 +0000

    test patch
---
 debian/patches/0013-apt.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 29 insertions(+)

diff --git a/debian/patches/0013-apt.patch b/debian/patches/0013-apt.patch
new file mode 100644
index 0000000..22dfe66
--- /dev/null
+++ b/debian/patches/0013-apt.patch
@@ -0,0 +1,28 @@
+diff --git a/build.xml b/build.xml
+index 9857cd2..cdd687b 100644
+--- a/build.xml
++++ b/build.xml
+@@ -188,6 +188,7 @@
+ 
+   <target name="compile-jruby" depends="prepare-resources, compile-annotation-binder, check-for-optional-packages">
+     <!-- Generate binding logic ahead of time -->
++    <!--
+     <apt factory="org.jruby.anno.AnnotationBinder" destdir="${jruby.classes.dir}" debug="true" source="${javac.version}" target="${javac.version}" deprecation="true" encoding="UTF-8">
+       <classpath refid="jruby.execute.classpath"/>
+       <src path="${src.dir}"/>
+@@ -195,6 +196,15 @@
+       <compilerarg line="-XDignore.symbol.file=true"/>
+       <compilerarg line="-J-Xmx${jruby.compile.memory}"/>
+     </apt>
++    -->
++    <javac destdir="${jruby.classes.dir}" debug="true" srcdir="${src.dir}" sourcepath="" classpathref="build.classpath" source="${javac.version}" target="${javac.version}" deprecation="true" encoding="UTF-8">
++	
++      <classpath refid="jruby.execute.classpath"/>
++      <src path="${src.dir}"/>
++      <patternset refid="java.src.pattern"/>
++      <compilerarg line="-XDignore.symbol.file=true"/>
++      <compilerarg line="-J-Xmx${jruby.compile.memory}"/>
++    </javac>
+   </target>
+ 
+   <target name="compile" depends="compile-jruby"
diff --git a/debian/patches/series b/debian/patches/series
index 875449d..dc01d26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 0010-jruby-Set-FD_CLOEXEC-correctly-using-F_SETFD-not-F_S.patch
 0011-java7-compat.patch
 0012-nailgun.patch
+0013-apt.patch

-- 
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