prepare for merging to electron
This commit is contained in:
parent
e15ffd96eb
commit
4cada5e845
30 changed files with 26 additions and 116 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1 +0,0 @@
|
||||||
*.swp
|
|
18
.travis.yml
18
.travis.yml
|
@ -1,18 +0,0 @@
|
||||||
notifications:
|
|
||||||
email: false
|
|
||||||
|
|
||||||
language: node_js
|
|
||||||
node_js:
|
|
||||||
- "9.7.0"
|
|
||||||
os:
|
|
||||||
- linux
|
|
||||||
- osx
|
|
||||||
env:
|
|
||||||
- TARGET_ARCH=x64
|
|
||||||
osx_image: xcode9.3
|
|
||||||
|
|
||||||
script: './script/cibuild'
|
|
||||||
|
|
||||||
branches:
|
|
||||||
only:
|
|
||||||
- master
|
|
20
LICENSE
20
LICENSE
|
@ -1,20 +0,0 @@
|
||||||
Copyright (c) 2014 Cheng Zhao.
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining
|
|
||||||
a copy of this software and associated documentation files (the
|
|
||||||
"Software"), to deal in the Software without restriction, including
|
|
||||||
without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
distribute, sublicense, and/or sell copies of the Software, and to
|
|
||||||
permit persons to whom the Software is furnished to do so, subject to
|
|
||||||
the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be
|
|
||||||
included in all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
|
||||||
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
||||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
||||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
24
appveyor.yml
24
appveyor.yml
|
@ -1,24 +0,0 @@
|
||||||
version: "{build}"
|
|
||||||
|
|
||||||
clone_depth: 10
|
|
||||||
|
|
||||||
os: Visual Studio 2017
|
|
||||||
|
|
||||||
init:
|
|
||||||
- git config --global core.autocrlf input
|
|
||||||
|
|
||||||
platform:
|
|
||||||
- x64
|
|
||||||
|
|
||||||
install:
|
|
||||||
- cmd: SET PATH=C:\Program Files (x86)\MSBuild\15.0\bin\;%PATH%
|
|
||||||
- cmd: SET PATH=C:\python27;%PATH%
|
|
||||||
- cmd: bash script/cibuild
|
|
||||||
|
|
||||||
branches:
|
|
||||||
only:
|
|
||||||
- master
|
|
||||||
|
|
||||||
# disable build and test phases
|
|
||||||
build: off
|
|
||||||
test: off
|
|
26
native_mate/native_mate_files.gypi
Normal file
26
native_mate/native_mate_files.gypi
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
{
|
||||||
|
'variables': {
|
||||||
|
'native_mate_files': [
|
||||||
|
'mate/arguments.cc',
|
||||||
|
'mate/arguments.h',
|
||||||
|
'mate/constructor.h',
|
||||||
|
'mate/converter.cc',
|
||||||
|
'mate/converter.h',
|
||||||
|
'mate/dictionary.cc',
|
||||||
|
'mate/dictionary.h',
|
||||||
|
'mate/function_template.cc',
|
||||||
|
'mate/function_template.h',
|
||||||
|
'mate/handle.h',
|
||||||
|
'mate/object_template_builder.cc',
|
||||||
|
'mate/object_template_builder.h',
|
||||||
|
'mate/persistent_dictionary.cc',
|
||||||
|
'mate/persistent_dictionary.h',
|
||||||
|
'mate/scoped_persistent.h',
|
||||||
|
'mate/wrappable.cc',
|
||||||
|
'mate/wrappable.h',
|
||||||
|
'mate/wrappable_base.h',
|
||||||
|
'mate/promise.h',
|
||||||
|
'mate/promise.cc',
|
||||||
|
],
|
||||||
|
},
|
||||||
|
}
|
|
@ -1,26 +0,0 @@
|
||||||
{
|
|
||||||
'variables': {
|
|
||||||
'native_mate_files': [
|
|
||||||
'native_mate/arguments.cc',
|
|
||||||
'native_mate/arguments.h',
|
|
||||||
'native_mate/constructor.h',
|
|
||||||
'native_mate/converter.cc',
|
|
||||||
'native_mate/converter.h',
|
|
||||||
'native_mate/dictionary.cc',
|
|
||||||
'native_mate/dictionary.h',
|
|
||||||
'native_mate/function_template.cc',
|
|
||||||
'native_mate/function_template.h',
|
|
||||||
'native_mate/handle.h',
|
|
||||||
'native_mate/object_template_builder.cc',
|
|
||||||
'native_mate/object_template_builder.h',
|
|
||||||
'native_mate/persistent_dictionary.cc',
|
|
||||||
'native_mate/persistent_dictionary.h',
|
|
||||||
'native_mate/scoped_persistent.h',
|
|
||||||
'native_mate/wrappable.cc',
|
|
||||||
'native_mate/wrappable.h',
|
|
||||||
'native_mate/wrappable_base.h',
|
|
||||||
'native_mate/promise.h',
|
|
||||||
'native_mate/promise.cc',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
}
|
|
|
@ -1,27 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -ex
|
|
||||||
|
|
||||||
# Make cloned repository complete
|
|
||||||
git fetch --unshallow origin HEAD
|
|
||||||
|
|
||||||
# Clone Electron
|
|
||||||
git clone https://github.com/electron/electron --depth 1 --recursive
|
|
||||||
|
|
||||||
# Checkout current native_mate commit into Electron
|
|
||||||
cd electron/vendor/native_mate
|
|
||||||
git fetch ../../..
|
|
||||||
git reset --hard FETCH_HEAD
|
|
||||||
|
|
||||||
# Commit change
|
|
||||||
cd ../..
|
|
||||||
git add vendor/native_mate
|
|
||||||
git config --local user.email "test@github.com"
|
|
||||||
git config --local user.name "Test"
|
|
||||||
git commit --message 'Upgrading native_mate'
|
|
||||||
|
|
||||||
# Bootstrap Electron
|
|
||||||
npm run bootstrap -- --dev
|
|
||||||
|
|
||||||
# Build Electron with native_mate commit
|
|
||||||
npm run build
|
|
Loading…
Reference in a new issue