Scons: create libs directory for res file

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

diff --git a/development/scons/scons_utils.py b/development/scons/scons_utils.py
index 255aa1c78baf4a0c063462d9b01cea433d2adddd..14c0b101529cd86e383a00cbaae7d0f1cc17e7eb 100644 (file)
--- a/development/scons/scons_utils.py
+++ b/development/scons/scons_utils.py
@@ -68,7 +68,6 @@ def env_subst(target, source, env):
             # multi-line replacement
             val = val.replace('\n',r'\\n\\\n')
             contents = re.sub('@'+k+'@', val, contents)
-            contents = re.sub('%'+k+'%', val, contents)
         except:
             pass
     target_file.write(contents + "\n")
@@ -76,6 +75,24 @@ def env_subst(target, source, env):
     #st = os.stat(str(source[0]))
     #os.chmod(str(target[0]), stat.S_IMODE(st[stat.ST_MODE]) | stat.S_IWRITE)
 
+
+def createResFromIcon(env, icon_file, rc_file):
+    ''' create a rc file with icon, and return res file (windows only) '''
+    if os.name == 'nt':
+        rc_name = env.File(rc_file).abspath
+        dir = os.path.split(rc_name)[0]
+        if not os.path.isdir(dir):
+            os.makedirs(dir)
+        rc = open(rc_name, 'w')
+        print >> rc, 'IDI_ICON1  ICON DISCARDABLE "%s"' % \
+            os.path.join(env.Dir('$TOP_SRCDIR').abspath, 'development', 'win32',
+                'packaging', 'icons', icon_file)
+        rc.close()
+        return env.RES(rc_name)
+    else:
+        return []
+
+
 #
 # autoconf tests
 #