chakrashim: updated chakracore to 1.2

Updated chakracore to 1.2 at chakra-core/ChakraCore@2475f39

PR-URL: #76
Reviewed-By: Jianchun Xu <Jianchun.Xu@microsoft.com>

deps/chakrashim/core/.gitattributes

@@ -1,3 +1,4 @@
 *.baseline -crlf
 *.cmd -crlf
 test/*.js -crlf
+test/es6/HTMLComments.js binary diff=cpp

deps/chakrashim/core/.gitignore

@@ -2,10 +2,12 @@
 *.sdf
 *.suo
 *.opensdf
+*.VC.db
 *.opendb
 *.user
 *.i
 Build/VCBuild/
+Build/VCBuild.NoJIT/
 Build/ipch/
 Build/.vs/
 build_*.log
@@ -14,6 +16,8 @@ build_*.err
 buildchk.*
 buildfre.*
 Build/swum-cache.txt
+ComputedEnvironment.cmd
+packages/
 *.tlog/
 .*.swp
 sd.ini
@@ -27,3 +31,4 @@ profile.dpl.*
 Build/Chakra.Core.VC.opendb
 test/benchmarks/*.txt
 test/benchmarks/*.dpl
+*.nupkg

deps/chakrashim/core/Build/Chakra.Build.ProjectConfiguration.props

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="Common.Build.ProjectConfiguration.props" />
+  <Import Project="MicroBuildv2.Build.ProjectConfiguration.props" />
 </Project>
-

deps/chakrashim/core/Build/Chakra.Build.props

@@ -29,8 +29,8 @@
         %(DisableSpecificWarnings);
         4456;     <!-- declaration of '' hides previous local declaration -->
         4457;     <!-- declaration of '' hides function parameter -->
-        4458;     <!-- declaration of '' hides class memeber -->
-        4091;     <!-- '': ignore on lef of 'type' when no variable is declared -->
+        4458;     <!-- declaration of '' hides class member -->
+        4091;     <!-- '': ignore on left of 'type' when no variable is declared -->
         4838;     <!-- conversion from 'unsigned int' to 'int requires a narrowing conversion -->
         4499;     <!-- explicit specialization cannot have a storage class (ignored) -->
         4463;     <!-- overflow; assigning 1 to bit-field that can only hold values from -1 to 0 -->
@@ -45,13 +45,28 @@
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
 
-      <!-- ======== For Code Covearge ======== -->
+      <!-- ======== For Code Coverage ======== -->
       <Optimization Condition="'$(ENABLE_CODECOVERAGE)'=='true'">Disabled</Optimization>
     </ClCompile>
 
     <Link>
-      <!-- ======== For Code Covearge ======== -->
+      <!-- ======== For Code Coverage ======== -->
       <AdditionalOptions Condition="'$(ENABLE_CODECOVERAGE)'=='true'">%(AdditionalOptions) /DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
+
+  <!-- Link dependencies for projects that link with Chakra libraries -->
+  <PropertyGroup>
+    <ChakraCommonLinkDependencies>
+        oleaut32.lib;
+        version.lib
+    </ChakraCommonLinkDependencies>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(OptimizedBuild)'!='true'">
+    <ChakraCommonLinkDependencies>
+        $(ChakraCommonLinkDependencies);
+        dbghelp.lib;
+        user32.lib
+    </ChakraCommonLinkDependencies>
+  </PropertyGroup>
 </Project>

deps/chakrashim/core/Build/Common.Build.Default.props

@@ -40,7 +40,14 @@
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
 
-  <!-- Alternate platform names-->
+  <!-- Change configuration name to output to a different folder -->
+  <!-- POGO instrumentation -->
+  <PropertyGroup>
+    <IsPogoBuild Condition="('$(POGO_TYPE)'=='PGO' OR '$(POGO_TYPE)'=='PGI')">true</IsPogoBuild>
+    <OutDirName Condition="'$(IsPogoBuild)'=='true'">$(Configuration.ToLower())_pogo</OutDirName>
+  </PropertyGroup>
+
+  <!-- Alternate platform names -->
   <PropertyGroup>
     <!-- PlatformPathName is used in OutDir/IntDir name-->
     <PlatformPathName>$(Platform)</PlatformPathName>

deps/chakrashim/core/Build/Common.Build.props

@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);NOMINMAX;USE_EDGEMODE_JSRT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);_CHAKRACOREBUILD;NOMINMAX;USE_EDGEMODE_JSRT</PreprocessorDefinitions>
       <!-- Some of our STDMETHOD can throw
            TODO: Code review STDMETHOD and separate out API that can throw and those that can't -->
       <PreprocessorDefinitions>%(PreprocessorDefinitions);COM_STDMETHOD_CAN_THROW</PreprocessorDefinitions>
@@ -91,7 +91,7 @@
     </ResourceCompile>
     <Link>
       <LinkTimeCodeGeneration Condition="'$(PlatformToolset)'=='v120' OR '$(TF_BUILD)'!=''">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <LinkTimeCodeGeneration Condition="'$(PlatformToolset)'!='v120'">UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <LinkTimeCodeGeneration Condition="'$(PlatformToolset)'!='v120' AND '$(TF_BUILD)'==''">UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
     <Lib>
       <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>

deps/chakrashim/core/Build/MicroBuildv2.Build.ProjectConfiguration.props

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MicroBuildV2Dir>$(SolutionDir)packages\MicroBuild.Core.0.2.0\build</MicroBuildV2Dir>
+    <MicroBuildV2Props>$(MicroBuildV2Dir)\MicroBuild.Core.props</MicroBuildV2Props>
+    <MicroBuildV2Targets>$(MicroBuildV2Dir)\MicroBuild.Core.targets</MicroBuildV2Targets>
+  </PropertyGroup>
+
+  <Import Project="$(MicroBuildV2Props)"
+    Condition="'$(VSO_MICROBUILD_V2)'=='True' AND Exists('$(MicroBuildV2Props)')" />
+
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Text="$([System.String]::Format('$(ErrorText)', '$(MicroBuildV2Props)'))"
+      Condition="'$(VSO_MICROBUILD_V2)'=='True' AND !Exists('$(MicroBuildV2Props)')" />
+    <Error Text="$([System.String]::Format('$(ErrorText)', '$(MicroBuildV2Targets)'))"
+      Condition="'$(VSO_MICROBUILD_V2)'=='True' AND !Exists('$(MicroBuildV2Targets)')" />
+  </Target>
+
+  <Import Project="$(MicroBuildV2Targets)"
+    Condition="'$(VSO_MICROBUILD_V2)'=='True' AND Exists('$(MicroBuildV2Targets)')" />
+</Project>

deps/chakrashim/core/Build/MicroBuildv2.Build.ProjectConfiguration1.props

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(SolutionDir)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('$(SolutionDir)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets'))" />
+  </Target>
+  <Import Project="$(SolutionDir)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('$(SolutionDir)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
+</Project>

deps/chakrashim/core/Build/armasm.targets

@@ -110,7 +110,7 @@
        ToolArchitecture                   ="$(CLToolArchitecture)"
        TrackerFrameworkPath               ="$(CLTrackerFrameworkPath)"
        TrackerSdkPath                     ="$(CLTrackerSdkPath)"
-       TrackedInputFilesToIgnore             ="@(ClNoDependencies)"
+       TrackedInputFilesToIgnore          ="@(ClNoDependencies)"
 
        AcceptableNonZeroExitCodes         ="%(ClCompile.AcceptableNonZeroExitCodes)"
        YieldDuringToolExecution           ="$(ClYieldDuringToolExecution)"

deps/chakrashim/core/Build/scripts/add_msbuild_path.cmd

@@ -0,0 +1,65 @@
+::-------------------------------------------------------------------------------------------------------
+:: Copyright (C) Microsoft. All rights reserved.
+:: Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+::-------------------------------------------------------------------------------------------------------
+
+:: add_msbuild_path.cmd
+::
+:: Locate msbuild.exe and add it to the PATH
+
+set USE_MSBUILD_12=%1
+
+if "%USE_MSBUILD_12%" == "True" (
+    echo Skipping Dev14 and trying Dev12...
+    goto :LABEL_USE_MSBUILD_12
+)
+
+where /q msbuild.exe
+if "%ERRORLEVEL%" == "0" (
+    goto :SkipMsBuildSetup
+)
+
+REM Try Dev14 first
+set MSBUILD_VERSION=14.0
+set MSBUILD_PATH="%ProgramFiles%\msbuild\%MSBUILD_VERSION%\Bin\x86"
+
+if not exist %MSBUILD_PATH%\msbuild.exe (
+    set MSBUILD_PATH="%ProgramFiles(x86)%\msbuild\%MSBUILD_VERSION%\Bin"
+)
+
+if not exist %MSBUILD_PATH%\msbuild.exe (
+    set MSBUILD_PATH="%ProgramFiles(x86)%\msbuild\%MSBUILD_VERSION%\Bin\amd64"
+)
+
+if exist %MSBUILD_PATH%\msbuild.exe (
+    goto :MSBuildFound
+)
+
+echo Dev14 not found, trying Dev12...
+
+:LABEL_USE_MSBUILD_12
+set MSBUILD_VERSION=12.0
+set MSBUILD_PATH="%ProgramFiles%\msbuild\%MSBUILD_VERSION%\Bin\x86"
+echo Dev14 not found, trying Dev %MSBUILD_VERSION%
+
+if not exist %MSBUILD_PATH%\msbuild.exe (
+    set MSBUILD_PATH="%ProgramFiles(x86)%\msbuild\%MSBUILD_VERSION%\Bin"
+)
+
+if not exist %MSBUILD_PATH%\msbuild.exe (
+    set MSBUILD_PATH="%ProgramFiles(x86)%\msbuild\%MSBUILD_VERSION%\Bin\amd64"
+)
+
+if not exist %MSBUILD_PATH%\msbuild.exe (
+    echo Can't find msbuild.exe in %MSBUILD_PATH%
+    goto :SkipMsBuildSetup
+)
+
+:MSBuildFound
+echo MSBuild located at %MSBUILD_PATH%
+
+set PATH=%MSBUILD_PATH%;%PATH%
+set USE_MSBUILD_12=
+set MSBUILD_PATH=
+
+:SkipMsBuildSetup

deps/chakrashim/core/Build/scripts/compose_build.ps1

@@ -0,0 +1,59 @@
+#-------------------------------------------------------------------------------------------------------
+# Copyright (C) Microsoft. All rights reserved.
+# Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+#-------------------------------------------------------------------------------------------------------
+
+# Compose Build script
+#
+# Aggregate metadata about a build and produce a file with useful information about the build
+# for tools to consume and get a quick overview of the status of a completed build.
+
+param (
+    [Parameter(Mandatory=$True)]
+    [string]$rootPath
+)
+
+#
+# Aggregate build metadata and produce build.json
+#
+
+$outputJsonFile = Join-Path $rootPath "build.json"
+$buildInfo = New-Object System.Object
+
+$changeJson = (Get-ChildItem -Path $rootPath "change.json" -Recurse)[0].FullName
+$changeText = (Get-ChildItem -Path $rootPath "change.txt"  -Recurse)[0].FullName
+Copy-Item -Verbose -Force -Path $changeJson -Destination $rootPath
+Copy-Item -Verbose -Force -Path $changeText -Destination $rootPath
+
+$changeInfo = (Get-Content $changeJson) -join "`n" | ConvertFrom-Json
+
+# Recursively locate ${arch}_${flavor}.json and move to $rootPath.
+# This ensures that in the rebuild scenario, we don't have duplication of *.json files
+# between the partially-composed root and the metadata directories.
+
+Get-ChildItem -Path $rootPath "*.json" -Recurse `
+    | ? { -not ($_.Name -in @("change.json", "build.json")) } `
+    | % { Move-Item -Verbose -Force -Path $_.FullName -Destination $rootPath }
+
+# Determine the overall build status. Mark the build as "passed" until "failed" is encountered.
+$overallBuildStatus = "passed"
+
+$files = Get-ChildItem -Path $rootPath "*.json" -Recurse `
+    | ? { -not ($_.Name -in @("change.json", "build.json")) } `
+    | % { $_.FullName }
+$builds = New-Object System.Collections.ArrayList
+foreach ($file in $files) {
+    $json = (Get-Content $file) -join "`n" | ConvertFrom-Json
+    $_ = $builds.Add($json)
+
+    if ($json.status -eq "failed") {
+        $overallBuildStatus = "failed"
+    }
+}
+
+$buildInfo | Add-Member -type NoteProperty -name status -value $overallBuildStatus
+$buildInfo | Add-Member -type NoteProperty -name change -value $changeInfo
+$buildInfo | Add-Member -type NoteProperty -name builds -value $builds
+
+$buildInfo | ConvertTo-Json | Write-Output
+$buildInfo | ConvertTo-Json | Out-File $outputJsonFile -Encoding Ascii