chakra-core · chakrabot · Sep 29, 2017 · Sep 21, 2017 · Sep 21, 2017 · Sep 15, 2017
diff --git a/.gitignore b/.gitignore
@@ -63,6 +63,7 @@ test/benchmarks/*.dpl
 test/benchmarks/*.txt
 testout*
 packages.config
+lib/wabt/built/
 
 # CMake Files
 cmake_install.cmake

diff --git a/Build/Chakra.Build.props b/Build/Chakra.Build.props
@@ -50,7 +50,12 @@
       <RuntimeLibrary Condition="'$(Configuration)'=='Debug' AND '$(RuntimeLib)'=='static_library'">MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>
         $(ChakraCoreRootDirectory)\lib\common\placeholder;
-        $(IntDir)..\CoreManifests\
+        $(IntDir)..\CoreManifests;
+        %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(IntlICU)'=='true'">
+        $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
     </ClCompile>

diff --git a/bin/ChakraCore/ChakraCore.vcxproj b/bin/ChakraCore/ChakraCore.vcxproj
@@ -31,7 +31,6 @@
         $(ChakraCoreRootDirectory)Lib\Jsrt;
         $(IntDir);
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         $(MSBuildThisFileDirectory)..\..\lib\JITClient;
         %(AdditionalIncludeDirectories);
       </AdditionalIncludeDirectories>
@@ -56,10 +55,9 @@
       <AdditionalDependencies Condition="'$(IntlICU)'=='true'">
         %(AdditionalDependencies);
         <!-- TODO cleanup: we do need to link to ICU libraries in ChakraCore, but we probably will not need all of them -->
-        <!--$(IcuLibDir)\icudata.lib;-->
-        <!--$(IcuLibDir)\icui18n.lib;-->
-        <!--$(IcuLibDir)\icustubdata.lib;-->
         $(IcuLibDir)\icutools.lib;
+        $(IcuLibDir)\icui18n.lib;
+        <!--$(IcuLibDir)\icudata.lib;-->
         <!--$(IcuLibDir)\icuucx.lib;-->
       </AdditionalDependencies>
       <DelayLoadDLLs>%(DelayLoadDLLs);oleaut32.dll</DelayLoadDLLs>

diff --git a/lib/Backend/Chakra.Backend.vcxproj b/lib/Backend/Chakra.Backend.vcxproj
@@ -36,7 +36,6 @@
         $(MSBuildThisFileDirectory)..\Parser;
         $(MSBuildThisFileDirectory)..\WasmReader;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -483,4 +482,4 @@
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
     <Import Project="$(BuildConfig_ARMASM_Path)armasm.targets" />
   </ImportGroup>
-</Project>
+</Project>
diff --git a/lib/Common/CommonDefines.h b/lib/Common/CommonDefines.h
@@ -103,6 +103,7 @@
 #if defined(_WIN32) || defined(INTL_ICU)
 #define ENABLE_INTL_OBJECT                          // Intl support
 #endif
+//#define INTL_ICU 1                    // NOTE: uncomment this to allow the IDE to see INTL_ICU blocks
 #ifdef INTL_ICU
 #ifdef DBG
 //#define INTL_ICU_DEBUG 1              // NOTE: uncomment this to display INTL_ICU-specific debug output

diff --git a/lib/Common/Core/AllocSizeMath.h b/lib/Common/Core/AllocSizeMath.h
@@ -2,6 +2,9 @@
 // Copyright (C) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
+
+#pragma once
+
 class AllocSizeMath
 {
     static const size_t MaxMemory = static_cast<size_t>(-1);

diff --git a/lib/Common/PlatformAgnostic/DateTime.h b/lib/Common/PlatformAgnostic/DateTime.h
@@ -2,9 +2,7 @@
 // Copyright (C) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
-
-#ifndef RUNTIME_PLATFORM_AGNOSTIC_COMMON_DATETIME
-#define RUNTIME_PLATFORM_AGNOSTIC_COMMON_DATETIME
+#pragma once
 
 #include "PlatformAgnostic/DateTimeInternal.h"
 
@@ -77,5 +75,3 @@ namespace DateTime
 
 } // namespace DateTime
 } // namespace PlatformAgnostic
-
-#endif // RUNTIME_PLATFORM_AGNOSTIC_COMMON_DATETIME
diff --git a/lib/Common/PlatformAgnostic/DateTimeInternal.h b/lib/Common/PlatformAgnostic/DateTimeInternal.h
@@ -2,9 +2,7 @@
 // Copyright (C) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
-
-#ifndef RUNTIME_PLATFORM_AGNOSTIC_DATETIME_INTERNAL
-#define RUNTIME_PLATFORM_AGNOSTIC_DATETIME_INTERNAL
+#pragma once
 
 #include "Core/CommonTypedefs.h"
 
@@ -107,5 +105,3 @@ namespace DateTime
 
 } // namespace DateTime
 } // namespace PlatformAgnostic
-
-#endif // RUNTIME_PLATFORM_AGNOSTIC_DATETIME_INTERNAL
diff --git a/lib/Common/PlatformAgnostic/Debugger.h b/lib/Common/PlatformAgnostic/Debugger.h
@@ -2,9 +2,7 @@
 // Copyright (C) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
-
-#ifndef RUNTIME_PLATFORM_AGNOSTIC_DEBUGGER
-#define RUNTIME_PLATFORM_AGNOSTIC_DEBUGGER
+#pragma once
 
 #ifndef _WIN32
 
@@ -131,5 +129,3 @@ class IActiveScriptProfilerCallback
 #define IActiveScriptProfilerCallback3 IActiveScriptProfilerCallback
 
 #endif // !_WIN32
-
-#endif // RUNTIME_PLATFORM_AGNOSTIC_DEBUGGER
diff --git a/lib/Common/PlatformAgnostic/Numbers.h b/lib/Common/PlatformAgnostic/Numbers.h
@@ -2,9 +2,7 @@
 // Copyright (C) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
-
-#ifndef RUNTIME_PLATFORM_AGNOSTIC_COMMON_NUMBERS
-#define RUNTIME_PLATFORM_AGNOSTIC_COMMON_NUMBERS
+#pragma once
 
 namespace PlatformAgnostic
 {
@@ -51,5 +49,3 @@ namespace Numbers
     };
 } // namespace Numbers
 } // namespace PlatformAgnostic
-
-#endif // RUNTIME_PLATFORM_AGNOSTIC_COMMON_NUMBERS
diff --git a/lib/Common/PlatformAgnostic/SystemInfo.h b/lib/Common/PlatformAgnostic/SystemInfo.h
@@ -2,9 +2,7 @@
 // Copyright (C) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
-
-#ifndef RUNTIME_PLATFORM_AGNOSTIC_COMMON_SYSTEMINFO
-#define RUNTIME_PLATFORM_AGNOSTIC_COMMON_SYSTEMINFO
+#pragma once
 
 namespace PlatformAgnostic
 {
@@ -80,5 +78,3 @@ namespace PlatformAgnostic
 #endif
     };
 } // namespace PlatformAgnostic
-
-#endif // RUNTIME_PLATFORM_AGNOSTIC_COMMON_SYSTEMINFO
diff --git a/lib/Common/PlatformAgnostic/Thread.h b/lib/Common/PlatformAgnostic/Thread.h
@@ -2,9 +2,7 @@
 // Copyright (C) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
-
-#ifndef RUNTIME_PLATFORM_AGNOSTIC_COMMON_THREAD
-#define RUNTIME_PLATFORM_AGNOSTIC_COMMON_THREAD
+#pragma once
 
 namespace PlatformAgnostic
 {
@@ -26,5 +24,3 @@ class Thread
                                ThreadInitFlag init_flag);
 };
 } // namespace PlatformAgnostic
-
-#endif // RUNTIME_PLATFORM_AGNOSTIC_COMMON_THREAD
diff --git a/lib/JITServer/Chakra.JITServer.vcxproj b/lib/JITServer/Chakra.JITServer.vcxproj
@@ -48,7 +48,6 @@
         $(MSBuildThisFileDirectory)..\Backend\$(PlatformPathNameAlt);
         $(MSBuildThisFileDirectory)..\Backend;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -57,4 +56,4 @@
   </ItemDefinitionGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
diff --git a/lib/Jsrt/Chakra.Jsrt.vcxproj b/lib/Jsrt/Chakra.Jsrt.vcxproj
@@ -24,7 +24,6 @@
         $(MSBuildThisFileDirectory);
         $(MSBuildThisFileDirectory)..\Runtime;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         $(MSBuildThisFileDirectory)..\JITClient;
         $(MSBuildThisFileDirectory)..\Runtime\ByteCode;
         $(MSBuildThisFileDirectory)..\Common;
@@ -91,4 +90,4 @@
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
diff --git a/lib/Jsrt/Core/Chakra.Jsrt.Core.vcxproj b/lib/Jsrt/Core/Chakra.Jsrt.Core.vcxproj
@@ -25,7 +25,6 @@
         $(MSBuildThisFileDirectory)..;
         $(MSBuildThisFileDirectory)..\..\Runtime;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(MSBuildThisFileDirectory)..\..\Runtime\ByteCode;
         $(MSBuildThisFileDirectory)..\..\Common;
@@ -50,4 +49,4 @@
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
diff --git a/lib/Parser/Chakra.Parser.vcxproj b/lib/Parser/Chakra.Parser.vcxproj
@@ -28,7 +28,6 @@
         $(MSBuildThisFileDirectory)..\Runtime;
         $(MSBuildThisFileDirectory)..\Runtime\ByteCode;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         $(ChakraManifestsIncludeDirectory);
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>

diff --git a/lib/Runtime/Base/Chakra.Runtime.Base.vcxproj b/lib/Runtime/Base/Chakra.Runtime.Base.vcxproj
@@ -28,7 +28,6 @@
         $(MSBuildThisFileDirectory)..\..\Runtime\ByteCode;
         $(MSBuildThisFileDirectory)..\..\WasmReader;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         $(MSBuildThisFileDirectory)..\..\JITClient;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>