Skip to content

Commit

Permalink
Support for Node 8.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
tjanczuk committed Aug 10, 2017
1 parent 6a438d6 commit 3eb4f4e
Showing 68 changed files with 35 additions and 40 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
language: node_js

node_js:
- "0.12"
- "0.10"
- "8"

install:
- sudo apt-key adv --keyserver pgp.mit.edu --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -153,13 +153,13 @@ If you are writing a Node.js application, this section explains how you include

### What you need

Edge.js runs on Windows, Linux, and OSX and requires Node.js 7.x, 6.x, 5.x, 4.x, as well as .NET Framework 4.5 (Windows), Mono 4.2.4 (OSX, Linux), or .NET Core 1.0.0 Preview 2 (Windows, OSX, Linux).
Edge.js runs on Windows, Linux, and OSX and requires Node.js 8.x, 7.x, 6.x, as well as .NET Framework 4.5 (Windows), Mono 4.2.4 (OSX, Linux), or .NET Core 1.0.0 Preview 2 (Windows, OSX, Linux).

**NOTE** there is a known issue with Mono after 4.2.4 that will be addressed in Mono 4.6.

#### Windows

* Node.js 7.x, 6.x, 5.x, or 4.x
* Node.js 8.x, 7.x, or 6.x
* [.NET 4.5](http://www.microsoft.com/en-us/download/details.aspx?id=30653) and/or [.NET Core](https://www.microsoft.com/net/core)
* to use Python, you also need [IronPython 2.7.3 or later](http://ironpython.codeplex.com/releases/view/81726)
* to use F#, read [Dave Thomas blog post](http://7sharpnine.com/blog/2013-05-05-i-node-something/)
@@ -170,15 +170,15 @@ If you have both desktop CLR and .NET Core installed, read [using .NET Core](#us

#### Linux

* Node.js 7.x, 6.x, 5.x, or 4.x
* Node.js 8.x, 7.x, or 6.x
* Mono 4.2.4 x64 and/or .NET Core
* Follow [Linux setup instructions](#building-on-linux)

![image](https://cloud.githubusercontent.com/assets/822369/2808077/03f92874-cd0e-11e3-88ea-79f67b8b1d49.png)

#### OSX

* Node.js 7.x, 6.x, 5.x, or 4.x,
* Node.js 8.x, 7.x, or 6.x
* Mono 4.2.4 x64 and/or .NET Core
* Follow [OSX setup instructions](#building-on-osx)

@@ -1217,7 +1217,7 @@ To build one of the versions of Node.js officially released by [Node.js](http://

```
cd tools
build.bat release 7.10.0
build.bat release 8.2.1
```

Note: the Node.js version number you provide must be version number corresponding to one of the subdirectories of http://nodejs.org/dist. The command will build both x32 and x64 architectures (assuming you use x64 machine). The command will also copy the edge\_\*.node executables to appropriate locations under lib\native directory where they are looked up from at runtime. The `npm install` step copies the C standard library shared DLL to the location of the edge\_\*.node files for the component to be ready to go.
@@ -1373,7 +1373,7 @@ You need Windows with:
* [Edge.js NuGet package](https://www.nuget.org/packages/Edge.js)
* [Node.js](http://nodejs.org) (optional, if you want to use additional NPM packages)

Edge.js support for scripting Node.js ships as a NuGet Package called `Edge.js`. It comes with everything you need to get started writing applications for x86 and x64 architectures. However, if you want to use additional Node.js packages from NPM, you must separately install Node.js runtime to access the NPM package manager. Edge.js NuGet package has been developed and tested with Node.js v7.10.0. Older Edge.js packages exist for prior versions of Node.js. If you choose a different version of Node.js to install NPM packages, your mileage can vary.
Edge.js support for scripting Node.js ships as a NuGet Package called `Edge.js`. It comes with everything you need to get started writing applications for x86 and x64 architectures. However, if you want to use additional Node.js packages from NPM, you must separately install Node.js runtime to access the NPM package manager. The latest Edge.js NuGet package has been developed and tested with Node.js v8.2.1. Older Edge.js packages exist for prior versions of Node.js. If you choose a different version of Node.js to install NPM packages, your mileage can vary.

**NOTE** you cannot use native Node.js extensions when scripting Node.js from CLR using Edge.

@@ -1688,14 +1688,14 @@ These are unstructions for building the Edge.js NuGet package on Windows. The pa
Preprequisties:

* Visual Studio 2015
* Node.js (tested with v7.10.0)
* Node.js (tested with v8.2.1)
* Python 2.7.x
* node-gyp (tested with 3.6.1)

To buid the NuGet package, open the Visual Studio 2013 Developer Command Prompt and call:

```
tools\build_double.bat 7.10.0
tools\build_double.bat 8.2.1
```

(you can substitite another version of Node.js).
7 changes: 3 additions & 4 deletions lib/edge.js
Original file line number Diff line number Diff line change
@@ -4,10 +4,9 @@ var fs = require('fs')
, edge;

var versionMap = [
[ /^4\./, '4.1.1' ],
[ /^5\./, '5.1.0' ],
[ /^6\./, '6.4.0' ],
[ /^7\./, '7.10.0' ],
[ /^6\./, '6.11.2' ],
[ /^7\./, '7.10.1' ],
[ /^8\./, '8.2.1' ],
];

function determineVersion() {
1 change: 0 additions & 1 deletion lib/native/win32/ia32/4.1.1/.gitignore

This file was deleted.

Binary file removed lib/native/win32/ia32/4.1.1/concrt140.dll
Binary file not shown.
Binary file removed lib/native/win32/ia32/4.1.1/edge_coreclr.node
Binary file not shown.
Binary file removed lib/native/win32/ia32/4.1.1/edge_nativeclr.node
Binary file not shown.
Binary file removed lib/native/win32/ia32/4.1.1/vccorlib140.dll
Binary file not shown.
Binary file removed lib/native/win32/ia32/4.1.1/vcruntime140.dll
Binary file not shown.
1 change: 0 additions & 1 deletion lib/native/win32/ia32/5.1.0/.gitignore

This file was deleted.

Binary file removed lib/native/win32/ia32/5.1.0/concrt140.dll
Binary file not shown.
Binary file removed lib/native/win32/ia32/5.1.0/edge_nativeclr.node
Binary file not shown.
Binary file removed lib/native/win32/ia32/5.1.0/vccorlib140.dll
Binary file not shown.
Binary file removed lib/native/win32/ia32/5.1.0/vcruntime140.dll
Binary file not shown.
1 change: 1 addition & 0 deletions lib/native/win32/ia32/6.11.2/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.dll
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion lib/native/win32/ia32/6.4.0/.gitignore

This file was deleted.

Binary file removed lib/native/win32/ia32/6.4.0/concrt140.dll
Binary file not shown.
Binary file removed lib/native/win32/ia32/6.4.0/vccorlib140.dll
Binary file not shown.
Binary file removed lib/native/win32/ia32/6.4.0/vcruntime140.dll
Binary file not shown.
1 change: 0 additions & 1 deletion lib/native/win32/ia32/7.10.0/.gitignore

This file was deleted.

Binary file removed lib/native/win32/ia32/7.10.0/concrt140.dll
Binary file not shown.
Binary file removed lib/native/win32/ia32/7.10.0/vccorlib140.dll
Binary file not shown.
Binary file removed lib/native/win32/ia32/7.10.0/vcruntime140.dll
Binary file not shown.
1 change: 1 addition & 0 deletions lib/native/win32/ia32/7.10.1/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.dll
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions lib/native/win32/ia32/8.2.1/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.dll
Binary file not shown.
Binary file added lib/native/win32/ia32/8.2.1/edge_nativeclr.node
Binary file not shown.
1 change: 0 additions & 1 deletion lib/native/win32/x64/4.1.1/.gitignore

This file was deleted.

Binary file removed lib/native/win32/x64/4.1.1/concrt140.dll
Binary file not shown.
Binary file removed lib/native/win32/x64/4.1.1/edge_nativeclr.node
Binary file not shown.
Binary file removed lib/native/win32/x64/4.1.1/vccorlib140.dll
Binary file not shown.
Binary file removed lib/native/win32/x64/4.1.1/vcruntime140.dll
Binary file not shown.
1 change: 0 additions & 1 deletion lib/native/win32/x64/5.1.0/.gitignore

This file was deleted.

Binary file removed lib/native/win32/x64/5.1.0/concrt140.dll
Binary file not shown.
Binary file removed lib/native/win32/x64/5.1.0/edge_coreclr.node
Binary file not shown.
Binary file removed lib/native/win32/x64/5.1.0/edge_nativeclr.node
Binary file not shown.
Binary file removed lib/native/win32/x64/5.1.0/vccorlib140.dll
Binary file not shown.
Binary file removed lib/native/win32/x64/5.1.0/vcruntime140.dll
Binary file not shown.
1 change: 1 addition & 0 deletions lib/native/win32/x64/6.11.2/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.dll
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion lib/native/win32/x64/6.4.0/.gitignore

This file was deleted.

Binary file removed lib/native/win32/x64/6.4.0/concrt140.dll
Binary file not shown.
Binary file removed lib/native/win32/x64/6.4.0/edge_coreclr.node
Binary file not shown.
Binary file removed lib/native/win32/x64/6.4.0/vccorlib140.dll
Binary file not shown.
Binary file removed lib/native/win32/x64/6.4.0/vcruntime140.dll
Binary file not shown.
1 change: 0 additions & 1 deletion lib/native/win32/x64/7.10.0/.gitignore

This file was deleted.

Binary file removed lib/native/win32/x64/7.10.0/concrt140.dll
Binary file not shown.
Binary file removed lib/native/win32/x64/7.10.0/vccorlib140.dll
Binary file not shown.
Binary file removed lib/native/win32/x64/7.10.0/vcruntime140.dll
Binary file not shown.
1 change: 1 addition & 0 deletions lib/native/win32/x64/7.10.1/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.dll
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions lib/native/win32/x64/8.2.1/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.dll
Binary file added lib/native/win32/x64/8.2.1/edge_coreclr.node
Binary file not shown.
Binary file added lib/native/win32/x64/8.2.1/edge_nativeclr.node
Binary file not shown.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
"url": "http://tomasz.janczuk.org",
"twitter": "tjanczuk"
},
"version": "7.10.1",
"version": "8.2.1",
"description": "Edge.js: run .NET and Node.js in-process on Windows, Mac OS, and Linux",
"tags": [
"owin",
@@ -20,7 +20,7 @@
],
"main": "./lib/edge.js",
"engines": {
"node": ">= 0.8"
"node": ">= 6"
},
"licenses": [
{
6 changes: 3 additions & 3 deletions src/double/Edge.js/project.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": "7.10.1",
"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. This Edge.js NuGet package supports scripting Node.js v7.10.0.",
"copyright": "Copyright 2015 Tomasz Janczuk",
"version": "8.2.1",
"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. This Edge.js NuGet package supports scripting Node.js v8.2.1.",
"copyright": "Copyright 2017 Tomasz Janczuk",
"packOptions": {
"summary": "Script Node.js in a .NET application.",
"projectUrl": "https://github.com/tjanczuk/edge",
3 changes: 2 additions & 1 deletion test/double/double_test/DoubleEdge.cs
Original file line number Diff line number Diff line change
@@ -58,7 +58,8 @@ public void SucceedsCheckingNodeVersion()
}
")(".NET").Result;

Assert.AreEqual(result, "v7.10.0");
System.Console.WriteLine(result);
Assert.AreEqual(result, "v8.2.1");
}

[TestMethod]
2 changes: 1 addition & 1 deletion test/double/double_test/double_test.csproj
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="EdgeJs, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Edge.js.7.10.1\lib\net40\EdgeJs.dll</HintPath>
<HintPath>packages\Edge.js.8.2.1\lib\net40\EdgeJs.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
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="7.10.1" targetFramework="net45" />
<package id="Edge.js" version="8.2.1" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion test/project.json
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
"type": "platform",
"version": "1.0.0"
},
"Edge.js": "7.10.1",
"Edge.js": "8.2.1",
"Edge.js.CSharp": "1.2.0",
"System.Xml.XmlSerializer": "4.0.11",
"System.Xml.ReaderWriter": "4.0.11"
14 changes: 6 additions & 8 deletions test/testall.bat
Original file line number Diff line number Diff line change
@@ -10,15 +10,13 @@ if "%1"=="" set run64=Y
if "%1"=="x64" set run64=Y

if "%run32%"=="Y" (
call "%SELF%\test.bat" ia32 7.10.0
call "%SELF%\test.bat" ia32 6.4.0
call "%SELF%\test.bat" ia32 4.1.1
call "%SELF%\test.bat" ia32 5.1.0
call "%SELF%\test.bat" ia32 8.2.1
call "%SELF%\test.bat" ia32 7.10.1
call "%SELF%\test.bat" ia32 6.11.2
)

if "%run64%"=="Y" (
call "%SELF%\test.bat" x64 7.10.0
call "%SELF%\test.bat" x64 6.4.0
call "%SELF%\test.bat" x64 4.1.1
call "%SELF%\test.bat" x64 5.1.0
call "%SELF%\test.bat" x64 8.2.1
call "%SELF%\test.bat" x64 7.10.1
call "%SELF%\test.bat" x64 6.11.2
)
2 changes: 1 addition & 1 deletion tools/buildall.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
"%~dp0\build.bat" release 4.1.1 5.1.0 6.4.0 7.10.0
"%~dp0\build.bat" release 6.11.2 7.10.1 8.2.1

2 comments on commit 3eb4f4e

@doesdev
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this be getting published to npm?

@crisfervil
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Come on @tjanczuk ! npm publish. It takes 10 seconds!
Thanks!!

Please sign in to comment.