Document Dialog: move the listings settings to its own pane.

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

diff --git a/development/scons/scons_utils.py b/development/scons/scons_utils.py
index 9fa18265c49a960c712b0640f2138ebef96d9efd..bc8a63a7904ee2319703a15cae82017f7269d658 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
@@ -186,6 +191,17 @@ def createResFromIcon(env, icon_file, rc_file):
         return []
 
 
+def env_qtResource(target, source, env):
+    '''Create resource.qrc'''
+    qrc = open(str(target[0]), 'w')
+    print >> qrc, "<!DOCTYPE RCC><RCC version='1.0'><qresource>"
+    for file in source:
+        rel_file = relativePath(str(file), env.subst('$TOP_SRCDIR/lib'))
+        abs_file = str(file.abspath)
+        print >> qrc, '<file alias="%s">%s</file>' % (rel_file, abs_file)
+    print >> qrc, '</qresource></RCC>'
+    qrc.close()
+
 #
 # autoconf tests
 #
@@ -236,7 +252,8 @@ int main()
 }
 '''
     conf.Message('Checking for the use of global cstd... ')
-    ret = conf.TryLink(check_global_cstd_source, '.c')
+    # if can not compile, define CXX_GLOBAL_CSTD
+    ret = conf.TryLink(check_global_cstd_source, '.cpp')
     conf.Result(ret)
     return ret
 
@@ -415,7 +432,7 @@ int main() {
 }
 '''
     conf.Message('Checking if the declaration of iconv needs const... ')
-    ret = conf.TryLink(check_iconv_const, '.c')
+    ret = conf.TryLink(check_iconv_const, '.cpp')
     conf.Result(ret)
     return ret