Partial fox for bug #6622: Display \undertilde on screen correctly.

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

diff --git a/development/scons/scons_utils.py b/development/scons/scons_utils.py
index b9aca61be6cd205be29c49146147896f37578ffb..47450a1fbcc388cdc07eb973a3bd9a9d20aee389 100644 (file)
--- a/development/scons/scons_utils.py
+++ b/development/scons/scons_utils.py
@@ -18,6 +18,7 @@ from SCons.Util import *
 
 def getVerFromConfigure(path):
     ''' get lyx version from the AC_INIT line of configure.ac,
+        packed major and minor version numbers from the lyx version,
         and LYX_DATE from an AC_SUBST line.
     '''
     try:
@@ -29,16 +30,20 @@ def getVerFromConfigure(path):
     # AC_INIT(LyX,1.4.4svn,[lyx-devel@lists.lyx.org],[lyx])
     ver_pat = re.compile('AC_INIT\([^,]+,([^,]+),')
     date_pat = re.compile('AC_SUBST\(LYX_DATE, \["(.*)"\]\)')
+    majmin_pat = re.compile('(\d+)\.(\d+)\..*')
     version = 'x.x.x'
+    majmin = 'xx'
     date = 'Not released'
     for line in config.readlines():
         if ver_pat.match(line):
             (version,) = ver_pat.match(line).groups()
+            majmin_match = majmin_pat.match(version)
+            majmin = majmin_match.group(1) + majmin_match.group(2)
         if date_pat.match(line):
             (date,) = date_pat.match(line).groups()
         if version != 'x.x.x' and date != 'Not released':
             break
-    return version.strip(), date.strip()
+    return version.strip(), majmin.strip(), date.strip()
 
 
 def relativePath(path, base):
@@ -125,7 +130,7 @@ def env_nsis(source, target, env, for_signature):
             ret += ' '
     # bundled?
     if '-bundle.exe' in str(target[0]):
-        ret += '/DSETUPTYPE_BUNDLE=1 '
+        ret += '/DSETUPTYPE=BUNDLE '
     for s in source:
         ret += quoteIfSpaced(str(s))
     return ret
@@ -435,6 +440,7 @@ int main() {
 def checkSizeOfWChar(conf):
     ''' check the size of wchar '''
     check_sizeof_wchar = '''
+#include <wchar.h>
 int i[ ( sizeof(wchar_t)==%d ? 1 : -1 ) ];
 int main()
 {