From 888311e34f24259472e97470f5c26608f14c987b Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 3 Jan 2021 09:08:21 -0500 Subject: [PATCH] Build: Add translations to gradle build (part 1 - jars) --- apps/desktopgui/build.gradle | 11 +++++++++++ apps/desktopgui/bundle-messages.sh | 1 + apps/i2ptunnel/build.gradle | 11 +++++++++++ apps/i2ptunnel/java/bundle-messages-proxy.sh | 1 + apps/i2ptunnel/java/bundle-messages.sh | 1 + apps/ministreaming/build.gradle | 11 +++++++++++ apps/ministreaming/java/bundle-messages.sh | 1 + apps/routerconsole/build.gradle | 13 +++++++++++++ .../routerconsole/java/bundle-messages-countries.sh | 1 + apps/routerconsole/java/bundle-messages-news.sh | 1 + apps/routerconsole/java/bundle-messages.sh | 1 + apps/susimail/bundle-messages.sh | 0 core/build.gradle | 11 +++++++++++ core/java/bundle-messages.sh | 1 + router/build.gradle | 11 +++++++++++ router/java/bundle-messages.sh | 1 + 16 files changed, 77 insertions(+) mode change 100644 => 100755 apps/desktopgui/bundle-messages.sh mode change 100644 => 100755 apps/susimail/bundle-messages.sh diff --git a/apps/desktopgui/build.gradle b/apps/desktopgui/build.gradle index 70e413812..86d37253e 100644 --- a/apps/desktopgui/build.gradle +++ b/apps/desktopgui/build.gradle @@ -2,6 +2,7 @@ sourceSets { main { java { srcDir 'src' + srcDir 'build/messages-src' } } } @@ -12,3 +13,13 @@ dependencies { compile project(':installer') compile project(':apps:systray') } + +// Create the java files from the po files. The jar task will compile them. +// This requires gettext 0.19 or higher. +// We don't support the "slow way" +task bundle { + doLast { + println "apps/desktopgui/bundle-messages.sh".execute().text + } +} +jar.dependsOn bundle diff --git a/apps/desktopgui/bundle-messages.sh b/apps/desktopgui/bundle-messages.sh old mode 100644 new mode 100755 index 6a3caa7d4..5e747a0ab --- a/apps/desktopgui/bundle-messages.sh +++ b/apps/desktopgui/bundle-messages.sh @@ -11,6 +11,7 @@ # zzz - public domain # Mathiasdm - modifications for desktopgui # +cd `dirname $0` CLASS=net.i2p.desktopgui.messages TMPFILE=build/javafiles.txt export TZ=UTC diff --git a/apps/i2ptunnel/build.gradle b/apps/i2ptunnel/build.gradle index 8b9259bd4..5dc1d89d1 100644 --- a/apps/i2ptunnel/build.gradle +++ b/apps/i2ptunnel/build.gradle @@ -6,6 +6,7 @@ sourceSets { main { java { srcDir 'java/src' + srcDir 'java/build/messages-proxy-src' } } test { @@ -22,6 +23,15 @@ dependencies { providedCompile project(':apps:jetty') } +// Create the java files from the po files. The jar task will compile them. +// This requires gettext 0.19 or higher. +// We don't support the "slow way" +task bundleProxy { + doLast { + println "apps/i2ptunnel/java/bundle-messages-proxy.sh".execute().text + } +} + task i2ptunnelJar(type: Jar) { from sourceSets.main.output exclude '**/ui/*.class' @@ -42,6 +52,7 @@ task i2ptunnelJar(type: Jar) { into "net/i2p/i2ptunnel/resources" }) } +i2ptunnelJar.dependsOn bundleProxy task tempBeansJar(type: Jar) { from sourceSets.main.output diff --git a/apps/i2ptunnel/java/bundle-messages-proxy.sh b/apps/i2ptunnel/java/bundle-messages-proxy.sh index e3fe5bb22..860ceb9ec 100755 --- a/apps/i2ptunnel/java/bundle-messages-proxy.sh +++ b/apps/i2ptunnel/java/bundle-messages-proxy.sh @@ -10,6 +10,7 @@ # # zzz - public domain # +cd `dirname $0` CLASS=net.i2p.i2ptunnel.proxy.messages TMPFILE=build/javafiles-proxy.txt export TZ=UTC diff --git a/apps/i2ptunnel/java/bundle-messages.sh b/apps/i2ptunnel/java/bundle-messages.sh index e12d79049..d10e2d89c 100755 --- a/apps/i2ptunnel/java/bundle-messages.sh +++ b/apps/i2ptunnel/java/bundle-messages.sh @@ -10,6 +10,7 @@ # # zzz - public domain # +cd `dirname $0` CLASS=net.i2p.i2ptunnel.web.messages TMPFILE=build/javafiles.txt export TZ=UTC diff --git a/apps/ministreaming/build.gradle b/apps/ministreaming/build.gradle index 6eb49bb3a..5fddfc419 100644 --- a/apps/ministreaming/build.gradle +++ b/apps/ministreaming/build.gradle @@ -8,6 +8,7 @@ sourceSets { main { java { srcDir 'java/src' + srcDir 'java/build/messages-src' } } test { @@ -21,6 +22,16 @@ dependencies { api project(':core') } +// Create the java files from the po files. The jar task will compile them. +// This requires gettext 0.19 or higher. +// We don't support the "slow way" +task bundle { + doLast { + println "apps/ministreaming/java/bundle-messages.sh".execute().text + } +} +jar.dependsOn bundle + jar { manifest { attributes 'Specification-Title': 'I2P Streaming API' diff --git a/apps/ministreaming/java/bundle-messages.sh b/apps/ministreaming/java/bundle-messages.sh index 3092be3aa..cdc4e3c2e 100755 --- a/apps/ministreaming/java/bundle-messages.sh +++ b/apps/ministreaming/java/bundle-messages.sh @@ -10,6 +10,7 @@ # # zzz - public domain # +cd `dirname $0` CLASS=net.i2p.client.streaming.messages TMPFILE=build/javafiles.txt export TZ=UTC diff --git a/apps/routerconsole/build.gradle b/apps/routerconsole/build.gradle index 48f37c461..af6eeb7c6 100644 --- a/apps/routerconsole/build.gradle +++ b/apps/routerconsole/build.gradle @@ -7,6 +7,8 @@ sourceSets { main { java { srcDir 'java/src' + srcDir 'java/build/messages-countries-src' + srcDir 'java/build/messages-news-src' } } } @@ -40,6 +42,16 @@ if (System.getenv("TARGET_JAVA_HOME") == null && JavaVersion.current() != JavaVe test.dependsOn scalaTest } +// Create the java files from the po files. The jar task will compile them. +// This requires gettext 0.19 or higher. +// We don't support the "slow way" +task bundleJar { + doLast { + println "apps/routerconsole/java/bundle-messages-countries.sh".execute().text + println "apps/routerconsole/java/bundle-messages-news.sh".execute().text + } +} + task consoleJar(type: Jar) { from sourceSets.main.output exclude 'net/i2p/router/web/helpers/**' @@ -56,6 +68,7 @@ task consoleJar(type: Jar) { into "net/i2p/router/news/resources" }) } +consoleJar.dependsOn bundleJar artifacts { archives consoleJar diff --git a/apps/routerconsole/java/bundle-messages-countries.sh b/apps/routerconsole/java/bundle-messages-countries.sh index d851802f1..ca9067012 100755 --- a/apps/routerconsole/java/bundle-messages-countries.sh +++ b/apps/routerconsole/java/bundle-messages-countries.sh @@ -10,6 +10,7 @@ # # zzz - public domain # +cd `dirname $0` CLASS=net.i2p.router.countries.messages TMPFILE=build/javafiles-countries.txt export TZ=UTC diff --git a/apps/routerconsole/java/bundle-messages-news.sh b/apps/routerconsole/java/bundle-messages-news.sh index bf502dd23..b43641b02 100755 --- a/apps/routerconsole/java/bundle-messages-news.sh +++ b/apps/routerconsole/java/bundle-messages-news.sh @@ -10,6 +10,7 @@ # # zzz - public domain # +cd `dirname $0` CLASS=net.i2p.router.news.messages TMPFILE=build/javafiles-news.txt export TZ=UTC diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh index 70ebd9d4c..6f0629121 100755 --- a/apps/routerconsole/java/bundle-messages.sh +++ b/apps/routerconsole/java/bundle-messages.sh @@ -10,6 +10,7 @@ # # zzz - public domain # +cd `dirname $0` CLASS=net.i2p.router.web.messages TMPFILE=build/javafiles.txt export TZ=UTC diff --git a/apps/susimail/bundle-messages.sh b/apps/susimail/bundle-messages.sh old mode 100644 new mode 100755 diff --git a/core/build.gradle b/core/build.gradle index 338a61ec6..5bf12a70e 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -10,6 +10,7 @@ sourceSets { main { java { srcDir 'java/src' + srcDir 'java/build/messages-src' exclude 'gnu/getopt' exclude 'gnu/gettext' } @@ -67,6 +68,16 @@ if (System.getenv("TARGET_JAVA_HOME") == null && JavaVersion.current() != JavaVe test.dependsOn scalaTest } +// Create the java files from the po files. The jar task will compile them. +// This requires gettext 0.19 or higher. +// We don't support the "slow way" +task bundle { + doLast { + println "core/java/bundle-messages.sh".execute().text + } +} +jar.dependsOn bundle + jar { manifest { attributes 'Specification-Title': 'I2P Core API' diff --git a/core/java/bundle-messages.sh b/core/java/bundle-messages.sh index 2c58e625d..167a481ca 100755 --- a/core/java/bundle-messages.sh +++ b/core/java/bundle-messages.sh @@ -10,6 +10,7 @@ # # zzz - public domain # +cd `dirname $0` CLASS=net.i2p.util.messages TMPFILE=build/javafiles.txt export TZ=UTC diff --git a/router/build.gradle b/router/build.gradle index 43387ce2e..223d7a649 100644 --- a/router/build.gradle +++ b/router/build.gradle @@ -6,6 +6,7 @@ sourceSets { main { java { srcDir 'java/src' + srcDir 'java/build/messages-src' } } test { @@ -26,6 +27,16 @@ dependencies { testImplementation project(path: ':core', configuration: 'tests') } +// Create the java files from the po files. The jar task will compile them. +// This requires gettext 0.19 or higher. +// We don't support the "slow way" +task bundle { + doLast { + println "router/java/bundle-messages.sh".execute().text + } +} +jar.dependsOn bundle + jar { manifest { attributes 'Specification-Title': 'I2P Router' diff --git a/router/java/bundle-messages.sh b/router/java/bundle-messages.sh index 5690e69c2..96a8c6e70 100755 --- a/router/java/bundle-messages.sh +++ b/router/java/bundle-messages.sh @@ -10,6 +10,7 @@ # # zzz - public domain # +cd `dirname $0` CLASS=net.i2p.router.util.messages TMPFILE=build/javafiles.txt export TZ=UTC