From 8116d88aafd6a751f55afed3e639e996b5577d7c Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 10 Dec 2009 02:12:18 +0000
Subject: [PATCH] translation build fixups
---
apps/i2psnark/java/build.xml | 8 +++-----
apps/i2psnark/java/bundle-messages.sh | 6 +++---
apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java | 2 +-
apps/i2ptunnel/java/bundle-messages.sh | 4 ++--
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index bcafb362e8..8323d57f65 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -36,8 +36,8 @@
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
- <target name="jar" depends="builddep, compile, bundle">
- <jar destfile="./build/i2psnark.jar" basedir="./build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class">
+ <target name="jar" depends="builddep, compile">
+ <jar destfile="./build/i2psnark.jar" basedir="./build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class **/messages_*.class">
<manifest>
<attribute name="Main-Class" value="org.klomp.snark.Snark" />
<attribute name="Class-Path" value="i2p.jar mstreaming.jar streaming.jar" />
@@ -51,7 +51,7 @@
- So we must continue to duplicate everything in the war.
<classes dir="./build/obj" includes="**/I2PSnarkServlet*.class" />
-->
- <target name="war" depends="jar">
+ <target name="war" depends="jar, bundle">
<war destfile="../i2psnark.war" webxml="../web.xml">
<classes dir="./build/obj" includes="**/*.class" excludes="**/RunStandalone.class" />
</war>
@@ -127,9 +127,7 @@
<delete dir="./dist" />
</target>
<target name="cleandep" depends="clean">
- <ant dir="../../ministreaming/java/" target="distclean" />
</target>
<target name="distclean" depends="clean">
- <ant dir="../../ministreaming/java/" target="distclean" />
</target>
</project>
diff --git a/apps/i2psnark/java/bundle-messages.sh b/apps/i2psnark/java/bundle-messages.sh
index bd62ea9ee3..ad8c0ab84e 100755
--- a/apps/i2psnark/java/bundle-messages.sh
+++ b/apps/i2psnark/java/bundle-messages.sh
@@ -9,7 +9,7 @@
#
# zzz - public domain
#
-CLASS=org.klomp.snark.messages
+CLASS=org.klomp.snark.web.messages
TMPFILE=build/javafiles.txt
export TZ=UTC
@@ -32,8 +32,8 @@ do
find $JPATHS -name *.java -newer $i > $TMPFILE
fi
- if [ -s build/obj/org/klomp/snark/messages_$LG.class -a \
- build/obj/org/klomp/snark/messages_$LG.class -nt $i -a \
+ if [ -s build/obj/org/klomp/snark/web/messages_$LG.class -a \
+ build/obj/org/klomp/snark/web/messages_$LG.class -nt $i -a \
! -s $TMPFILE ]
then
continue
diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
index b40233fbb6..3eafb645e2 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
@@ -404,7 +404,7 @@ public class I2PSnarkUtil {
}
}
- private static final String BUNDLE_NAME = "org.klomp.snark.messages";
+ private static final String BUNDLE_NAME = "org.klomp.snark.web.messages";
/** lang in routerconsole.lang property, else current locale */
public String getString(String key) {
diff --git a/apps/i2ptunnel/java/bundle-messages.sh b/apps/i2ptunnel/java/bundle-messages.sh
index b4f694b714..aa98a31677 100755
--- a/apps/i2ptunnel/java/bundle-messages.sh
+++ b/apps/i2ptunnel/java/bundle-messages.sh
@@ -32,8 +32,8 @@ do
find $JPATHS -name *.java -newer $i > $TMPFILE
fi
- if [ -s build/obj/net/i2p/i2ptunnel/messages_$LG.class -a \
- build/obj/net/i2p/i2ptunnel/messages_$LG.class -nt $i -a \
+ if [ -s build/obj/net/i2p/i2ptunnel/web/messages_$LG.class -a \
+ build/obj/net/i2p/i2ptunnel/web/messages_$LG.class -nt $i -a \
! -s $TMPFILE ]
then
continue
--
GitLab