fix scons for Andre's recent renames

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index c6f6502f8daa1ba5da9f7efbd195e43e9624a1fe..f4b81eb6142f3b2d57ddd4a63908d8e2412e3361 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -362,7 +362,7 @@ env.AppendUnique(LIBPATH = ['$LOCALLIBPATH'])
 # 3. compiler commands and flags like CCFLAGS.
 #     MSGFMT used to process po files
 # 4. Variables that will be used to replace variables in some_file.in
-#     src/support/package.C.in:
+#     src/support/Package.C.in:
 #       TOP_SRCDIR, LOCALEDIR, LYX_DIR, PROGRAM_SUFFIX
 #     lib/lyx2lyx/lyx2lyx_version.py.in
 #       PACKAGE_VERSION
@@ -400,12 +400,12 @@ if env.has_key('version_suffix'):
         program_suffix = env['version_suffix']
 else:
     program_suffix = ''
-# used by package.C.in
+# used by Package.C.in
 env['PROGRAM_SUFFIX'] = program_suffix
 
 # whether or not add suffix to file and directory names
 add_suffix = packaging_method != 'windows'
-# LYX_DIR are different (used in package.C.in)
+# LYX_DIR are different (used in Package.C.in)
 if add_suffix:
     env['LYX_DIR'] = Dir(os.path.join(prefix, share_dir + program_suffix)).abspath
 else:
@@ -1639,7 +1639,7 @@ if build_support:
     print "Processing files in src/support..."
 
     frontend_env.Depends('$BUILDDIR/common/support/package.C', '$BUILDDIR/common/config.h')
-    env.substFile('$BUILDDIR/common/support/package.C', '$TOP_SRCDIR/src/support/package.C.in')
+    env.substFile('$BUILDDIR/common/support/package.C', '$TOP_SRCDIR/src/support/Package.C.in')
 
     support = frontend_env.StaticLibrary(
         target = '$LOCALLIBPATH/support',
@@ -1732,7 +1732,7 @@ if build_qt4:
     #
     # moc qt4_moc_files, the moced files are included in the original files
     #
-    qt4_moced_files = [frontend_env.Moc4(x.replace('.C', '_moc.cpp'), x.replace('.C', '.h')) for x in qt4_moc_files]
+    qt4_moced_files = [frontend_env.Moc4(x.replace('.cpp', '_moc.cpp'), x.replace('.cpp', '.h')) for x in qt4_moc_files]
 
     qt4 = frontend_env.StaticLibrary(
         target = '$LOCALLIBPATH/qt4',
@@ -1793,8 +1793,8 @@ if build_tex2lyx:
     print "Processing files in src/tex2lyx..."
 
     #
-    for file in ['FloatList.C', 'Floating.C', 'counters.C', 'lyxlayout.h', 'lyxlayout.C', 
-        'lyxtextclass.h', 'lyxtextclass.C', 'lyxlex.C', 'lyxlex_pimpl.C']:
+    for file in ['FloatList.cpp', 'Floating.cpp', 'Counters.cpp', 'LyXLayout.h', 'LyXLayout.cpp', 
+        'LyXTextClass.h', 'LyXTextClass.cpp', 'Lexer.cpp', 'Lexer.h']:
         frontend_env.Command('$BUILDDIR/common/tex2lyx/'+file, '$TOP_SRCDIR/src/'+file,
             [Copy('$TARGET', '$SOURCE')])
 
@@ -1824,14 +1824,14 @@ if build_lyxbase:
     env.substFile('$BUILDDIR/common/version.C', '$TOP_SRCDIR/src/version.C.in')
 
     if env.has_key('USE_ASPELL') and env['USE_ASPELL']:
-        src_post_files.append('aspell.C')
+        src_post_files.append('ASpell.cpp')
     elif env.has_key('USE_PSPELL') and env['USE_PSPELL']:
-        src_post_files.append('pspell.C')
+        src_post_files.append('PSpell.cpp')
     elif env.has_key('USE_ISPELL') and env['USE_ISPELL']:
-        src_post_files.append('ispell.C')
+        src_post_files.append('ISpell.cpp')
 
     # msvc requires at least one source file with main()
-    # so I exclude main.C from lyxbase
+    # so I exclude main.cpp from lyxbase
     lyxbase_pre = env.StaticLibrary(
         target = '$LOCALLIBPATH/lyxbase_pre',
         source = ['$BUILDDIR/common/%s' % x for x in src_pre_files]
@@ -1850,7 +1850,7 @@ if build_lyx:
     #
     lyx = frontend_env.Program(
         target = '$BUILDDIR/lyx',
-        source = ['$BUILDDIR/common/main.C'] + \
+        source = ['$BUILDDIR/common/main.cpp'] + \
             utils.createResFromIcon(frontend_env, 'lyx_32x32.ico', '$LOCALLIBPATH/lyx.rc'),
         LIBS = [
             'lyxbase_pre',
@@ -1984,7 +1984,7 @@ if update_po:
 
     # whether or not update po files
     if not env['XGETTEXT'] or not env['MSGMERGE'] or not env['MSGUNIQ']:
-        print 'xgettext or msgmerge does not exist. Can not merge po files'
+        print 'xgettext or msgmerge does not exist. Cannot merge po files'
         Exit(1)
     # build language_l10n.pot, ui_l10n.pot, layouts_l10n.pot, qt4_l10n.pot
     # and combine them to lyx.po
@@ -2021,7 +2021,7 @@ if update_po:
     # possibly *only* handle these languages
     languages = None
     if env.has_key('languages'):
-        languages = env.make_list(env['lanauges'])
+        languages = env.make_list(env['languages'])
     # merge. if I use lan.po as $TARGET, it will be removed
     # before it is merged. In this builder,
     # $BUILDDIR/po/lang.po is merged from po/lang.po and $BUILDDIR/po/lyx.pot
@@ -2152,14 +2152,6 @@ if build_install:
     dirs = []
     for (dir,files) in [
             ('.', lib_files),  
-            ('images', lib_images_files),
-            ('images/math', lib_images_math_files),
-            ('kbd', lib_kbd_files),
-            ('layouts', lib_layouts_files),
-            ('scripts', lib_scripts_files),
-            ('templates', lib_templates_files),
-            ('tex', lib_tex_files),
-            ('ui', lib_ui_files),
             ('bind', lib_bind_files),
             ('bind/de', lib_bind_de_files),
             ('bind/fi', lib_bind_fi_files),
@@ -2203,7 +2195,16 @@ if build_install:
             ('examples/ru', lib_examples_ru_files),
             ('examples/sl', lib_examples_sl_files),
             ('examples/ro', lib_examples_ro_files),
-            ('lyx2lyx', lib_lyx2lyx_files)]:
+            ('fonts', lib_fonts_files),
+            ('images', lib_images_files),
+            ('images/math', lib_images_math_files),
+            ('kbd', lib_kbd_files),
+            ('layouts', lib_layouts_files),
+            ('lyx2lyx', lib_lyx2lyx_files),
+            ('scripts', lib_scripts_files),
+            ('templates', lib_templates_files),
+            ('tex', lib_tex_files),
+            ('ui', lib_ui_files)]:
         dirs.append(env.Install(os.path.join(share_dest_dir, dir),
             [env.subst('$TOP_SRCDIR/lib/%s/%s' % (dir, file)) for file in files]))
     Alias('install', dirs)
@@ -2290,6 +2291,9 @@ if build_installer:
     if platform_name != 'win32':
         print 'installer target is only available for windows platform'
         Exit(1)
+    if mode != 'release':
+        print 'installer has to be built in release mode (use option mode=release)'
+        Exit(1)
     if env.has_key('NSIS') and env['NSIS'] is not None:
         # create a builder to strip and install
         env['BUILDERS']['installer'] = Builder(generator=utils.env_nsis)