Patching over some rot

* Remove unnecessary global statement

* Stop building Antlr tests because of cmake compatibility

* Work around warnings from 'fs' (imported by fonttools)

Author: skef

cmake/ExternalAntlr4Cpp.cmake

@@ -15,9 +15,9 @@ endif()
 if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*")
   set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/runtime/$(Configuration))
 elseif(${CMAKE_GENERATOR} MATCHES "Xcode.*")
-  set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist/$(CONFIGURATION))
+  set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/runtime)
 else()
-  set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist)
+  set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/runtime)
 endif()
 
 if(MSVC)
@@ -90,6 +90,8 @@ if(ANTLR4_ZIP_REPOSITORY)
           -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
           -DWITH_STATIC_CRT:BOOL=${ANTLR4_WITH_STATIC_CRT}
           -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+          -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+          -DANTLR_BUILD_CPP_TESTS:BOOL=OFF
           # -DCMAKE_CXX_STANDARD:STRING=17 # if desired, compile the runtime with a different C++ standard
           # -DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD} # alternatively, compile the runtime with the same C++ standard as the outer project
       INSTALL_COMMAND ""
@@ -109,6 +111,8 @@ else()
           -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
           -DWITH_STATIC_CRT:BOOL=${ANTLR4_WITH_STATIC_CRT}
           -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+          -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+          -DANTLR_BUILD_CPP_TESTS:BOOL=OFF
           # -DCMAKE_CXX_STANDARD:STRING=17 # if desired, compile the runtime with a different C++ standard
           # -DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD} # alternatively, compile the runtime with the same C++ standard as the outer project
       INSTALL_COMMAND ""

python/afdko/pdflib/pdfmetrics.py

@@ -353,7 +353,6 @@ class FontCache:
     """Loads and caches font width information on demand.  Font names
     converted to lower case for indexing.  Public interface is stringwidth"""
     def __init__(self):
-        global FONT_WIDTHS
         self.__widtharrays = FONT_WIDTHS
 
     def loadfont(self, fontname):

tests/makeotf_test.py

@@ -144,8 +144,8 @@ def test_build_font_and_check_messages(args, ttx_fname):
     expected_msg_path = get_expected_path(f'{ttx_fname}_output.txt')
     ttx_filename = f'{ttx_fname}.ttx'
     stderr_path = runner(CMD + [
-        '-s', '-e', '-o', 'f', f'_{get_input_path("font.pfa")}',
-                          'o', f'_{actual_path}'] + args)
+        '-s', '-e', '-n', '-o', 'f', f'_{get_input_path("font.pfa")}',
+                                'o', f'_{actual_path}'] + args)
     actual_ttx = generate_ttx_dump(actual_path)
     expected_ttx = get_expected_path(ttx_filename)
     assert differ([expected_ttx, actual_ttx,
@@ -654,7 +654,7 @@ def test_duplicate_warning_messages_bug751():
     otf_path = get_temp_file_path()
 
     stderr_path = runner(
-        CMD + ['-s', '-e', '-o',
+        CMD + ['-s', '-e', '-n', '-o',
                'f', f'_{get_input_path(input_filename)}',
                'o', f'_{otf_path}'])
 
@@ -688,7 +688,7 @@ def test_cli_numerics():
     expected_msg_path = get_expected_path("clinum_output.txt")
     out_font_path = get_temp_file_path()
     stderr_path = runner(CMD + [
-        '-s', '-e', '-o',
+        '-s', '-e', '-n', '-o',
         'f', f'_{get_input_path(input_filename)}',
         'o', f'_{out_font_path}',
         'fi', f'_{get_input_path(fontinfo_filename)}'])

tests/runner.py

@@ -88,6 +88,10 @@ def run_tool(opts):
     if opts.std_error:
         stderr = subprocess.STDOUT
 
+    sp_env = os.environ.copy()
+    if opts.no_python_warn:
+        sp_env['PYTHONWARNINGS'] = 'ignore'
+
     if allow_skip_console and console_scripts.get(opts.tool):
         mod, fcn = console_scripts[opts.tool].split(':')
         args[0] = sys.executable
@@ -100,11 +104,11 @@ def run_tool(opts):
     try:
         if opts.save_path:
             output = subprocess.check_output(args, stderr=stderr,
-                                             timeout=TIMEOUT)
+                                             timeout=TIMEOUT, env=sp_env)
             _write_file(opts.save_path, output)
             return opts.save_path
         else:
-            return subprocess.check_call(args, timeout=TIMEOUT)
+            return subprocess.check_call(args, timeout=TIMEOUT, env=sp_env)
     except (subprocess.CalledProcessError, OSError) as err:
         if opts.save_path:
             _write_file(opts.save_path, err.output)
@@ -225,6 +229,12 @@ def get_options(args):
         action='store_true',
         help="capture stderr instead of stdout"
     )
+    parser.add_argument(
+        '-n',
+        '--no-python-warn',
+        action='store_true',
+        help="Suppress python warnings"
+    )
     options = parser.parse_args(args)
 
     if not options.verbose: