File jython-compatibility.patch of Package freemarker.28016
Index: freemarker-2.3.31/build.xml
===================================================================
--- freemarker-2.3.31.orig/build.xml
+++ freemarker-2.3.31/build.xml
@@ -302,38 +302,18 @@
freemarker/ext/jsp/FreeMarkerJspApplicationContext.java"
/>
- <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" />
+ <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.0"
+ classpathref="ivy.dep.jython2.2"
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/_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/_Jython20And21VersionAdapter.java,
freemarker/ext/jython/_Jython25VersionAdapter.java"
/>