Skip to content

Commit

Permalink
support double edge for node 5.9.1, edge.js v5.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
tjanczuk committed Apr 1, 2016
1 parent fa63a41 commit a307665
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 9 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"url": "http://tomasz.janczuk.org",
"twitter": "tjanczuk"
},
"version": "5.0.1",
"version": "5.0.2",
"description": "Edge.js: run .NET and Node.js in-process on Windows, Mac OS, and Linux",
"tags": [
"owin",
Expand Down
2 changes: 1 addition & 1 deletion src/double/dotnet/EdgeJs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public Task<object> InitializeInternal(object input)
}

// Find the entry point with `dumpbin /exports node.exe`, look for Start@node
[DllImport("node.dll", EntryPoint = "#929", CallingConvention = CallingConvention.Cdecl)]
[DllImport("node.dll", EntryPoint = "#925", CallingConvention = CallingConvention.Cdecl)]
static extern int NodeStart(int argc, string[] argv);

[DllImport("kernel32.dll", EntryPoint = "LoadLibrary")]
Expand Down
2 changes: 1 addition & 1 deletion test/double/double_test/double_test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="EdgeJs, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Edge.js.4.4.1\lib\EdgeJs.dll</HintPath>
<HintPath>packages\Edge.js.5.9.1\lib\EdgeJs.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
Expand Down
2 changes: 1 addition & 1 deletion test/double/double_test/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Edge.js" version="4.4.1" targetFramework="net45" />
<package id="Edge.js" version="5.9.1" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion tools/build_double.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set SELF=%~dp0
if "%1" equ "" (
echo Usage: build_double.bat {node_version}
echo e.g. build_double.bat 4.4.1
echo e.g. build_double.bat 5.9.1
exit /b -1
)

Expand Down
8 changes: 4 additions & 4 deletions tools/nuget/edge.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
<package >
<metadata>
<id>Edge.js</id>
<version>4.4.1</version>
<version>5.9.1</version>
<authors>Tomasz Janczuk</authors>
<owners>Tomasz Janczuk</owners>
<licenseUrl>https://raw.githubusercontent.com/tjanczuk/edge/master/LICENSE.txt</licenseUrl>
<projectUrl>http://tjanczuk.github.io/edge</projectUrl>
<projectUrl>https://github.com/tjanczuk/edge</projectUrl>
<!--<iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl>-->
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<summary>Script Node.js in a .NET application.</summary>
<description>With Edge.js you can script Node.js in a .NET application. Edge.js allows you to run Node.js and .NET code in one process. You can call Node.js functions from .NET and .NET functions from Node.js. Edge.js takes care of marshalling data between CLR and V8. Edge.js also reconciles threading models of single threaded V8 and multi-threaded CLR. Edge.js ensures correct lifetime of objects on V8 and CLR heaps. Edge.js NuGet package v4.1.1 supports scripting Node.js v4.4.1 with Edge.js v5.0.1.</description>
<description>With Edge.js you can script Node.js in a .NET application. Edge.js allows you to run Node.js and .NET code in one process. You can call Node.js functions from .NET and .NET functions from Node.js. Edge.js takes care of marshalling data between CLR and V8. Edge.js also reconciles threading models of single threaded V8 and multi-threaded CLR. Edge.js ensures correct lifetime of objects on V8 and CLR heaps. Edge.js NuGet package v5.9.1 supports scripting Node.js v5.9.1 with Edge.js v5.0.2.</description>
<copyright>Copyright 2015 Tomasz Janczuk</copyright>
<tags>node.js node .net edge edge.js v8 clr interop javascript</tags>
<tags>node.js node .net edge edge.js v8 clr coreclr mono interop javascript</tags>
</metadata>
</package>
44 changes: 44 additions & 0 deletions tools/unzip.vbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
' UnZip a file script
'
' By Justin Godden 2010
'
' It's a mess, I know!!!
'

' Dim ArgObj, var1, var2
Set ArgObj = WScript.Arguments

If (Wscript.Arguments.Count > 0) Then
var1 = ArgObj(0)
Else
var1 = ""
End if

If var1 = "" then
strFileZIP = "example.zip"
Else
strFileZIP = var1
End if

'The location of the zip file.
REM Set WshShell = CreateObject("Wscript.Shell")
REM CurDir = WshShell.ExpandEnvironmentStrings("%%cd%%")
Dim sCurPath
sCurPath = CreateObject("Scripting.FileSystemObject").GetAbsolutePathName(".")
strZipFile = sCurPath & "\" & strFileZIP
'The folder the contents should be extracted to.
outFolder = sCurPath & "\"

WScript.Echo ( "Extracting file " & strFileZIP)

Set objShell = CreateObject( "Shell.Application" )
Set objSource = objShell.NameSpace(strZipFile).Items()
Set objTarget = objShell.NameSpace(outFolder)
intOptions = 256
objTarget.CopyHere objSource, intOptions

WScript.Echo ( "Extracted." )

' This bit is for testing purposes
REM Dim MyVar
REM MyVar = MsgBox ( strZipFile, 65, "MsgBox Example"

0 comments on commit a307665

Please sign in to comment.