Skip to content
Snippets Groups Projects
Commit f25f5051 authored by murgatroid99's avatar murgatroid99
Browse files

Build for more versions of electron, restrict when a Windows warning is shown

parent 32acefcb
No related branches found
No related tags found
No related merge requests found
...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
}, },
] ]
}], }],
['OS == "win"', { ['OS == "win" and runtime!="electron"', {
'targets': [ 'targets': [
{ {
# IMPORTANT WINDOWS BUILD INFORMATION # IMPORTANT WINDOWS BUILD INFORMATION
...@@ -518,6 +518,8 @@ ...@@ -518,6 +518,8 @@
# when including the Node headers. The remedy for this is to remove # when including the Node headers. The remedy for this is to remove
# the OpenSSL headers, from the downloaded Node development package, # the OpenSSL headers, from the downloaded Node development package,
# which is typically located in `.node-gyp` in your home directory. # which is typically located in `.node-gyp` in your home directory.
#
# This is not true of Electron, which does not have OpenSSL headers.
'target_name': 'WINDOWS_BUILD_WARNING', 'target_name': 'WINDOWS_BUILD_WARNING',
'rules': [ 'rules': [
{ {
......
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
% endfor % endfor
] ]
}], }],
['OS == "win"', { ['OS == "win" and runtime!="electron"', {
'targets': [ 'targets': [
{ {
# IMPORTANT WINDOWS BUILD INFORMATION # IMPORTANT WINDOWS BUILD INFORMATION
...@@ -216,6 +216,8 @@ ...@@ -216,6 +216,8 @@
# when including the Node headers. The remedy for this is to remove # when including the Node headers. The remedy for this is to remove
# the OpenSSL headers, from the downloaded Node development package, # the OpenSSL headers, from the downloaded Node development package,
# which is typically located in `.node-gyp` in your home directory. # which is typically located in `.node-gyp` in your home directory.
#
# This is not true of Electron, which does not have OpenSSL headers.
'target_name': 'WINDOWS_BUILD_WARNING', 'target_name': 'WINDOWS_BUILD_WARNING',
'rules': [ 'rules': [
{ {
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
set node_versions=4.0.0 5.0.0 6.0.0 7.0.0 set node_versions=4.0.0 5.0.0 6.0.0 7.0.0
set electron_versions=1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 set electron_versions=1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0
set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm
......
...@@ -44,7 +44,7 @@ npm update ...@@ -44,7 +44,7 @@ npm update
node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 ) node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 )
electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 ) electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 )
for version in ${node_versions[@]} for version in ${node_versions[@]}
do do
......
...@@ -429,7 +429,7 @@ class NodeLanguage(object): ...@@ -429,7 +429,7 @@ class NodeLanguage(object):
# we should specify in the compiler argument # we should specify in the compiler argument
_check_compiler(self.args.compiler, ['default', 'node0.12', _check_compiler(self.args.compiler, ['default', 'node0.12',
'node4', 'node5', 'node6', 'node4', 'node5', 'node6',
'node7', 'electron1.3']) 'node7', 'electron1.3', 'electron1.6'])
if args.iomgr_platform == "uv": if args.iomgr_platform == "uv":
self.use_uv = True self.use_uv = True
else: else:
...@@ -1178,7 +1178,7 @@ argp.add_argument('--compiler', ...@@ -1178,7 +1178,7 @@ argp.add_argument('--compiler',
'vs2013', 'vs2015', 'vs2013', 'vs2015',
'python2.7', 'python3.4', 'python3.5', 'python3.6', 'pypy', 'pypy3', 'python_alpine', 'python2.7', 'python3.4', 'python3.5', 'python3.6', 'pypy', 'pypy3', 'python_alpine',
'node0.12', 'node4', 'node5', 'node6', 'node7', 'node0.12', 'node4', 'node5', 'node6', 'node7',
'electron1.3', 'electron1.3', 'electron1.6',
'coreclr', 'coreclr',
'cmake'], 'cmake'],
default='default', default='default',
......
...@@ -287,7 +287,8 @@ def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS) ...@@ -287,7 +287,8 @@ def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS)
configs=['dbg'], configs=['dbg'],
platforms=['linux'], platforms=['linux'],
arch='default', arch='default',
compiler='electron1.3', compiler='electron1.6',
iomgr_platform='uv',
labels=['portability'], labels=['portability'],
extra_args=extra_args, extra_args=extra_args,
inner_jobs=inner_jobs) inner_jobs=inner_jobs)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment