mail[Wesnoth-commits] r25367 - /trunk/SConstruct


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by loonycyborg on March 31, 2008 - 11:48:
Author: loonycyborg
Date: Mon Mar 31 11:48:57 2008
New Revision: 25367

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25367&view=rev
Log:
scons recipe: fixed logic error in InstallFilteredHook that caused it to 
resize images even if tinygui is disabled.

Modified:
    trunk/SConstruct

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25367&r1=25366&r2=25367&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Mon Mar 31 11:48:57 2008
@@ -5,7 +5,7 @@
 # 1. Subversion command-line client programs svnstatus and svnversion.
 # 2. Unix file(1), on installation only.
 # 3. Unix convert(1), on installation only, if using tinygui.
-# 4. gmsgfmt(1) for making builds with i18n support.
+# 4. msgfmt(1) for making builds with i18n support.
 #
 # To do (list is now exhaustive):
 #
@@ -347,10 +347,10 @@
     boost_test_dyn_link = conf.CheckCXXHeader('boost/test/unit_test.hpp')
     boost_auto_test = conf.CheckCXXHeader('boost/test/unit_test.hpp')
 
-have_gmsgfmt = env.WhereIs("gmsgfmt")
-if not have_gmsgfmt:
+have_msgfmt = env.WhereIs("msgfmt")
+if not have_msgfmt:
      env["nls"] = False
-if not have_gmsgfmt:
+if not have_msgfmt:
      print "NLS tools are not present..."
 if not env['nls']:
      print "NLS catalogue installation is disabled."
@@ -935,7 +935,7 @@
                  os.makedirs(target)
             map(lambda f: InstallFilteredHook(target, 
os.path.join(str(source), f), env), os.listdir(str(source)))
     elif CopyFilter(source):
-        if env["tinygui"] and source.endswith("jpg") or 
source.endswith("png"):
+        if env["tinygui"] and (source.endswith("jpg") or 
source.endswith("png")):
              (status, output) = commands.getstatusoutput("file "+ source)
              output = output.replace(" x ", "x")
              target = os.path.join(target, os.path.basename(source))




Related Messages


Powered by MHonArc, Updated Mon Mar 31 12:02:15 2008