translation build fixups

This commit is contained in:
zzz
2009-12-10 02:12:18 +00:00
parent 14362630d7
commit 8116d88aaf
4 changed files with 9 additions and 11 deletions

View File

@ -36,8 +36,8 @@
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />
</javac> </javac>
</target> </target>
<target name="jar" depends="builddep, compile, bundle"> <target name="jar" depends="builddep, compile">
<jar destfile="./build/i2psnark.jar" basedir="./build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class"> <jar destfile="./build/i2psnark.jar" basedir="./build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class **/messages_*.class">
<manifest> <manifest>
<attribute name="Main-Class" value="org.klomp.snark.Snark" /> <attribute name="Main-Class" value="org.klomp.snark.Snark" />
<attribute name="Class-Path" value="i2p.jar mstreaming.jar streaming.jar" /> <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. - So we must continue to duplicate everything in the war.
<classes dir="./build/obj" includes="**/I2PSnarkServlet*.class" /> <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"> <war destfile="../i2psnark.war" webxml="../web.xml">
<classes dir="./build/obj" includes="**/*.class" excludes="**/RunStandalone.class" /> <classes dir="./build/obj" includes="**/*.class" excludes="**/RunStandalone.class" />
</war> </war>
@ -127,9 +127,7 @@
<delete dir="./dist" /> <delete dir="./dist" />
</target> </target>
<target name="cleandep" depends="clean"> <target name="cleandep" depends="clean">
<ant dir="../../ministreaming/java/" target="distclean" />
</target> </target>
<target name="distclean" depends="clean"> <target name="distclean" depends="clean">
<ant dir="../../ministreaming/java/" target="distclean" />
</target> </target>
</project> </project>

View File

@ -9,7 +9,7 @@
# #
# zzz - public domain # zzz - public domain
# #
CLASS=org.klomp.snark.messages CLASS=org.klomp.snark.web.messages
TMPFILE=build/javafiles.txt TMPFILE=build/javafiles.txt
export TZ=UTC export TZ=UTC
@ -32,8 +32,8 @@ do
find $JPATHS -name *.java -newer $i > $TMPFILE find $JPATHS -name *.java -newer $i > $TMPFILE
fi fi
if [ -s build/obj/org/klomp/snark/messages_$LG.class -a \ if [ -s build/obj/org/klomp/snark/web/messages_$LG.class -a \
build/obj/org/klomp/snark/messages_$LG.class -nt $i -a \ build/obj/org/klomp/snark/web/messages_$LG.class -nt $i -a \
! -s $TMPFILE ] ! -s $TMPFILE ]
then then
continue continue

View File

@ -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 */ /** lang in routerconsole.lang property, else current locale */
public String getString(String key) { public String getString(String key) {

View File

@ -32,8 +32,8 @@ do
find $JPATHS -name *.java -newer $i > $TMPFILE find $JPATHS -name *.java -newer $i > $TMPFILE
fi fi
if [ -s build/obj/net/i2p/i2ptunnel/messages_$LG.class -a \ if [ -s build/obj/net/i2p/i2ptunnel/web/messages_$LG.class -a \
build/obj/net/i2p/i2ptunnel/messages_$LG.class -nt $i -a \ build/obj/net/i2p/i2ptunnel/web/messages_$LG.class -nt $i -a \
! -s $TMPFILE ] ! -s $TMPFILE ]
then then
continue continue