From 467a48cfe1e7e95ef281951d5fdb43f38b03fc6c Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 5 May 2020 10:36:56 +0000
Subject: [PATCH] Build: Use --java2 for msgfmt Runtime should be smaller and
faster w/o Hashtable Increases p200 size by < 1%; repack by 3.5%; updater by
4.5%
---
apps/desktopgui/bundle-messages.sh | 4 ++--
apps/i2psnark/java/bundle-messages.sh | 4 ++--
apps/i2ptunnel/java/bundle-messages-proxy.sh | 4 ++--
apps/i2ptunnel/java/bundle-messages.sh | 4 ++--
apps/ministreaming/java/bundle-messages.sh | 4 ++--
apps/routerconsole/java/bundle-messages-countries.sh | 4 ++--
apps/routerconsole/java/bundle-messages-news.sh | 4 ++--
apps/routerconsole/java/bundle-messages.sh | 4 ++--
apps/susidns/src/bundle-messages.sh | 4 ++--
apps/susimail/bundle-messages.sh | 4 ++--
core/java/bundle-messages.sh | 4 ++--
router/java/bundle-messages.sh | 4 ++--
12 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/apps/desktopgui/bundle-messages.sh b/apps/desktopgui/bundle-messages.sh
index 4981beadec..6a3caa7d44 100644
--- a/apps/desktopgui/bundle-messages.sh
+++ b/apps/desktopgui/bundle-messages.sh
@@ -110,7 +110,7 @@ do
then
# slow way
# convert to class files in build
- msgfmt --java --statistics -r $CLASS -l $LG -d build $i
+ msgfmt --java2 --statistics -r $CLASS -l $LG -d build $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -128,7 +128,7 @@ do
TDY=$TD2/net/i2p/desktopgui
rm -rf $TD
mkdir -p $TD $TDY
- msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+ msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/i2psnark/java/bundle-messages.sh b/apps/i2psnark/java/bundle-messages.sh
index fb269d8248..bcb4268cf8 100755
--- a/apps/i2psnark/java/bundle-messages.sh
+++ b/apps/i2psnark/java/bundle-messages.sh
@@ -101,7 +101,7 @@ do
then
# slow way
# convert to class files in build/obj
- msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+ msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -119,7 +119,7 @@ do
TDY=$TD2/org/klomp/snark/web
rm -rf $TD
mkdir -p $TD $TDY
- msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+ msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/i2ptunnel/java/bundle-messages-proxy.sh b/apps/i2ptunnel/java/bundle-messages-proxy.sh
index 43f3c613e0..e3fe5bb229 100755
--- a/apps/i2ptunnel/java/bundle-messages-proxy.sh
+++ b/apps/i2ptunnel/java/bundle-messages-proxy.sh
@@ -103,7 +103,7 @@ do
then
# slow way
# convert to class files in build/obj
- msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+ msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -121,7 +121,7 @@ do
TDY=$TD2/net/i2p/i2ptunnel/proxy
rm -rf $TD
mkdir -p $TD $TDY
- msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+ msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/i2ptunnel/java/bundle-messages.sh b/apps/i2ptunnel/java/bundle-messages.sh
index c0ef7010ef..5840f620e9 100755
--- a/apps/i2ptunnel/java/bundle-messages.sh
+++ b/apps/i2ptunnel/java/bundle-messages.sh
@@ -102,7 +102,7 @@ do
then
# slow way
# convert to class files in jsp/WEB-INF/classes
- msgfmt --java --statistics -r $CLASS -l $LG -d ../jsp/WEB-INF/classes $i
+ msgfmt --java2 --statistics -r $CLASS -l $LG -d ../jsp/WEB-INF/classes $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -120,7 +120,7 @@ do
TDY=$TD2/net/i2p/i2ptunnel/web
rm -rf $TD
mkdir -p $TD $TDY
- msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+ msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/ministreaming/java/bundle-messages.sh b/apps/ministreaming/java/bundle-messages.sh
index 76c128f2a6..3092be3aa0 100755
--- a/apps/ministreaming/java/bundle-messages.sh
+++ b/apps/ministreaming/java/bundle-messages.sh
@@ -101,7 +101,7 @@ do
then
# slow way
# convert to class files in build/obj
- msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+ msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -119,7 +119,7 @@ do
TDY=$TD2/net/i2p/client/streaming
rm -rf $TD
mkdir -p $TD $TDY
- msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+ msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/routerconsole/java/bundle-messages-countries.sh b/apps/routerconsole/java/bundle-messages-countries.sh
index 27ca2240b6..5d8198744a 100755
--- a/apps/routerconsole/java/bundle-messages-countries.sh
+++ b/apps/routerconsole/java/bundle-messages-countries.sh
@@ -117,7 +117,7 @@ do
then
# slow way
# convert to class files in build/obj
- msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+ msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -135,7 +135,7 @@ do
TDY=$TD2/net/i2p/router/countries
rm -rf $TD
mkdir -p $TD $TDY
- msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+ msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/routerconsole/java/bundle-messages-news.sh b/apps/routerconsole/java/bundle-messages-news.sh
index 1f03424276..bf502dd23f 100755
--- a/apps/routerconsole/java/bundle-messages-news.sh
+++ b/apps/routerconsole/java/bundle-messages-news.sh
@@ -103,7 +103,7 @@ do
then
# slow way
# convert to class files in build/obj
- msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+ msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -121,7 +121,7 @@ do
TDY=$TD2/net/i2p/router/news
rm -rf $TD
mkdir -p $TD $TDY
- msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+ msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh
index 75a7184e40..70ebd9d4c4 100755
--- a/apps/routerconsole/java/bundle-messages.sh
+++ b/apps/routerconsole/java/bundle-messages.sh
@@ -128,7 +128,7 @@ do
then
# slow way
# convert to class files in build/obj
- msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+ msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -146,7 +146,7 @@ do
TDY=$TD2/net/i2p/router/web
rm -rf $TD
mkdir -p $TD $TDY
- msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+ msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/susidns/src/bundle-messages.sh b/apps/susidns/src/bundle-messages.sh
index c5a10ef73c..a35e32aa42 100755
--- a/apps/susidns/src/bundle-messages.sh
+++ b/apps/susidns/src/bundle-messages.sh
@@ -109,7 +109,7 @@ do
then
# slow way
# convert to class files in WEB-INF/classes
- msgfmt --java --statistics -r $CLASS -l $LG -d WEB-INF/classes $i
+ msgfmt --java2 --statistics -r $CLASS -l $LG -d WEB-INF/classes $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -127,7 +127,7 @@ do
TDY=$TD2/i2p/susi/dns
rm -rf $TD
mkdir -p $TD $TDY
- msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+ msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/susimail/bundle-messages.sh b/apps/susimail/bundle-messages.sh
index caf11eda77..d939f8c685 100644
--- a/apps/susimail/bundle-messages.sh
+++ b/apps/susimail/bundle-messages.sh
@@ -101,7 +101,7 @@ do
then
# slow way
# convert to class files in src/WEB-INF/classes
- msgfmt --java --statistics -r $CLASS -l $LG -d src/WEB-INF/classes $i
+ msgfmt --java2 --statistics -r $CLASS -l $LG -d src/WEB-INF/classes $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -119,7 +119,7 @@ do
TDY=$TD2/i2p/susi/webmail
rm -rf $TD
mkdir -p $TD $TDY
- msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+ msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/core/java/bundle-messages.sh b/core/java/bundle-messages.sh
index 3c8586b4f1..2c58e625d5 100755
--- a/core/java/bundle-messages.sh
+++ b/core/java/bundle-messages.sh
@@ -105,7 +105,7 @@ do
then
# slow way
# convert to class files in build/obj
- msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+ msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -123,7 +123,7 @@ do
TDY=$TD2/net/i2p/util
rm -rf $TD
mkdir -p $TD $TDY
- msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+ msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/router/java/bundle-messages.sh b/router/java/bundle-messages.sh
index f4aa36b257..5690e69c2b 100755
--- a/router/java/bundle-messages.sh
+++ b/router/java/bundle-messages.sh
@@ -107,7 +107,7 @@ do
then
# slow way
# convert to class files in build/obj
- msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+ msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -125,7 +125,7 @@ do
TDY=$TD2/net/i2p/router/util
rm -rf $TD
mkdir -p $TD $TDY
- msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+ msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
if [ $? -ne 0 ]
then
echo "ERROR - msgfmt failed on ${i}, not updating translations"
--
GitLab