]>
Commit | Line | Data |
---|---|---|
6deac21a ER |
1 | --- apache-tomcat-5.5.23-src/build/build.xml 2007-04-12 02:29:47.766778367 +0300 |
2 | +++ apache-tomcat-5.5.23-src/build/build.xml 2007-04-12 02:31:55.729662406 +0300 | |
3 | @@ -62,9 +62,9 @@ | |
4 | <property name="tomcat-dbcp.home" value="${base.path}/tomcat-deps" /> | |
5 | <property name="tomcat-dbcp.jar" | |
6 | value="${tomcat-dbcp.home}/naming-factory-dbcp.jar"/> | |
7 | - <property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps" /> | |
8 | + <!--<property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps" /> | |
9 | <property name="jasper-compiler-jdt.jar" | |
10 | - value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/> | |
11 | + value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/>--> | |
12 | ||
13 | <!-- Some compilers will disable debugging if true. And it doesn't do anything | |
14 | in most cases --> | |
15 | @@ -154,7 +154,7 @@ | |
16 | ||
17 | <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/> | |
18 | <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> --> | |
19 | - <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/> | |
20 | + <!--<copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>--> | |
21 | </target> | |
22 | ||
23 | <!-- ====================== Build all components =================== --> | |
7251535b ER |
24 | @@ -665,7 +665,9 @@ |
25 | <param name="destfile" value="${jdt.jar}"/> | |
26 | <param name="destdir" value="${base.path}"/> | |
27 | </antcall> | |
28 | - <antcall target="build-jasper-compiler-jdt" /> | |
29 | + <!-- | |
30 | + <antcall target="build-jasper-compiler-jdt" /> | |
31 | + --> | |
32 | </target> | |
33 | ||
34 | <target name="build-tomcat-dbcp"> | |
6deac21a ER |
35 | @@ -725,12 +727,14 @@ |
36 | </jar> | |
37 | </target> | |
38 | ||
39 | + <!-- | |
40 | <target name="build-jasper-compiler-jdt"> | |
41 | <mkdir dir="${jasper-compiler-jdt.home}"/> | |
42 | <antcall target="-build-jasper-compiler-jdt"> | |
43 | <param name="basedir" value="${jasper-compiler-jdt.home}" /> | |
44 | </antcall> | |
45 | </target> | |
46 | + --> | |
47 | ||
48 | <target name="-build-jasper-compiler-jdt"> | |
49 | <unjar src="${jdt.jar}" dest="${jasper-compiler-jdt.home}" /> | |
50 | @@ -944,7 +948,7 @@ | |
51 | <copy todir="embed/lib"> | |
52 | <fileset dir="build/common/lib"> | |
53 | <include name="jasper-compiler.jar"/> | |
54 | - <include name="jasper-compiler-jdt.jar"/> | |
55 | + <!--<include name="jasper-compiler-jdt.jar"/>--> | |
56 | </fileset> | |
57 | </copy> | |
58 |