77 lines
3.2 KiB
Diff
77 lines
3.2 KiB
Diff
diff --git a/build.xml b/build.xml
|
|
index 814774d..f74c6de 100644
|
|
--- a/build.xml
|
|
+++ b/build.xml
|
|
@@ -290,41 +290,21 @@
|
|
/>
|
|
|
|
|
|
- <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" />
|
|
+ <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" />
|
|
<javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off"
|
|
debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
|
|
includeantruntime="false"
|
|
- classpathref="ivy.dep.jython2.0"
|
|
+ classpathref="ivy.dep.jython2.5"
|
|
bootclasspath="${boot.classpath.j2se1.7}"
|
|
includes="
|
|
freemarker/ext/ant/**,
|
|
freemarker/template/utility/JythonRuntime.java,
|
|
freemarker/ext/jython/**"
|
|
excludes="
|
|
- freemarker/ext/jython/_Jython22VersionAdapter.java,
|
|
- freemarker/ext/jython/_Jython25VersionAdapter.java"
|
|
- />
|
|
-
|
|
- <ivy:cachepath conf="build.jython2.2" pathid="ivy.dep.jython2.2" />
|
|
- <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off"
|
|
- debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
|
|
- includeantruntime="false"
|
|
- classpathref="ivy.dep.jython2.2"
|
|
- bootclasspath="${boot.classpath.j2se1.7}"
|
|
- includes="
|
|
+ freemarker/ext/jython/_Jython20And21VersionAdapter.java,
|
|
freemarker/ext/jython/_Jython22VersionAdapter.java"
|
|
/>
|
|
|
|
- <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" />
|
|
- <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off"
|
|
- debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
|
|
- includeantruntime="false"
|
|
- classpathref="ivy.dep.jython2.5"
|
|
- bootclasspath="${boot.classpath.j2se1.7}"
|
|
- includes="
|
|
- freemarker/ext/jython/_Jython25VersionAdapter.java"
|
|
- />
|
|
-
|
|
<rmic base="build/classes" classpathref="ivy.dep"
|
|
includes="build/src-main-java-filtered/freemarker/debug/impl/Rmi*Impl.class"
|
|
verify="yes" stubversion="1.2"
|
|
diff --git a/ivy.xml b/ivy.xml
|
|
index 065a3ba..d7af30f 100644
|
|
--- a/ivy.xml
|
|
+++ b/ivy.xml
|
|
@@ -49,12 +49,6 @@
|
|
description="for building FreeMarker with JSP 2.1 support"
|
|
/>
|
|
|
|
- <conf name="build.jython2.0" extends="build.base"
|
|
- description="for building FreeMarker with Jython 2.0 support"
|
|
- />
|
|
- <conf name="build.jython2.2" extends="build.base"
|
|
- description="for building FreeMarker with Jython 2.2 support"
|
|
- />
|
|
<conf name="build.jython2.5" extends="build.base"
|
|
description="for building FreeMarker with Jython 2.5 support"
|
|
/>
|
|
@@ -106,9 +100,6 @@
|
|
|
|
<dependency org="rhino" name="js" rev="1.6R1" conf="build.base->default" />
|
|
|
|
- <!-- We use Jython 2.1 because there was no 2.0 in central; the relevant methods are the same. -->
|
|
- <dependency org="jython" name="jython" rev="2.1" conf="build.jython2.0->default" />
|
|
- <dependency org="org.python" name="jython" rev="2.2.1" conf="build.jython2.2->default" />
|
|
<dependency org="org.python" name="jython" rev="2.5.0" conf="build.jython2.5->default" />
|
|
|
|
<dependency org="avalon-logkit" name="avalon-logkit" rev="2.0" conf="build.base->default" />
|