Skip to content

Commit 29664e8

Browse files
TaritsynTaritsyn
committed
Was made refactoring in the JavaScriptEngineSwitcher.ChakraCore.Native.* and JavaScriptEngineSwitcher.V8.Native.* packages
1 parent aa80422 commit 29664e8

File tree

16 files changed

+72
-64
lines changed

16 files changed

+72
-64
lines changed

‎lib/ClearScript/runtimes/win-x64/native/ClearScriptV8-64.dll renamed to ‎lib/ClearScript/runtimes/win-x64/lib/net45/ClearScriptV8-64.dll

File renamed without changes.

‎lib/ClearScript/runtimes/win-x86/native/ClearScriptV8-32.dll renamed to ‎lib/ClearScript/runtimes/win-x86/lib/net45/ClearScriptV8-32.dll

File renamed without changes.

‎src/JavaScriptEngineSwitcher.ChakraCore.Native.win-arm/tools/Install.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
param($installPath, $toolsPath, $package, $project)
22

33
if ($project.Type -eq "Web Site") {
4-
$runtimesDirectoryPath = Join-Path $installPath "runtimes"
4+
$runtimeDirectoryPath = Join-Path $installPath "runtimes/win-arm/"
55
$projectDirectoryPath = $project.Properties.Item("FullPath").Value
66
$binDirectoryPath = Join-Path $projectDirectoryPath "bin"
77
$assemblyFileName = "ChakraCore.dll"
88

9-
$assemblyArmDestDirectoryPath = Join-Path $binDirectoryPath "arm"
10-
if (!(Test-Path $assemblyArmDestDirectoryPath)) {
11-
New-Item -ItemType Directory -Force -Path $assemblyArmDestDirectoryPath
9+
$assemblyDestDirectoryPath = Join-Path $binDirectoryPath "arm"
10+
if (!(Test-Path $assemblyDestDirectoryPath)) {
11+
New-Item -ItemType Directory -Force -Path $assemblyDestDirectoryPath
1212
}
1313

14-
$assemblyArmSourceFilePath = Join-Path $runtimesDirectoryPath ("win-arm/native/" + $assemblyFileName)
15-
Copy-Item $assemblyArmSourceFilePath $assemblyArmDestDirectoryPath -Force
14+
$assemblySourceFilePath = Join-Path $runtimeDirectoryPath ("native/" + $assemblyFileName)
15+
Copy-Item $assemblySourceFilePath $assemblyDestDirectoryPath -Force
1616
}

‎src/JavaScriptEngineSwitcher.ChakraCore.Native.win-arm/tools/Uninstall.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ if ($project.Type -eq "Web Site") {
55
$binDirectoryPath = Join-Path $projectDirectoryPath "bin"
66
$assemblyFileName = "ChakraCore.dll"
77

8-
$assemblyArmDirectoryPath = Join-Path $binDirectoryPath "arm"
9-
$assemblyArmFilePath = Join-Path $assemblyArmDirectoryPath $assemblyFileName
10-
11-
if (Test-Path $assemblyArmFilePath) {
12-
Remove-Item $assemblyArmFilePath -Force
8+
$assemblyDirectoryPath = Join-Path $binDirectoryPath "arm"
9+
$assemblyFilePath = Join-Path $assemblyDirectoryPath $assemblyFileName
10+
11+
if (Test-Path $assemblyFilePath) {
12+
Remove-Item $assemblyFilePath -Force
1313
}
1414
}

‎src/JavaScriptEngineSwitcher.ChakraCore.Native.win-x64/tools/Install.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
param($installPath, $toolsPath, $package, $project)
22

33
if ($project.Type -eq "Web Site") {
4-
$runtimesDirectoryPath = Join-Path $installPath "runtimes"
4+
$runtimeDirectoryPath = Join-Path $installPath "runtimes/win-x64/"
55
$projectDirectoryPath = $project.Properties.Item("FullPath").Value
66
$binDirectoryPath = Join-Path $projectDirectoryPath "bin"
77
$assemblyFileName = "ChakraCore.dll"
88

9-
$assembly64DestDirectoryPath = Join-Path $binDirectoryPath "x64"
10-
if (!(Test-Path $assembly64DestDirectoryPath)) {
11-
New-Item -ItemType Directory -Force -Path $assembly64DestDirectoryPath
9+
$assemblyDestDirectoryPath = Join-Path $binDirectoryPath "x64"
10+
if (!(Test-Path $assemblyDestDirectoryPath)) {
11+
New-Item -ItemType Directory -Force -Path $assemblyDestDirectoryPath
1212
}
1313

14-
$assembly64SourceFilePath = Join-Path $runtimesDirectoryPath ("win-x64/native/" + $assemblyFileName)
15-
Copy-Item $assembly64SourceFilePath $assembly64DestDirectoryPath -Force
14+
$assemblySourceFilePath = Join-Path $runtimeDirectoryPath ("native/" + $assemblyFileName)
15+
Copy-Item $assemblySourceFilePath $assemblyDestDirectoryPath -Force
1616
}

‎src/JavaScriptEngineSwitcher.ChakraCore.Native.win-x64/tools/Uninstall.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ if ($project.Type -eq "Web Site") {
55
$binDirectoryPath = Join-Path $projectDirectoryPath "bin"
66
$assemblyFileName = "ChakraCore.dll"
77

8-
$assembly64DirectoryPath = Join-Path $binDirectoryPath "x64"
9-
$assembly64FilePath = Join-Path $assembly64DirectoryPath $assemblyFileName
10-
11-
if (Test-Path $assembly64FilePath) {
12-
Remove-Item $assembly64FilePath -Force
8+
$assemblyDirectoryPath = Join-Path $binDirectoryPath "x64"
9+
$assemblyFilePath = Join-Path $assemblyDirectoryPath $assemblyFileName
10+
11+
if (Test-Path $assemblyFilePath) {
12+
Remove-Item $assemblyFilePath -Force
1313
}
1414
}

‎src/JavaScriptEngineSwitcher.ChakraCore.Native.win-x86/tools/Install.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
param($installPath, $toolsPath, $package, $project)
22

33
if ($project.Type -eq "Web Site") {
4-
$runtimesDirectoryPath = Join-Path $installPath "runtimes"
4+
$runtimeDirectoryPath = Join-Path $installPath "runtimes/win-x86/"
55
$projectDirectoryPath = $project.Properties.Item("FullPath").Value
66
$binDirectoryPath = Join-Path $projectDirectoryPath "bin"
77
$assemblyFileName = "ChakraCore.dll"
88

9-
$assembly32DestDirectoryPath = Join-Path $binDirectoryPath "x86"
10-
if (!(Test-Path $assembly32DestDirectoryPath)) {
11-
New-Item -ItemType Directory -Force -Path $assembly32DestDirectoryPath
9+
$assemblyDestDirectoryPath = Join-Path $binDirectoryPath "x86"
10+
if (!(Test-Path $assemblyDestDirectoryPath)) {
11+
New-Item -ItemType Directory -Force -Path $assemblyDestDirectoryPath
1212
}
1313

14-
$assembly32SourceFilePath = Join-Path $runtimesDirectoryPath ("win-x86/native/" + $assemblyFileName)
15-
Copy-Item $assembly32SourceFilePath $assembly32DestDirectoryPath -Force
14+
$assemblySourceFilePath = Join-Path $runtimeDirectoryPath ("native/" + $assemblyFileName)
15+
Copy-Item $assemblySourceFilePath $assemblyDestDirectoryPath -Force
1616
}

‎src/JavaScriptEngineSwitcher.ChakraCore.Native.win-x86/tools/Uninstall.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ if ($project.Type -eq "Web Site") {
55
$binDirectoryPath = Join-Path $projectDirectoryPath "bin"
66
$assemblyFileName = "ChakraCore.dll"
77

8-
$assembly32DirectoryPath = Join-Path $binDirectoryPath "x86"
9-
$assembly32FilePath = Join-Path $assembly32DirectoryPath $assemblyFileName
8+
$assemblyDirectoryPath = Join-Path $binDirectoryPath "x86"
9+
$assemblyFilePath = Join-Path $assemblyDirectoryPath $assemblyFileName
1010

11-
if (Test-Path $assembly32FilePath) {
12-
Remove-Item $assembly32FilePath -Force
11+
if (Test-Path $assemblyFilePath) {
12+
Remove-Item $assemblyFilePath -Force
1313
}
1414
}

‎src/JavaScriptEngineSwitcher.V8.Native.win-x64/JavaScriptEngineSwitcher.V8.Native.win-x64.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ For correct working of the Microsoft ClearScript.V8 require the Microsoft Visual
2020
<tags>JavaScriptEngineSwitcher JavaScript ECMAScript V8 ClearScript Windows x64</tags>
2121
</metadata>
2222
<files>
23-
<file src="../../lib/ClearScript/runtimes/win-x64/native/ClearScriptV8-64.dll" target="runtimes/win-x64/native/" />
23+
<file src="../../lib/ClearScript/runtimes/win-x64/lib/net45/ClearScriptV8-64.dll" target="runtimes/win-x64/lib/net45/" />
2424
<file src="../../lib/ClearScript/runtimes/win-x64/native/v8-libcpp-x64.dll" target="runtimes/win-x64/native/" />
2525
<file src="../../lib/ClearScript/runtimes/win-x64/native/v8-base-x64.dll" target="runtimes/win-x64/native/" />
2626
<file src="../../lib/ClearScript/runtimes/win-x64/native/v8-x64.dll" target="runtimes/win-x64/native/" />

‎src/JavaScriptEngineSwitcher.V8.Native.win-x64/build/JavaScriptEngineSwitcher.V8.Native.win-x64.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Condition=" $(RuntimeFrameworkVersion) == '' ">
4-
<None Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\ClearScriptV8-64.dll">
4+
<None Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\lib\net45\ClearScriptV8-64.dll">
55
<Link>x64\ClearScriptV8-64.dll</Link>
66
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
77
<Visible>False</Visible>

0 commit comments

Comments
 (0)