Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit 7cd4c61

Browse files
kunalspathakkunalspathak
committed
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>
1 parent 407e16c commit 7cd4c61

File tree

1,469 files changed

+137187
-45955
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,469 files changed

+137187
-45955
lines changed

‎deps/chakrashim/core/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*.baseline -crlf
22
*.cmd -crlf
33
test/*.js -crlf
4+
test/es6/HTMLComments.js binary diff=cpp

‎deps/chakrashim/core/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
*.sdf
33
*.suo
44
*.opensdf
5+
*.VC.db
56
*.opendb
67
*.user
78
*.i
89
Build/VCBuild/
10+
Build/VCBuild.NoJIT/
911
Build/ipch/
1012
Build/.vs/
1113
build_*.log
@@ -14,6 +16,8 @@ build_*.err
1416
buildchk.*
1517
buildfre.*
1618
Build/swum-cache.txt
19+
ComputedEnvironment.cmd
20+
packages/
1721
*.tlog/
1822
.*.swp
1923
sd.ini
@@ -27,3 +31,4 @@ profile.dpl.*
2731
Build/Chakra.Core.VC.opendb
2832
test/benchmarks/*.txt
2933
test/benchmarks/*.dpl
34+
*.nupkg

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="Common.Build.ProjectConfiguration.props" />
4+
<Import Project="MicroBuildv2.Build.ProjectConfiguration.props" />
45
</Project>
5-

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
%(DisableSpecificWarnings);
3030
4456; <!-- declaration of '' hides previous local declaration -->
3131
4457; <!-- declaration of '' hides function parameter -->
32-
4458; <!-- declaration of '' hides class memeber -->
33-
4091; <!-- '': ignore on lef of 'type' when no variable is declared -->
32+
4458; <!-- declaration of '' hides class member -->
33+
4091; <!-- '': ignore on left of 'type' when no variable is declared -->
3434
4838; <!-- conversion from 'unsigned int' to 'int requires a narrowing conversion -->
3535
4499; <!-- explicit specialization cannot have a storage class (ignored) -->
3636
4463; <!-- overflow; assigning 1 to bit-field that can only hold values from -1 to 0 -->
@@ -45,13 +45,28 @@
4545
%(AdditionalIncludeDirectories)
4646
</AdditionalIncludeDirectories>
4747

48-
<!-- ======== For Code Covearge ======== -->
48+
<!-- ======== For Code Coverage ======== -->
4949
<Optimization Condition="'$(ENABLE_CODECOVERAGE)'=='true'">Disabled</Optimization>
5050
</ClCompile>
5151

5252
<Link>
53-
<!-- ======== For Code Covearge ======== -->
53+
<!-- ======== For Code Coverage ======== -->
5454
<AdditionalOptions Condition="'$(ENABLE_CODECOVERAGE)'=='true'">%(AdditionalOptions) /DEBUGTYPE:CV,FIXUP</AdditionalOptions>
5555
</Link>
5656
</ItemDefinitionGroup>
57+
58+
<!-- Link dependencies for projects that link with Chakra libraries -->
59+
<PropertyGroup>
60+
<ChakraCommonLinkDependencies>
61+
oleaut32.lib;
62+
version.lib
63+
</ChakraCommonLinkDependencies>
64+
</PropertyGroup>
65+
<PropertyGroup Condition="'$(OptimizedBuild)'!='true'">
66+
<ChakraCommonLinkDependencies>
67+
$(ChakraCommonLinkDependencies);
68+
dbghelp.lib;
69+
user32.lib
70+
</ChakraCommonLinkDependencies>
71+
</PropertyGroup>
5772
</Project>

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,14 @@
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242

43-
<!-- Alternate platform names-->
43+
<!-- Change configuration name to output to a different folder -->
44+
<!-- POGO instrumentation -->
45+
<PropertyGroup>
46+
<IsPogoBuild Condition="('$(POGO_TYPE)'=='PGO' OR '$(POGO_TYPE)'=='PGI')">true</IsPogoBuild>
47+
<OutDirName Condition="'$(IsPogoBuild)'=='true'">$(Configuration.ToLower())_pogo</OutDirName>
48+
</PropertyGroup>
49+
50+
<!-- Alternate platform names -->
4451
<PropertyGroup>
4552
<!-- PlatformPathName is used in OutDir/IntDir name-->
4653
<PlatformPathName>$(Platform)</PlatformPathName>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemDefinitionGroup>
44
<ClCompile>
5-
<PreprocessorDefinitions>%(PreprocessorDefinitions);NOMINMAX;USE_EDGEMODE_JSRT</PreprocessorDefinitions>
5+
<PreprocessorDefinitions>%(PreprocessorDefinitions);_CHAKRACOREBUILD;NOMINMAX;USE_EDGEMODE_JSRT</PreprocessorDefinitions>
66
<!-- Some of our STDMETHOD can throw
77
TODO: Code review STDMETHOD and separate out API that can throw and those that can't -->
88
<PreprocessorDefinitions>%(PreprocessorDefinitions);COM_STDMETHOD_CAN_THROW</PreprocessorDefinitions>
@@ -91,7 +91,7 @@
9191
</ResourceCompile>
9292
<Link>
9393
<LinkTimeCodeGeneration Condition="'$(PlatformToolset)'=='v120' OR '$(TF_BUILD)'!=''">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
94-
<LinkTimeCodeGeneration Condition="'$(PlatformToolset)'!='v120'">UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
94+
<LinkTimeCodeGeneration Condition="'$(PlatformToolset)'!='v120' AND '$(TF_BUILD)'==''">UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
9595
</Link>
9696
<Lib>
9797
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<MicroBuildV2Dir>$(SolutionDir)packages\MicroBuild.Core.0.2.0\build</MicroBuildV2Dir>
5+
<MicroBuildV2Props>$(MicroBuildV2Dir)\MicroBuild.Core.props</MicroBuildV2Props>
6+
<MicroBuildV2Targets>$(MicroBuildV2Dir)\MicroBuild.Core.targets</MicroBuildV2Targets>
7+
</PropertyGroup>
8+
9+
<Import Project="$(MicroBuildV2Props)"
10+
Condition="'$(VSO_MICROBUILD_V2)'=='True' AND Exists('$(MicroBuildV2Props)')" />
11+
12+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
13+
<PropertyGroup>
14+
<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>
15+
</PropertyGroup>
16+
<Error Text="$([System.String]::Format('$(ErrorText)', '$(MicroBuildV2Props)'))"
17+
Condition="'$(VSO_MICROBUILD_V2)'=='True' AND !Exists('$(MicroBuildV2Props)')" />
18+
<Error Text="$([System.String]::Format('$(ErrorText)', '$(MicroBuildV2Targets)'))"
19+
Condition="'$(VSO_MICROBUILD_V2)'=='True' AND !Exists('$(MicroBuildV2Targets)')" />
20+
</Target>
21+
22+
<Import Project="$(MicroBuildV2Targets)"
23+
Condition="'$(VSO_MICROBUILD_V2)'=='True' AND Exists('$(MicroBuildV2Targets)')" />
24+
</Project>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<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')" />
4+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
5+
<PropertyGroup>
6+
<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>
7+
</PropertyGroup>
8+
<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'))" />
9+
<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'))" />
10+
</Target>
11+
<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')" />
12+
</Project>

‎deps/chakrashim/core/Build/armasm.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
ToolArchitecture ="$(CLToolArchitecture)"
111111
TrackerFrameworkPath ="$(CLTrackerFrameworkPath)"
112112
TrackerSdkPath ="$(CLTrackerSdkPath)"
113-
TrackedInputFilesToIgnore ="@(ClNoDependencies)"
113+
TrackedInputFilesToIgnore ="@(ClNoDependencies)"
114114

115115
AcceptableNonZeroExitCodes ="%(ClCompile.AcceptableNonZeroExitCodes)"
116116
YieldDuringToolExecution ="$(ClYieldDuringToolExecution)"

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

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
::-------------------------------------------------------------------------------------------------------
2+
:: Copyright (C) Microsoft. All rights reserved.
3+
:: Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
4+
::-------------------------------------------------------------------------------------------------------
5+
6+
:: add_msbuild_path.cmd
7+
::
8+
:: Locate msbuild.exe and add it to the PATH
9+
10+
set USE_MSBUILD_12=%1
11+
12+
if "%USE_MSBUILD_12%" == "True" (
13+
echo Skipping Dev14 and trying Dev12...
14+
goto :LABEL_USE_MSBUILD_12
15+
)
16+
17+
where /q msbuild.exe
18+
if "%ERRORLEVEL%" == "0" (
19+
goto :SkipMsBuildSetup
20+
)
21+
22+
REM Try Dev14 first
23+
set MSBUILD_VERSION=14.0
24+
set MSBUILD_PATH="%ProgramFiles%\msbuild\%MSBUILD_VERSION%\Bin\x86"
25+
26+
if not exist %MSBUILD_PATH%\msbuild.exe (
27+
set MSBUILD_PATH="%ProgramFiles(x86)%\msbuild\%MSBUILD_VERSION%\Bin"
28+
)
29+
30+
if not exist %MSBUILD_PATH%\msbuild.exe (
31+
set MSBUILD_PATH="%ProgramFiles(x86)%\msbuild\%MSBUILD_VERSION%\Bin\amd64"
32+
)
33+
34+
if exist %MSBUILD_PATH%\msbuild.exe (
35+
goto :MSBuildFound
36+
)
37+
38+
echo Dev14 not found, trying Dev12...
39+
40+
:LABEL_USE_MSBUILD_12
41+
set MSBUILD_VERSION=12.0
42+
set MSBUILD_PATH="%ProgramFiles%\msbuild\%MSBUILD_VERSION%\Bin\x86"
43+
echo Dev14 not found, trying Dev %MSBUILD_VERSION%
44+
45+
if not exist %MSBUILD_PATH%\msbuild.exe (
46+
set MSBUILD_PATH="%ProgramFiles(x86)%\msbuild\%MSBUILD_VERSION%\Bin"
47+
)
48+
49+
if not exist %MSBUILD_PATH%\msbuild.exe (
50+
set MSBUILD_PATH="%ProgramFiles(x86)%\msbuild\%MSBUILD_VERSION%\Bin\amd64"
51+
)
52+
53+
if not exist %MSBUILD_PATH%\msbuild.exe (
54+
echo Can't find msbuild.exe in %MSBUILD_PATH%
55+
goto :SkipMsBuildSetup
56+
)
57+
58+
:MSBuildFound
59+
echo MSBuild located at %MSBUILD_PATH%
60+
61+
set PATH=%MSBUILD_PATH%;%PATH%
62+
set USE_MSBUILD_12=
63+
set MSBUILD_PATH=
64+
65+
:SkipMsBuildSetup

0 commit comments

Comments
 (0)