blob: 49343706ad801900420d2188ca971db822d0f2a5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
--- build.xml.orig 2010-01-20 19:45:30.000000000 +0100
+++ build.xml 2010-02-13 00:34:30.000000000 +0100
@@ -131,7 +131,7 @@
</if>
</target>
- <target name="init" depends="-compiler-check, -init-copy, -init-no-crypto">
+ <target name="init" depends="-init-copy, -init-no-crypto">
<!-- We need the following for source distributions as there we
can't dynamically alter the classpath, and not having this
directory present causes the build to fail -->
@@ -746,7 +746,8 @@
<javac sourcepath="" srcdir="${buildDir}/${fullProdName}"
destdir="${compiler.output}"
deprecation="off"
- debug="${debug.enable}">
+ debug="${debug.enable}"
+ bootclasspath="${gentoo.bootclasspath}">
<include name="**/*.java" />
<exclude name="testsuite/**" />
<exclude name="com/mysql/jdbc/integration/**" />
@@ -763,11 +764,7 @@
<javac destdir="${compiler.output}"
deprecation="off"
debug="${debug.enable}"
- fork="yes"
- executable="${com.mysql.jdbc.java6.javac}"
- compiler="modern"
- sourcepath="" srcdir="${buildDir}/${fullProdName}"
- bootclasspath="${com.mysql.jdbc.java6.rtjar}">
+ sourcepath="" srcdir="${buildDir}/${fullProdName}">
<include name="**/JDBC4*.java" />
<include name="com/mysql/jdbc/exceptions/jdbc4/*" />
|