|
0
|
1 |
apt ant task was replaced by standard Java Annotation Processing Tool (apt)
|
|
|
2 |
|
|
7
|
3 |
--- jruby-1.1.3/build.xml.orig Tue Jan 19 16:48:54 2010
|
|
|
4 |
+++ jruby-1.1.3/build.xml Tue Jan 19 16:49:26 2010
|
|
|
5 |
@@ -144,14 +144,30 @@
|
|
0
|
6 |
</target>
|
|
|
7 |
|
|
|
8 |
<target name="compile-jruby" depends="compile-tasks, compile-annotation-binder, check-for-optional-packages">
|
|
|
9 |
- <!-- Generate binding logic ahead of time -->
|
|
|
10 |
- <apt factory="org.jruby.anno.AnnotationBinder" destdir="${jruby.classes.dir}" debug="true" source="${javac.version}" target="${javac.version}" deprecation="true" encoding="UTF-8">
|
|
|
11 |
- <classpath refid="build.classpath"/>
|
|
|
12 |
- <classpath path="${jruby.classes.dir}"/>
|
|
|
13 |
- <src path="${src.dir}"/>
|
|
|
14 |
- <patternset refid="java.src.pattern"/>
|
|
|
15 |
- <compilerarg line="-XDignore.symbol.file=true"/>
|
|
|
16 |
- </apt>
|
|
|
17 |
+ <copy file="../AptSemicolonReplacer.java" todir="./"/>
|
|
|
18 |
+ <javac srcdir="./" includes="AptSemicolonReplacer.java" debug="true" source="${javac.version}" target="${javac.version}" deprecation="true" encoding="UTF-8"/>
|
|
|
19 |
+ <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"/>
|
|
|
20 |
+ <fileset dir="${src.dir}/.." casesensitive="yes" id="src.content">
|
|
|
21 |
+ <include name="${src.dir}/**/*.java"/>
|
|
|
22 |
+ <exclude name="**/anno/**/*.java"/>
|
|
|
23 |
+ </fileset>
|
|
|
24 |
+ <property name="prop.src.content.semicolon" refid="src.content"/>
|
|
|
25 |
+ <taskdef name="semicolonReplacer" classname="AptSemicolonReplacer"/>
|
|
|
26 |
+ <semicolonReplacer list="${prop.src.content.semicolon}" property="list"/>
|
|
|
27 |
+ <property name="prop.classpath" refid="build.classpath"/>
|
|
|
28 |
+ <exec executable="apt">
|
|
|
29 |
+ <arg value="-deprecation"/>
|
|
|
30 |
+ <arg line="-d ${jruby.classes.dir}"/>
|
|
|
31 |
+ <arg line="-classpath ${jruby.classes.dir}:${prop.classpath}"/>
|
|
|
32 |
+ <arg line="-sourcepath ${src.dir}"/>
|
|
|
33 |
+ <arg line="-target ${javac.version}"/>
|
|
|
34 |
+ <arg line="-encoding UTF-8"/>
|
|
|
35 |
+ <arg value="-g"/>
|
|
|
36 |
+ <arg value="-XDignore.symbol.file=true"/>
|
|
|
37 |
+ <arg line="-source ${javac.version}"/>
|
|
|
38 |
+ <arg line="-factory org.jruby.anno.AnnotationBinder"/>
|
|
|
39 |
+ <arg line="${list}"/>
|
|
|
40 |
+ </exec>
|
|
|
41 |
</target>
|
|
|
42 |
|
|
|
43 |
<target name="compile" depends="compile-jruby"
|