usr/src/cmd/jruby/build_xml.patch
author Jon Tibble <meths@btinternet.com>
Mon, 04 May 2015 14:04:39 +0100
branchoi_151a
changeset 254 9c2a4ac793f0
parent 7 f96733ecc878
permissions -rw-r--r--
Bash patch catchup including shellshock

apt ant task was replaced by standard Java Annotation Processing Tool (apt)

--- jruby-1.1.3/build.xml.orig	Tue Jan 19 16:48:54 2010
+++ jruby-1.1.3/build.xml	Tue Jan 19 16:49:26 2010
@@ -144,14 +144,30 @@
   </target>
 
   <target name="compile-jruby" depends="compile-tasks, 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="build.classpath"/>
-      <classpath path="${jruby.classes.dir}"/>
-      <src path="${src.dir}"/>
-      <patternset refid="java.src.pattern"/>
-      <compilerarg line="-XDignore.symbol.file=true"/>
-    </apt>
+    <copy file="../AptSemicolonReplacer.java" todir="./"/>
+    <javac srcdir="./" includes="AptSemicolonReplacer.java" debug="true" source="${javac.version}" target="${javac.version}" deprecation="true" encoding="UTF-8"/>
+    <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"/>
+    <fileset dir="${src.dir}/.." casesensitive="yes" id="src.content">
+      <include name="${src.dir}/**/*.java"/>
+      <exclude name="**/anno/**/*.java"/>
+    </fileset>
+    <property name="prop.src.content.semicolon" refid="src.content"/>
+    <taskdef name="semicolonReplacer" classname="AptSemicolonReplacer"/>
+    <semicolonReplacer list="${prop.src.content.semicolon}" property="list"/>
+    <property name="prop.classpath" refid="build.classpath"/>
+    <exec executable="apt">
+      <arg value="-deprecation"/>
+      <arg line="-d ${jruby.classes.dir}"/>
+      <arg line="-classpath ${jruby.classes.dir}:${prop.classpath}"/>
+      <arg line="-sourcepath ${src.dir}"/>
+      <arg line="-target ${javac.version}"/>
+      <arg line="-encoding UTF-8"/>
+      <arg value="-g"/>
+      <arg value="-XDignore.symbol.file=true"/>
+      <arg line="-source ${javac.version}"/>
+      <arg line="-factory org.jruby.anno.AnnotationBinder"/>
+      <arg line="${list}"/>
+    </exec>
   </target>
 
   <target name="compile" depends="compile-jruby"