* src/support/gzstream,cpp:

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index c964e437b0ce07728a607fd20ba573ac3d62d7d4..18e8617c4cd6775bb0d60d0eff7ffd17b8f6cd78 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -14,6 +14,23 @@
 
 import os, sys, copy, cPickle, glob, time
 
+# determine where I am ...
+#
+from SCons.Node.FS import default_fs
+# default_fs.SConstruct_dir is where SConstruct file is located.
+scons_dir = default_fs.SConstruct_dir.path
+scons_absdir = default_fs.SConstruct_dir.abspath
+
+# if SConstruct is copied to the top source directory
+if os.path.exists(os.path.join(scons_dir, 'development', 'scons', 'scons_manifest.py')):
+    scons_dir = os.path.join(scons_dir, 'development', 'scons')
+    scons_absdir = os.path.join(scons_absdir, 'development', 'scons')
+# get the ../.. of scons_dir
+top_src_dir = os.path.split(os.path.split(scons_absdir)[0])[0]
+
+sys.path.extend([scons_absdir, os.path.join(top_src_dir, 'lib', 'doc')])
+import depend
+
 # scons_utils.py defines a few utility function
 import scons_utils as utils
 # import all file lists
@@ -34,15 +51,6 @@ if version[0] == 0 and version[1] == 96 and version[2] < 92:
     print "Scons >= 0.96.92 is required."
     Exit(1)
 
-# determine where I am ...
-#
-from SCons.Node.FS import default_fs
-# default_fs.SConstruct_dir is where SConstruct file is located.
-scons_dir = default_fs.SConstruct_dir.path
-# get the ../.. of scons_dir
-top_src_dir = os.path.split(os.path.split(default_fs.SConstruct_dir.abspath)[0])[0]
-sys.path.append(os.path.join(top_src_dir, 'lib', 'doc'))
-import depend
 
 #----------------------------------------------------------
 # Global definitions
@@ -607,6 +615,11 @@ conf = Configure(env,
     }
 )
 
+# When using msvc, windows.h is required
+if use_vc and not conf.CheckCHeader('windows.h'):
+    print 'Windows.h is not found. Please install Windows Platform SDK.'
+    Exit(1)
+
 # pkg-config? (if not, we use hard-coded options)
 if conf.CheckPkgConfig('0.15.0'):
     env['HAS_PKG_CONFIG'] = True
@@ -814,8 +827,18 @@ utils.createConfigFile(conf,
 #  define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
 #endif
 
-#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
-#  define LIBC_WCTYPE_USES_UCS4
+/*
+ * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t
+ * support compiled in:
+ * http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#3_9
+ * And we are not interested at all what libc
+ * does: What we need is a 32bit wide wchar_t, and a libstdc++ that
+ * has the needed wchar_t support and uses UCS4. Whether it
+ * implements this with the help of libc, or whether it has own code
+ * does not matter for us, because we don't use libc directly (Georg)
+*/
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+#  define USE_WCHAR_T
 #endif
 
 #endif
@@ -1381,20 +1404,13 @@ if frontend == 'qt4':
         print 'uic or moc command is not found for frontend', frontend
         Exit(1)
     
-    # now, if msvc2005 is used, we will need that QT_LIB_PATH/QT_LIB.manifest file
+    # now, if msvc2005 is used, we will need to embed lyx.exe.manifest to lyx.exe
+    # NOTE: previously, lyx.exe had to be linked to some qt manifest to work.
+    # For some unknown changes in msvc or qt, this is no longer needed.
     if use_vc:
-        if mode == 'debug':
-            if qt_lib_path is not None:
-                manifest = os.path.join(qt_lib_path, 'QtGuid4.dll.manifest')
-            else:
-                manifest = 'QtGuid4.dll.manifest'
-        else:
-            if qt_lib_path is not None:
-                manifest = os.path.join(qt_lib_path, 'QtGui4.dll.manifest')
-            else:
-                manifest = 'QtGui4.dll.manifest'
-        if os.path.isfile(manifest):
-            frontend_env['LINKCOM'] = [frontend_env['LINKCOM'], 'mt.exe /MANIFEST %s /outputresource:$TARGET;1' % manifest]
+        frontend_env['LINKCOM'] = [frontend_env['LINKCOM'], \
+            'mt.exe /MANIFEST %s /outputresource:$TARGET;1' % \
+            env.File('$BUILDDIR/lyx.exe.manifest').path]
 
     frontend_env = conf.Finish()
 
@@ -2043,7 +2059,7 @@ if update_po:
         ['$TOP_SRCDIR/src/tex2lyx/%s' % x for x in src_tex2lyx_header_files + src_tex2lyx_files ]
     )
     Alias('update_po', POTFILES_in)
-    # build language_l10n.pot, ui_l10n.pot, layouts_l10n.pot, qt4_l10n.pot
+    # build language_l10n.pot, ui_l10n.pot, layouts_l10n.pot, qt4_l10n.pot, external_l10n
     # and combine them to lyx.po
     env['LYX_POT'] = 'python $TOP_SRCDIR/po/lyx_pot.py'
     lyx_po = env.Command('$BUILDDIR/po/lyx.po',
@@ -2054,11 +2070,13 @@ if update_po:
              env.Command('$BUILDDIR/po/layouts_l10n.pot', 
                 ['$TOP_SRCDIR/lib/layouts/%s' % x for x in lib_layouts_files + lib_layouts_inc_files],
                 '$LYX_POT -b $TOP_SRCDIR -t layouts -o $TARGET $SOURCES'),
-             env.Command('$BUILDDIR/po/languages_l10n.pot', '$TOP_SRCDIR/lib/languages', 
+             env.Command('$BUILDDIR/po/languages_l10n.pot', '$TOP_SRCDIR/lib/languages',
                 '$LYX_POT -b $TOP_SRCDIR -t languages -o $TARGET $SOURCES'),
              env.Command('$BUILDDIR/po/ui_l10n.pot', 
                 ['$TOP_SRCDIR/lib/ui/%s' % x for x in lib_ui_files],
                 '$LYX_POT -b $TOP_SRCDIR -t ui -o $TARGET $SOURCES'),
+             env.Command('$BUILDDIR/po/external_l10n.pot', '$TOP_SRCDIR/lib/external_templates',
+                '$LYX_POT -b $TOP_SRCDIR -t external -o $TARGET $SOURCES'),
              ], utils.env_cat),
             ['$MSGUNIQ -o $TARGET $SOURCE',
              '''$XGETTEXT --default-domain=${TARGET.base} \