Annotation of /trunk/sslexplorer/patches/sslexplorer-1.0.0_rc17-java6.patch
Parent Directory | Revision Log
Revision 673 -
(hide annotations)
(download)
Mon Aug 25 21:30:44 2008 UTC (16 years, 1 month ago) by niro
File size: 3788 byte(s)
Mon Aug 25 21:30:44 2008 UTC (16 years, 1 month ago) by niro
File size: 3788 byte(s)
-re-diffed for 1.0.0_rc17
1 | niro | 673 | diff -Naur sslexplorer-1.0.0_RC17/maverick-crypto/build.xml sslexplorer-1.0.0_RC17-magellan/maverick-crypto/build.xml |
2 | --- sslexplorer-1.0.0_RC17/maverick-crypto/build.xml 2008-03-04 12:53:35.000000000 +0100 | ||
3 | +++ sslexplorer-1.0.0_RC17-magellan/maverick-crypto/build.xml 2008-08-25 23:36:32.000000000 +0200 | ||
4 | @@ -37,7 +37,7 @@ | ||
5 | <!-- Compile the library --> | ||
6 | <target name="compile"> | ||
7 | <mkdir dir="${build.output}" /> | ||
8 | - <javac target="1.1" source="1.1" classpathref="maverick-crypto.class.path" compiler="${build.compiler}" destdir="${build.output}" srcdir="${build.src}" includeantruntime="false" includes="**/*.java"></javac> | ||
9 | + <javac target="1.2" source="1.2" classpathref="maverick-crypto.class.path" compiler="${build.compiler}" destdir="${build.output}" srcdir="${build.src}" includeantruntime="false" includes="**/*.java"></javac> | ||
10 | </target> | ||
11 | |||
12 | <!-- Clean up all built files --> | ||
13 | diff -Naur sslexplorer-1.0.0_RC17/maverick-multiplex/build.xml sslexplorer-1.0.0_RC17-magellan/maverick-multiplex/build.xml | ||
14 | --- sslexplorer-1.0.0_RC17/maverick-multiplex/build.xml 2008-03-04 12:53:57.000000000 +0100 | ||
15 | +++ sslexplorer-1.0.0_RC17-magellan/maverick-multiplex/build.xml 2008-08-25 23:37:18.000000000 +0200 | ||
16 | @@ -59,7 +59,7 @@ | ||
17 | |||
18 | <!-- Multiplex must be 1.1 compliant --> | ||
19 | |||
20 | - <javac debug="${build.debug}" target="1.1" compiler="${build.compiler}" destdir="${build.output}" srcdir="${build.tmp.src}" includeantruntime="false" includes="**/*.java" classpathref="maverick-multiplex.class.path"> | ||
21 | + <javac debug="${build.debug}" target="1.2" source="1.2" compiler="${build.compiler}" destdir="${build.output}" srcdir="${build.tmp.src}" includeantruntime="false" includes="**/*.java" classpathref="maverick-multiplex.class.path"> | ||
22 | <classpath> | ||
23 | <fileset dir="lib"> | ||
24 | <include name="*.jar"/> | ||
25 | diff -Naur sslexplorer-1.0.0_RC17/maverick-ssl/build.xml sslexplorer-1.0.0_RC17-magellan/maverick-ssl/build.xml | ||
26 | --- sslexplorer-1.0.0_RC17/maverick-ssl/build.xml 2008-03-04 12:53:57.000000000 +0100 | ||
27 | +++ sslexplorer-1.0.0_RC17-magellan/maverick-ssl/build.xml 2008-08-25 23:37:42.000000000 +0200 | ||
28 | @@ -72,7 +72,7 @@ | ||
29 | <exclude name="**/CVS/**/*"/> | ||
30 | </fileset> | ||
31 | </copy> | ||
32 | - <javac target="1.1" source="1.2" compiler="${build.compiler}" destdir="${build.output}" | ||
33 | + <javac target="1.2" source="1.2" compiler="${build.compiler}" destdir="${build.output}" | ||
34 | srcdir="${build.src}" | ||
35 | includeantruntime="false" includes="**/*.java" classpathref="maverick-ssl.class.path" | ||
36 | debug="true"> | ||
37 | @@ -119,7 +119,7 @@ | ||
38 | <pathelement path="${build-tools.home}/codeswitcher/codeswitcher.jar"/> | ||
39 | </classpath> | ||
40 | </java> | ||
41 | - <javac target="1.1" source="1.2" compiler="${build.compiler}" destdir="${build.output}" | ||
42 | + <javac target="1.2" source="1.2" compiler="${build.compiler}" destdir="${build.output}" | ||
43 | srcdir="${build.tmp}" | ||
44 | includeantruntime="false" includes="**/*.java" classpathref="maverick-ssl.class.path" | ||
45 | debug="true"> | ||
46 | diff -Naur sslexplorer-1.0.0_RC17/maverick-util/build.xml sslexplorer-1.0.0_RC17-magellan/maverick-util/build.xml | ||
47 | --- sslexplorer-1.0.0_RC17/maverick-util/build.xml 2008-03-04 12:53:58.000000000 +0100 | ||
48 | +++ sslexplorer-1.0.0_RC17-magellan/maverick-util/build.xml 2008-08-25 23:37:56.000000000 +0200 | ||
49 | @@ -41,7 +41,7 @@ | ||
50 | |||
51 | <target name="compile"> | ||
52 | <mkdir dir="${build.output}" /> | ||
53 | - <javac target="1.1" source="1.1" compiler="${build.compiler}" destdir="${build.output}" srcdir="${build.src}" includeantruntime="false" includes="**/*.java" classpathref="maverick-util.class.path"> | ||
54 | + <javac target="1.2" source="1.2" compiler="${build.compiler}" destdir="${build.output}" srcdir="${build.src}" includeantruntime="false" includes="**/*.java" classpathref="maverick-util.class.path"> | ||
55 | </javac> | ||
56 | </target> | ||
57 |