From c862a0f96937fde87b6b62e4d53b0aed0672c2b5 Mon Sep 17 00:00:00 2001
From: Bob Jamison <ishmalius@gmail.com>
Date: Thu, 11 Jan 2007 21:28:22 +0000
Subject: Allow overriding output name for msgfmt

(bzr r2184)
---
 buildtool.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'buildtool.cpp')

diff --git a/buildtool.cpp b/buildtool.cpp
index 747e9577e..f78bf8ee8 100644
--- a/buildtool.cpp
+++ b/buildtool.cpp
@@ -6663,6 +6663,7 @@ public:
          name    = "msgfmt";
          command = "msgfmt";
          owndir  = false;
+         outName = "";
          }
 
     virtual ~TaskMsgFmt()
@@ -6704,8 +6705,17 @@ public:
                 destPath.append(subdir);
                 destPath.append("/");
                 }
-            destPath.append(fileName);
-            destPath[destPath.size()-2] = 'm';
+            //Pick the output file name
+            if (outName.size() > 0)
+                {
+                destPath.append(outName);
+                }
+            else
+                {
+                destPath.append(fileName);
+                destPath[destPath.size()-2] = 'm';
+                }
+
             String fullDest = parent.resolve(destPath);
 
             if (!isNewerThan(fullSource, fullDest))
@@ -6750,6 +6760,8 @@ public:
             command = s;
         if (!parent.getAttribute(elem, "todir", toDirName))
             return false;
+        if (!parent.getAttribute(elem, "out", outName))
+            return false;
         if (!parent.getAttribute(elem, "owndir", s))
             return false;
         if (!getBool(s, owndir))
@@ -6771,10 +6783,11 @@ public:
 
 private:
 
-    String command;
-    String toDirName;
+    String  command;
+    String  toDirName;
+    String  outName;
     FileSet fileSet;
-    bool owndir;
+    bool    owndir;
 
 };
 
-- 
cgit v1.2.3