|
 |
2a29d10 |
--- ivy.xml.orig 2017-12-06 19:20:16.456335648 +0000
|
|
|
2a29d10 |
+++ ivy.xml 2017-12-06 19:20:59.320159647 +0000
|
|
|
2a29d10 |
@@ -49,12 +49,6 @@
|
|
|
2a29d10 |
description="for building FreeMarker with JSP 2.1 support"
|
|
 |
b4a5899 |
/>
|
|
|
b4a5899 |
|
|
|
2a29d10 |
-
|
|
|
2a29d10 |
- description="for building FreeMarker with Jython 2.0 support"
|
|
|
2a29d10 |
- />
|
|
|
2a29d10 |
-
|
|
|
2a29d10 |
- description="for building FreeMarker with Jython 2.2 support"
|
|
|
2a29d10 |
- />
|
|
|
2a29d10 |
|
|
|
2a29d10 |
description="for building FreeMarker with Jython 2.5 support"
|
|
|
2a29d10 |
/>
|
|
|
2a29d10 |
@@ -106,9 +100,6 @@
|
|
|
2a29d10 |
|
|
|
2a29d10 |
<dependency org="rhino" name="js" rev="1.6R1" conf="build.base->default" />
|
|
|
2a29d10 |
|
|
|
2a29d10 |
-
|
|
|
2a29d10 |
- <dependency org="jython" name="jython" rev="2.1" conf="build.jython2.0->default" />
|
|
|
2a29d10 |
- <dependency org="org.python" name="jython" rev="2.2.1" conf="build.jython2.2->default" />
|
|
|
2a29d10 |
<dependency org="org.python" name="jython" rev="2.5.0" conf="build.jython2.5->default" />
|
|
|
2a29d10 |
|
|
|
2a29d10 |
<dependency org="avalon-logkit" name="avalon-logkit" rev="2.0" conf="build.base->default" />
|
|
|
2a29d10 |
--- build.xml 2017-12-06 19:19:56.790416398 +0000
|
|
|
2a29d10 |
+++ build.xml.orig 2017-12-06 19:25:06.163149500 +0000
|
|
|
2a29d10 |
@@ -318,41 +318,21 @@
|
|
|
2a29d10 |
freemarker/ext/jsp/FreeMarkerJspFactory2.java"
|
|
|
2a29d10 |
/>
|
|
|
2a29d10 |
|
|
|
b4a5899 |
- <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" />
|
|
|
b4a5899 |
+ <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" />
|
|
|
2a29d10 |
|
|
|
2a29d10 |
debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
|
|
|
b4a5899 |
includeantruntime="false"
|
|
|
b4a5899 |
- classpathref="ivy.dep.jython2.0"
|
|
|
b4a5899 |
+ classpathref="ivy.dep.jython2.5"
|
|
|
2a29d10 |
bootclasspath="${boot.classpath.j2se1.5}"
|
|
|
b4a5899 |
includes="
|
|
|
b4a5899 |
freemarker/ext/ant/**,
|
|
|
b4a5899 |
freemarker/template/utility/JythonRuntime.java,
|
|
|
b4a5899 |
freemarker/ext/jython/**"
|
|
|
b4a5899 |
excludes="
|
|
|
b4a5899 |
- freemarker/ext/jython/_Jython22VersionAdapter.java,
|
|
|
b4a5899 |
- freemarker/ext/jython/_Jython25VersionAdapter.java"
|
|
|
b4a5899 |
- />
|
|
|
b4a5899 |
-
|
|
|
b4a5899 |
- <ivy:cachepath conf="build.jython2.2" pathid="ivy.dep.jython2.2" />
|
|
|
2a29d10 |
-
|
|
|
2a29d10 |
- debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
|
|
|
b4a5899 |
- includeantruntime="false"
|
|
|
b4a5899 |
- classpathref="ivy.dep.jython2.2"
|
|
|
2a29d10 |
- bootclasspath="${boot.classpath.j2se1.5}"
|
|
|
b4a5899 |
- includes="
|
|
|
b4a5899 |
+ freemarker/ext/jython/_Jython20And21VersionAdapter.java,
|
|
|
b4a5899 |
freemarker/ext/jython/_Jython22VersionAdapter.java"
|
|
|
b4a5899 |
/>
|
|
|
b4a5899 |
|
|
|
b4a5899 |
- <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" />
|
|
|
2a29d10 |
-
|
|
|
2a29d10 |
- debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
|
|
|
b4a5899 |
- includeantruntime="false"
|
|
|
b4a5899 |
- classpathref="ivy.dep.jython2.5"
|
|
|
b4a5899 |
- bootclasspath="${boot.classpath.j2se1.5}"
|
|
|
b4a5899 |
- includes="
|
|
|
b4a5899 |
- freemarker/ext/jython/_Jython25VersionAdapter.java"
|
|
|
b4a5899 |
- />
|
|
|
b4a5899 |
-
|
|
|
b4a5899 |
|
|
|
2a29d10 |
includes="build/src-main-java-filtered/freemarker/debug/impl/Rmi*Impl.class"
|
|
|
b4a5899 |
verify="yes" stubversion="1.2"
|