tuxdev: [ Patch #1776 ] Remedy Jam's 10240 limit issue with MakePot and XGetText

SVN-Revision: 4512

diff --git a/Jamrules b/Jamrules
index 5c35590..4e3fffd 100644 (file)
--- a/Jamrules
+++ b/Jamrules
@@ -48,17 +48,33 @@ include $(TOP)/mk/jam/build.jam ;
 IncludeDir $(top_builddir) ; # for config.h
 IncludeDir $(top_srcdir)/src ;
 
+actions Append
+{
+  echo $(>) >> $(<) ;
+}
+
+rule DumpVar
+{
+  for FILE in $(>)
+  {
+    Append $(<) : $(FILE) ;
+  }
+  Depends $(<) : $(>) ;
+}
+
 if $(XGETTEXT) != ""
 {
     actions XGetText
     {
-        $(XGETTEXT) $(XGETTEXT_FLAGS) -o $(<) "$(>)"
+        $(XGETTEXT) $(XGETTEXT_FLAGS) -o $(<) -f $(>)
     }
     rule MakePot
     {
       if $(>) {
-        XGetText $(<) : $(>) ;
-        Depends $(<) : $(>) ;
+        DumpVar $(<).in : $(>) ;
+        XGetText $(<) : $(<).in ;
+        RmTemps $(<) : $(<).in ;
+        Depends $(<) : $(<).in ;
         Depends all : $(<) ;
       }
     }
@@ -66,4 +82,3 @@ if $(XGETTEXT) != ""
     rule MakePot
     { }
 }
-

diff --git a/src/main.cpp b/src/main.cpp
index 5936bad..ee810cd 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -166,7 +166,7 @@ static void init_physfs(const char* argv0)
   if(f) {
     fclose(f);
     if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) {
-      msg_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
+      log_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
     } else {
       sourcedir = true;
     }