TOC Widget beautification by Stefan Schimanski:

[lyx.git] / development / scons / scons_utils.py

diff --git a/development/scons/scons_utils.py b/development/scons/scons_utils.py
index 30617539c5ab6c2026b6950c0c2c7a8b16752df5..1e3d6acaefabd28b2b9344312acb74bb55018737 100644 (file)
--- a/development/scons/scons_utils.py
+++ b/development/scons/scons_utils.py
@@ -33,6 +33,27 @@ def getVerFromConfigure(path):
     return 'x.x.x'
 
 
+def relativePath(path, base):
+    '''return relative path from base, which is usually top source dir'''
+    # full pathname of path
+    path1 = os.path.normpath(os.path.realpath(path)).split(os.sep)
+    path2 = os.path.normpath(os.path.realpath(base)).split(os.sep)
+    if path1[:len(path2)] != path2:
+        print "Path %s is not under top source directory" % path
+    if len(path2) == len(path1):
+        return ''
+    path3 = os.path.join(*path1[len(path2):]);
+    # replace all \ by / such that we get the same comments on Windows and *nix
+    path3 = path3.replace('\\', '/')
+    return path3
+
+
+def isSubDir(path, base):
+    '''Whether or not path is a subdirectory of base'''
+    path1 = os.path.normpath(os.path.realpath(path)).split(os.sep)
+    path2 = os.path.normpath(os.path.realpath(base)).split(os.sep)
+    return len(path2) <= len(path1) and path1[:len(path2)] == path2
+
 
 def writeToFile(filename, lines, append = False):
     " utility function: write or append lines to filename "
@@ -132,8 +153,9 @@ def env_potfiles(target, source, env):
     potfiles = []
     trans = re.compile('_\(".*"\)', re.M)
     for file in source:
-        if str(file) not in potfiles and trans.search(open(str(file)).read()):
-            potfiles.append(str(file))
+        rel_file = relativePath(str(file), env.subst('$TOP_SRCDIR'))
+        if rel_file not in potfiles and trans.search(open(str(file)).read()):
+            potfiles.append(rel_file)
     potfiles.sort()
     print >> target_file, '\n'.join(potfiles)
     target_file.close()