Skip to content
Permalink
Browse files

Update liblouis to 3.12, compile with Clang on Visual Studio 2019 (#1…

…0275)

* Update liblouis to 3.12

* Add north american braille code, rename Greek

* Use clang for compiilation

* Add Dutch 8 dot
  • Loading branch information
leonardder committed Feb 16, 2020
1 parent 435e38c commit 2f68395b386caec7d020c4cc833b52d0ec1c953d
Showing with 25 additions and 8 deletions.
  1. +1 −1 include/liblouis
  2. +15 −4 nvdaHelper/liblouis/sconscript
  3. +1 −1 readme.md
  4. +8 −2 source/brailleTables.py
Submodule liblouis updated 237 files
@@ -14,6 +14,8 @@

import os
import re
import glob
from SCons.Tool.MSCommon.vc import find_vc_pdir

Import([
"env",
@@ -37,6 +39,19 @@ def getLouisVersion():

env = env.Clone()

# Liblouis is build with Clang, as Microsoft Visual C++ is unable to build C99 code.
clangDirs = glob.glob(os.path.join(
find_vc_pdir(env.get("MSVC_VERSION")),
r"Tools\Llvm\bin"
))
if len(clangDirs) == 0:
raise RuntimeError(
"Could not find the Clang compiler. "
"Perhaps the C++ Clang tools for Windows component in visual Studio is not installed"
)
env['ENV']['PATH'] += "".join(f";{d}" for d in clangDirs)
env['CC'] = 'clang-cl'

# Don't analyze the code as not our project
if 'analyze' in env['nvdaHelperDebugFlags']:
env.Append(CCFLAGS='/analyze-')
@@ -45,10 +60,6 @@ if 'analyze' in env['nvdaHelperDebugFlags']:
env.Replace(CCFLAGS='/W2')

env.Append(CPPDEFINES=[
# The Visual C++ C Runtime deprecates several standard library functions in
# preference for _s variants that are specific to Visual C++. This removes
# those deprecation warnings.
"_CRT_SECURE_NO_WARNINGS",
# The Visual C++ C Runtime deprecates standard POSIX APIs that conflict with
# reserved ISO C names (like strdup) in favour of non-portable conforming
# variants that start with an '_'. This removes those deprecation warnings. */
@@ -68,7 +68,7 @@ For reference, the following run time dependencies are included in Git submodule
* [IAccessible2](https://wiki.linuxfoundation.org/accessibility/iaccessible2/start), commit 21bbb176
* [ConfigObj](https://github.com/DiffSK/configobj), commit 5b5de48
* [Six](https://pypi.python.org/pypi/six), version 1.12.0, required by wxPython and ConfigObj
* [liblouis](http://www.liblouis.org/), version 3.10.0 commit 146c0757
* [liblouis](http://www.liblouis.org/), version 3.12.0
* [Unicode Common Locale Data Repository (CLDR)](http://cldr.unicode.org/) Emoji Annotations, version 36.0
* NVDA images and sounds
* [Adobe Acrobat accessibility interface, version XI](https://download.macromedia.com/pub/developer/acrobat/AcrobatAccess.zip)
@@ -160,6 +160,9 @@ def listTables():
addTable("en-GB-g2.ctb", _("English (U.K.) grade 2"), contracted=True)
# Translators: The name of a braille table displayed in the
# braille settings dialog.
addTable("en-nabcc.utb", _("English North American Braille Computer Code"))
# Translators: The name of a braille table displayed in the
# braille settings dialog.
addTable("en-ueb-g1.ctb", _("Unified English Braille Code grade 1"))
# Translators: The name of a braille table displayed in the
# braille settings dialog.
@@ -301,10 +304,13 @@ def listTables():
addTable("mr-in-g1.utb", _("Marathi grade 1"))
# Translators: The name of a braille table displayed in the
# braille settings dialog.
addTable("nl-BE-g0.utb", _("Dutch (Belgium)"))
addTable("nl-BE-g0.utb", _("Dutch (Belgium) 6 dot"))
# Translators: The name of a braille table displayed in the
# braille settings dialog.
addTable("nl-NL-g0.utb", _("Dutch (Netherlands) 6 dot"))
# Translators: The name of a braille table displayed in the
# braille settings dialog.
addTable("nl-NL-g0.utb", _("Dutch (Netherlands)"))
addTable("nl-comp8.utb", _("Dutch 8 dot"))
# Translators: The name of a braille table displayed in the
# braille settings dialog.
addTable("no-no-8dot.utb", _("Norwegian 8 dot computer braille"))

0 comments on commit 2f68395

Please sign in to comment.
You can’t perform that action at this time.