From 2d86b34c4016b012a0a434be96e6be7693db4605 Mon Sep 17 00:00:00 2001
From: Charles Ruan <a837940593@gmail.com>
Date: Sat, 12 Sep 2020 17:19:59 +0800
Subject: [PATCH] Compile with utf8 on macOS.

---
 runtime/Cpp/deploy-macos.sh | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/runtime/Cpp/deploy-macos.sh b/runtime/Cpp/deploy-macos.sh
index 55528470f..cf977652d 100755
--- a/runtime/Cpp/deploy-macos.sh
+++ b/runtime/Cpp/deploy-macos.sh
@@ -4,9 +4,27 @@
 rm -f -R antlr4-runtime build lib 2> /dev/null
 rm antlr4-cpp-runtime-macos.zip 2> /dev/null
 
+# Get utf8 dependency.
+mkdir -p runtime/thirdparty 2> /dev/null
+pushd runtime/thirdparty
+if [ ! -d utfcpp ]
+then
+    git clone https://github.com/nemtrif/utfcpp.git utfcpp
+    pushd utfcpp
+    git checkout tags/v3.1.1
+    popd
+fi
+popd
+
 # Binaries
-xcodebuild -project runtime/antlrcpp.xcodeproj -target antlr4 -configuration Release
-xcodebuild -project runtime/antlrcpp.xcodeproj -target antlr4_static -configuration Release
+xcodebuild -project runtime/antlrcpp.xcodeproj \
+           -target antlr4                      \
+           # GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS USE_UTF8_INSTEAD_OF_CODECVT' \
+           -configuration Release
+xcodebuild -project runtime/antlrcpp.xcodeproj \
+           -target antlr4_static               \
+           # GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS USE_UTF8_INSTEAD_OF_CODECVT' \
+           -configuration Release
 rm -f -R lib
 mkdir lib
 mv runtime/build/Release/libantlr4-runtime.a lib/
@@ -17,6 +35,9 @@ rm -f -R antlr4-runtime
 pushd runtime/src
 find . -name '*.h' | cpio -pdm ../../antlr4-runtime
 popd
+pushd runtime/thirdparty/utfcpp/source
+find . -name '*.h' | cpio -pdm ../../../../antlr4-runtime
+popd
 
 # Zip up and clean up
 zip -r antlr4-cpp-runtime-macos.zip antlr4-runtime lib