From 7b9db07f13e166645fff30cda1c83421fcdb1cb0 Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Mon, 12 Jul 2004 16:39:22 +0000
Subject: [PATCH] target=1.3 and source=1.3, not target=1.1 and source=1.3
(this is what caused the runtime errors on sun jvms but not on kaffe) ((aka i
slacked and didn't test sufficiently. off with my head)) this now builds and
runs fine in sun 1.3-1.5 jvms, as well as kaffe
---
apps/heartbeat/java/build.xml | 4 ++--
apps/httptunnel/java/build.xml | 2 +-
apps/i2ptunnel/java/build.xml | 2 +-
apps/ministreaming/java/build.xml | 2 +-
apps/netmonitor/java/build.xml | 4 ++--
apps/phttprelay/java/build.xml | 2 +-
apps/sam/java/build.xml | 2 +-
apps/time/java/build.xml | 2 +-
core/java/build.xml | 2 +-
installer/java/build.xml | 2 +-
router/java/build.xml | 2 +-
11 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/apps/heartbeat/java/build.xml b/apps/heartbeat/java/build.xml
index 1cf44876dd..99a627956c 100644
--- a/apps/heartbeat/java/build.xml
+++ b/apps/heartbeat/java/build.xml
@@ -9,12 +9,12 @@
<target name="compile">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
- <javac srcdir="./src" debug="true" target="1.1" source="1.3" deprecation="on" destdir="./build/obj" includes="**/*.java" excludes="net/i2p/heartbeat/gui/**" classpath="../../../core/java/build/i2p.jar" />
+ <javac srcdir="./src" debug="true" deprecation="on" source="1.3" target="1.3" destdir="./build/obj" includes="**/*.java" excludes="net/i2p/heartbeat/gui/**" classpath="../../../core/java/build/i2p.jar" />
</target>
<target name="compileGUI">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
- <javac debug="true" target="1.1" source="1.3" deprecation="on" destdir="./build/obj">
+ <javac debug="true" source="1.3" target="1.3" deprecation="on" destdir="./build/obj">
<src path="src/" />
<classpath path="../../../core/java/build/i2p.jar" />
<classpath path="../../jfreechart/jfreechart-0.9.17/lib/jcommon-0.9.2.jar" />
diff --git a/apps/httptunnel/java/build.xml b/apps/httptunnel/java/build.xml
index 39f88315f5..9dfe9ac589 100644
--- a/apps/httptunnel/java/build.xml
+++ b/apps/httptunnel/java/build.xml
@@ -11,7 +11,7 @@
<mkdir dir="./build/obj" />
<javac
srcdir="./src"
- debug="true" target="1.1" source="1.3" deprecation="on"
+ debug="true" deprecation="on" source="1.3" target="1.3"
destdir="./build/obj"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" />
</target>
diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index 9e1304a8f4..e7bceaafc7 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -11,7 +11,7 @@
<mkdir dir="./build/obj" />
<javac
srcdir="./src"
- debug="true" target="1.1" source="1.3" deprecation="on"
+ debug="true" deprecation="on" source="1.3" target="1.3"
destdir="./build/obj"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" />
</target>
diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
index 3eb9d32aec..70fe0fe007 100644
--- a/apps/ministreaming/java/build.xml
+++ b/apps/ministreaming/java/build.xml
@@ -8,7 +8,7 @@
<target name="compile">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
- <javac srcdir="./src" debug="true" target="1.1" source="1.3" deprecation="on" destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" />
+ <javac srcdir="./src" debug="true" deprecation="on" source="1.3" target="1.3" destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" />
</target>
<target name="jar" depends="compile">
<jar destfile="./build/mstreaming.jar" basedir="./build/obj" includes="**/*.class" />
diff --git a/apps/netmonitor/java/build.xml b/apps/netmonitor/java/build.xml
index 48b88f3512..a463045561 100644
--- a/apps/netmonitor/java/build.xml
+++ b/apps/netmonitor/java/build.xml
@@ -9,13 +9,13 @@
<target name="compile">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
- <javac srcdir="./src" debug="true" target="1.1" source="1.3" deprecation="on" destdir="./build/obj" includes="net/**/*.java" excludes="net/i2p/netmonitor/gui/**" classpath="../../../core/java/build/i2p.jar" />
+ <javac srcdir="./src" debug="true" source="1.3" target="1.3" deprecation="on" destdir="./build/obj" includes="net/**/*.java" excludes="net/i2p/netmonitor/gui/**" classpath="../../../core/java/build/i2p.jar" />
</target>
<target name="compileGUI" depends="builddep">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
- <javac debug="true" target="1.1" source="1.3" deprecation="on" destdir="./build/obj">
+ <javac debug="true" source="1.3" target="1.3" deprecation="on" destdir="./build/obj">
<src path="src/" />
<classpath path="../../../core/java/build/i2p.jar" />
<classpath path="../../jfreechart/jfreechart-0.9.17/lib/jcommon-0.9.2.jar" />
diff --git a/apps/phttprelay/java/build.xml b/apps/phttprelay/java/build.xml
index c0b410c256..6d924a2a27 100644
--- a/apps/phttprelay/java/build.xml
+++ b/apps/phttprelay/java/build.xml
@@ -8,7 +8,7 @@
<target name="compile">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
- <javac srcdir="./src" debug="true" target="1.1" source="1.3" deprecation="on" destdir="./build/obj" classpath="../../../core/java/build/i2p.jar:lib/javax.servlet.jar" />
+ <javac srcdir="./src" debug="true" source="1.3" target="1.3" deprecation="on" destdir="./build/obj" classpath="../../../core/java/build/i2p.jar:lib/javax.servlet.jar" />
</target>
<target name="jar" depends="compile">
<war destfile="./build/phttprelay.war" webxml="web.xml">
diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
index e9d28bf92a..065f0a9be5 100644
--- a/apps/sam/java/build.xml
+++ b/apps/sam/java/build.xml
@@ -11,7 +11,7 @@
<mkdir dir="./build/obj" />
<javac
srcdir="./src"
- debug="true" target="1.1" source="1.3" deprecation="on"
+ debug="true" deprecation="on" source="1.3" target="1.3"
destdir="./build/obj"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" />
</target>
diff --git a/apps/time/java/build.xml b/apps/time/java/build.xml
index 677a45ff15..768d6e2164 100644
--- a/apps/time/java/build.xml
+++ b/apps/time/java/build.xml
@@ -8,7 +8,7 @@
<target name="compile">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
- <javac srcdir="./src" debug="true" target="1.1" source="1.3" deprecation="on" destdir="./build/obj" includes="**/*.java" classpath="../../../core/java/build/i2p.jar" />
+ <javac srcdir="./src" debug="true" source="1.3" target="1.3" deprecation="on" destdir="./build/obj" includes="**/*.java" classpath="../../../core/java/build/i2p.jar" />
</target>
<target name="jar" depends="compile">
<jar destfile="./build/timestamper.jar" basedir="./build/obj" includes="**/*.class">
diff --git a/core/java/build.xml b/core/java/build.xml
index 97ed0a3dfd..04ce8754ee 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -8,7 +8,7 @@
<target name="compile">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
- <javac srcdir="./src:./test" debug="true" target="1.1" source="1.3" deprecation="on" destdir="./build/obj" />
+ <javac srcdir="./src:./test" debug="true" source="1.3" target="1.3" deprecation="on" destdir="./build/obj" />
</target>
<target name="jar" depends="compile">
<jar destfile="./build/i2p.jar" basedir="./build/obj" includes="**/*.class" />
diff --git a/installer/java/build.xml b/installer/java/build.xml
index ba16524ee1..6a4ba24af8 100644
--- a/installer/java/build.xml
+++ b/installer/java/build.xml
@@ -15,7 +15,7 @@
<target name="compile">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
- <javac srcdir="./src" debug="true" target="1.1" source="1.3" deprecation="on" destdir="./build/obj" />
+ <javac srcdir="./src" debug="true" source="1.3" target="1.3" deprecation="on" destdir="./build/obj" />
</target>
<target name="jar" depends="installer, guiinstaller" />
<target name="fetchseeds" depends="compile">
diff --git a/router/java/build.xml b/router/java/build.xml
index 5af51bc39e..3b8c6f8ed8 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -8,7 +8,7 @@
<target name="compile">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
- <javac srcdir="./src:./test" debug="true" target="1.1" source="1.3" deprecation="on" destdir="./build/obj" classpath="../../core/java/build/i2p.jar" />
+ <javac srcdir="./src:./test" debug="true" source="1.3" target="1.3" deprecation="on" destdir="./build/obj" classpath="../../core/java/build/i2p.jar" />
</target>
<target name="jar" depends="compile">
<jar destfile="./build/router.jar" basedir="./build/obj" includes="**/*.class" />
--
GitLab