From 599d9c9f45d05767d7557333b58ad84fb9718549 Mon Sep 17 00:00:00 2001
From: Cory McWilliams <cory@unprompted.com>
Date: Mon, 19 Sep 2016 13:02:54 +0000
Subject: [PATCH] Fix ICU on Linux, and test it.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3343 ed5197a5-7fde-0310-b194-c3ffbd925b24
---
 SConstruct   | 1 +
 src/main.cpp | 2 +-
 tests/13-icu | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 tests/13-icu

diff --git a/SConstruct b/SConstruct
index 023a54a4..cb3fe8d9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -54,6 +54,7 @@ else:
 		os.path.join(v8, 'out/native/obj.target/src'),
 		os.path.join(uv, 'out/Debug/obj.target'),
 	])
+	env.Command('icudtl.dat', os.path.join(v8, 'out/native/icudtl.dat'), Copy("$TARGET", "$SOURCE"))
 
 ldapEnv = env.Clone()
 if sys.platform == 'win32':
diff --git a/src/main.cpp b/src/main.cpp
index 0d2484e2..4c0538df 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -63,7 +63,7 @@ int main(int argc, char* argv[]) {
 	int result = 0;
 	uv_setup_args(argc, argv);
 	TaskStub::initialize();
-	v8::V8::InitializeICU();
+	v8::V8::InitializeICUDefaultLocation(argv[0]);
 	gPlatform = v8::platform::CreateDefaultPlatform();
 	v8::V8::InitializePlatform(gPlatform);
 	v8::V8::Initialize();
diff --git a/tests/13-icu b/tests/13-icu
new file mode 100644
index 00000000..74cd1cd0
--- /dev/null
+++ b/tests/13-icu
@@ -0,0 +1,6 @@
+cat > test.js << EOF
+print("Hi");
+print(parseInt("3").toLocaleString());
+EOF
+
+$TILDEFRIENDS test.js