From 41af00a7d6f42a1c5ccb51232bb4a8e913876fb9 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Thu, 10 Jan 2013 16:51:06 +0000
Subject: [PATCH] don't run gettext if 'require.gettext' is set to false
---
apps/desktopgui/build.xml | 9 ++++++---
apps/i2psnark/java/build.xml | 5 ++++-
apps/i2ptunnel/java/build.xml | 5 ++++-
apps/routerconsole/java/build.xml | 5 ++++-
apps/susidns/src/build.xml | 5 ++++-
apps/susimail/build.xml | 6 +++++-
build.properties | 3 +--
7 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/apps/desktopgui/build.xml b/apps/desktopgui/build.xml
index 176570f316..d075caccf7 100644
--- a/apps/desktopgui/build.xml
+++ b/apps/desktopgui/build.xml
@@ -8,12 +8,15 @@
<property name="resources" value="resources"/>
<property name="javadoc" value="javadoc"/>
+ <condition property="no.bundle">
+ <isfalse value="${require.gettext}" />
+ </condition>
<property name="javac.compilerargs" value=""/>
<property name="require.gettext" value="true" />
<target name="init">
- <mkdir dir="${build}"/>
- <mkdir dir="${build}/${resources}"/>
+ <mkdir dir="${build}"/>
+ <mkdir dir="${build}/${resources}"/>
<mkdir dir="${build}/${javadoc}"/>
<mkdir dir="${dist}"/>
</target>
@@ -39,7 +42,7 @@
</copy>
</target>
- <target name="bundle" >
+ <target name="bundle" unless="no.bundle">
<exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
<arg value="./bundle-messages.sh" />
</exec>
diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index 9e22ea0287..fddfe4b51d 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -24,6 +24,9 @@
</depend>
</target>
+ <condition property="no.bundle">
+ <isfalse value="${require.gettext}" />
+ </condition>
<property name="javac.compilerargs" value="" />
<property name="require.gettext" value="true" />
@@ -120,7 +123,7 @@
</uptodate>
</target>
- <target name="bundle" depends="compile">
+ <target name="bundle" depends="compile" unless="no.bundle">
<!-- Update the messages_*.po files.
We need to supply the bat file for windows, and then change the fail property to true -->
<exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index 5a54e6c566..7f34c38b86 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -21,6 +21,9 @@
</depend>
</target>
+ <condition property="no.bundle">
+ <isfalse value="${require.gettext}" />
+ </condition>
<property name="javac.compilerargs" value="" />
<property name="require.gettext" value="true" />
@@ -84,7 +87,7 @@
</condition>
</target>
- <target name="bundle" depends="compile, precompilejsp">
+ <target name="bundle" depends="compile, precompilejsp" unless="no.bundle">
<!-- Update the messages_*.po files.
We need to supply the bat file for windows, and then change the fail property to true -->
<exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index e9eb2a74d8..4f533ca4d6 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -8,6 +8,9 @@
<target name="prepare">
<!-- run from top level build.xml to get dependencies built -->
</target>
+ <condition property="no.bundle">
+ <isfalse value="${require.gettext}" />
+ </condition>
<condition property="depend.available">
<typefound name="depend" />
</condition>
@@ -113,7 +116,7 @@
</target>
<!-- this is tricky because the message classes go in the jar, not in the war -->
- <target name="bundle" depends="jar1, precompilejsp" >
+ <target name="bundle" depends="jar1, precompilejsp" unless="no.bundle">
<!-- Update the messages_*.po files.
We need to supply the bat file for windows, and then change the fail property to true -->
<exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml
index cd13e6e82a..ccd9d94abd 100644
--- a/apps/susidns/src/build.xml
+++ b/apps/susidns/src/build.xml
@@ -24,6 +24,9 @@
<pathelement location="../../../core/java/build/i2p.jar" />
</path>
<property name="javac.compilerargs" value="" />
+ <condition property="no.bundle">
+ <isfalse value="${require.gettext}" />
+ </condition>
<property name="require.gettext" value="true" />
<target name="compile">
@@ -121,7 +124,7 @@
</condition>
</target>
- <target name="bundle" depends="compile, precompilejsp">
+ <target name="bundle" depends="compile, precompilejsp" unless="no.bundle">
<!-- Update the messages_*.po files.
We need to supply the bat file for windows, and then change the fail property to true -->
<exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml
index 93022c20f6..e56e8cd8d8 100644
--- a/apps/susimail/build.xml
+++ b/apps/susimail/build.xml
@@ -7,6 +7,10 @@
</target>
<property name="javac.compilerargs" value="" />
+ <condition property="no.bundle">
+ <isfalse value="${require.gettext}" />
+ </condition>
+
<property name="require.gettext" value="true" />
<target name="compile">
@@ -71,7 +75,7 @@
</condition>
</target>
- <target name="bundle" depends="compile">
+ <target name="bundle" depends="compile" unless="no.bundle">
<!-- Update the messages_*.po files.
We need to supply the bat file for windows, and then change the fail property to true -->
<exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
diff --git a/build.properties b/build.properties
index 896de35438..cf4daadd9f 100644
--- a/build.properties
+++ b/build.properties
@@ -33,8 +33,7 @@ sloccount.report.file=sloccount.sc
# Uncomment the next line to prevent building EXEs (changing it to false will have no impact)
#noExe=true
-# Change this to false if you don't have gettext
-# Note that this does not prevent gettext from running if installed; to be fixed
+# Change this to false if you don't have gettext or you want to prevent it from running during the build
require.gettext=true
# Additional classpath if required
--
GitLab