OSDN Git Service

sconstruct: pot no longer depends on sourceDir, as this depends on comInterfaces...
authorJames Teh <jamie@jantrid.net>
Fri, 19 Nov 2010 04:28:38 +0000 (14:28 +1000)
committerJames Teh <jamie@jantrid.net>
Fri, 19 Nov 2010 04:28:38 +0000 (14:28 +1000)
sconstruct

index b56a1fd..b4cff47 100755 (executable)
@@ -211,7 +211,7 @@ env.Alias('changes',changesFile)
 \r
 def makePot(target, source, env):\r
        # Generate the pot.\r
-       if env.Execute([["cd", source[0], "&&",\r
+       if env.Execute([["cd", sourceDir, "&&",\r
                        pygettext, "-o", target[0].abspath, "*.py", r"*\*.py", r"*\*\*.py"]]) != 0:\r
                raise RuntimeError("pygettext failed")\r
 \r
@@ -235,7 +235,11 @@ def makePot(target, source, env):
        os.remove(potFn)\r
        os.rename(tmpFn, potFn)\r
 \r
-pot = env.Command(outputDir.File("%s.pot" % outFilePrefix), sourceDir, makePot)\r
+pot = env.Command(outputDir.File("%s.pot" % outFilePrefix),\r
+       # Don't use sourceDir as the source, as this depends on comInterfaces and nvdaHelper.\r
+       # We only depend on the Python files.\r
+       [f for pattern in ("*.py", r"*\*.py", r"*\*\*.py") for f in env.Glob(os.path.join(sourceDir.path, pattern))],\r
+       makePot)\r
 \r
 env.Alias("pot", pot)\r
 \r