Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Install script updates and compile fixes for Linux system without Mono #370

Merged
merged 3 commits into from
Dec 22, 2015
Merged

Install script updates and compile fixes for Linux system without Mono #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9837a01
Compilation fix for Linux w/ no Mono
lstratman Dec 20, 2015
17df1fe
Adding C++ 11 CFLAG to binding.gyp
lstratman Dec 20, 2015
a34e345
Added extra apt-get packages to install scripts
lstratman Dec 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"<!(node -e \"require('nan')\")"
],
'cflags+': [
'-DHAVE_CORECLR'
'-DHAVE_CORECLR -std=c++11'
],
'xcode_settings': {
'OTHER_CFLAGS': [
Expand All @@ -48,6 +48,9 @@
'src/CoreCLREmbedding/coreclrnodejsfuncinvokecontext.cpp',
'src/common/utils.cpp'
]
},
{
'type': 'none'
}
]
]
Expand All @@ -67,6 +70,9 @@
'src/CoreCLREmbedding/coreclrnodejsfuncinvokecontext.cpp',
'src/common/utils.cpp'
]
},
{
'type': 'none'
}
]
]
Expand Down Expand Up @@ -129,7 +135,7 @@
"<!(node -e \"require('nan')\")"
],
'cflags+': [
'-DHAVE_NATIVECLR'
'-DHAVE_NATIVECLR -std=c++11'
],
'xcode_settings': {
'OTHER_CFLAGS': [
Expand Down Expand Up @@ -180,6 +186,9 @@
'<!@(pkg-config mono-2 --libs)'
],
}
},
{
'type': 'none'
}
]
]
Expand Down
2 changes: 1 addition & 1 deletion lib/edge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var fs = require('fs')
, path = require('path')
, builtEdge = path.resolve(__dirname, '../build/Release/' + (process.env.EDGE_USE_CORECLR ? 'edge_coreclr.node' : 'edge_nativeclr.node'))
, builtEdge = path.resolve(__dirname, '../build/Release/' + (process.env.EDGE_USE_CORECLR || !fs.existsSync(path.resolve(__dirname, '../build/Release/edge_nativeclr.node')) ? 'edge_coreclr.node' : 'edge_nativeclr.node'))
, edge;

var versionMap = [
Expand Down
2 changes: 1 addition & 1 deletion tools/debian_wheezy_clean_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ then
apt-get update
fi

apt-get -y install curl g++ pkg-config libgdiplus libunwind8 libssl-dev unzip make mono-complete git
apt-get -y install curl g++ pkg-config libgdiplus libunwind8 libssl-dev unzip make mono-complete git gettext libssl-dev libcurl4-openssl-dev zlib1g libicu-dev uuid-dev

# download and build Node.js

Expand Down
2 changes: 1 addition & 1 deletion tools/ubuntu_12.04_clean_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ then
apt-get update
fi

apt-get -y install curl g++ pkg-config libgdiplus libunwind8 libssl-dev unzip make mono-complete git
apt-get -y install curl g++ pkg-config libgdiplus libunwind8 libssl-dev make mono-complete gettext libssl-dev libcurl4-openssl-dev zlib1g libicu-dev uuid-dev unzip

# download and build Node.js

Expand Down