From 880f1866dc53436b96e6b8ed17288a3a60df20b7 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 10 Feb 2010 12:06:30 +0000
Subject: [PATCH] take version number off jrobin jar so we can overwrite if we
 upgrade

---
 apps/routerconsole/java/build.xml | 3 ++-
 build.xml                         | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 95568170dc..78384113f9 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -64,7 +64,8 @@
     <target name="jar" depends="compile">
         <jar destfile="./build/routerconsole.jar" basedir="./build/obj" includes="**/*.class">
             <manifest>
-                <attribute name="Class-Path" value="i2p.jar router.jar jrobin-1.4.0.jar" />
+                <!-- top level installer will rename to jrobin.jar -->
+                <attribute name="Class-Path" value="i2p.jar router.jar jrobin.jar" />
             </manifest>
         </jar>
         <delete dir="./tmpextract" />
diff --git a/build.xml b/build.xml
index f56f141785..6d3195443b 100644
--- a/build.xml
+++ b/build.xml
@@ -314,8 +314,8 @@
         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
         <copy file="build/router.jar" todir="pkg-temp/lib/" />
         <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
-        <!-- pulled out of routerconsole.jar in 0.7.12 -->
-        <copy file="apps/jrobin/jrobin-1.4.0.jar" todir="pkg-temp/lib/" />
+        <!-- pulled out of routerconsole.jar in 0.7.12; name without version so we can overwrite if we upgrade  -->
+        <copy file="apps/jrobin/jrobin-1.4.0.jar" tofile="pkg-temp/lib/jrobin.jar" />
         <copy file="build/sam.jar" todir="pkg-temp/lib/" />
         <copy file="build/BOB.jar" todir="pkg-temp/lib/" />
         <copy file="build/systray.jar" todir="pkg-temp/lib" />
@@ -490,7 +490,8 @@
         <copy file="build/streaming.jar" todir="pkg-temp/lib/" />
         <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
         <!-- pulled out of routerconsole.jar in 0.7.12, someday we can take out of updater -->
-        <copy file="apps/jrobin/jrobin-1.4.0.jar" todir="pkg-temp/lib/" />
+        <!-- name without version so we can overwrite if we upgrade  -->
+        <copy file="apps/jrobin/jrobin-1.4.0.jar" tofile="pkg-temp/lib/jrobin.jar" />
         <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
         <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
         <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />