From 4cada5e845be16534b3680125d77db355a5ca2b7 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Fri, 22 Jun 2018 11:29:57 +1000 Subject: [PATCH] prepare for merging to electron --- .gitignore | 1 - .travis.yml | 18 ------------- LICENSE | 20 -------------- appveyor.yml | 24 ----------------- .../LICENSE.chromium | 0 README.md => native_mate/README.md | 0 native_mate/{ => mate}/arguments.cc | 0 native_mate/{ => mate}/arguments.h | 0 native_mate/{ => mate}/constructor.h | 0 native_mate/{ => mate}/converter.cc | 0 native_mate/{ => mate}/converter.h | 0 native_mate/{ => mate}/dictionary.cc | 0 native_mate/{ => mate}/dictionary.h | 0 native_mate/{ => mate}/function_template.cc | 0 native_mate/{ => mate}/function_template.h | 0 native_mate/{ => mate}/handle.h | 0 .../{ => mate}/object_template_builder.cc | 0 .../{ => mate}/object_template_builder.h | 0 .../{ => mate}/persistent_dictionary.cc | 0 .../{ => mate}/persistent_dictionary.h | 0 native_mate/{ => mate}/promise.cc | 0 native_mate/{ => mate}/promise.h | 0 native_mate/{ => mate}/scoped_persistent.h | 0 native_mate/{ => mate}/wrappable.cc | 0 native_mate/{ => mate}/wrappable.h | 0 native_mate/{ => mate}/wrappable_base.h | 0 native_mate/native_mate_files.gypi | 26 ++++++++++++++++++ {script => native_mate/script}/pump.py | 0 native_mate_files.gypi | 26 ------------------ script/cibuild | 27 ------------------- 30 files changed, 26 insertions(+), 116 deletions(-) delete mode 100644 .gitignore delete mode 100644 .travis.yml delete mode 100644 LICENSE delete mode 100644 appveyor.yml rename LICENSE.chromium => native_mate/LICENSE.chromium (100%) rename README.md => native_mate/README.md (100%) rename native_mate/{ => mate}/arguments.cc (100%) rename native_mate/{ => mate}/arguments.h (100%) rename native_mate/{ => mate}/constructor.h (100%) rename native_mate/{ => mate}/converter.cc (100%) rename native_mate/{ => mate}/converter.h (100%) rename native_mate/{ => mate}/dictionary.cc (100%) rename native_mate/{ => mate}/dictionary.h (100%) rename native_mate/{ => mate}/function_template.cc (100%) rename native_mate/{ => mate}/function_template.h (100%) rename native_mate/{ => mate}/handle.h (100%) rename native_mate/{ => mate}/object_template_builder.cc (100%) rename native_mate/{ => mate}/object_template_builder.h (100%) rename native_mate/{ => mate}/persistent_dictionary.cc (100%) rename native_mate/{ => mate}/persistent_dictionary.h (100%) rename native_mate/{ => mate}/promise.cc (100%) rename native_mate/{ => mate}/promise.h (100%) rename native_mate/{ => mate}/scoped_persistent.h (100%) rename native_mate/{ => mate}/wrappable.cc (100%) rename native_mate/{ => mate}/wrappable.h (100%) rename native_mate/{ => mate}/wrappable_base.h (100%) create mode 100644 native_mate/native_mate_files.gypi rename {script => native_mate/script}/pump.py (100%) delete mode 100644 native_mate_files.gypi delete mode 100755 script/cibuild diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1377554ebea6..000000000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ca3cdc93533f..000000000000 --- a/.travis.yml +++ /dev/null @@ -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 diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 5f39f8bd9553..000000000000 --- a/LICENSE +++ /dev/null @@ -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. diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index ddf8088c94a3..000000000000 --- a/appveyor.yml +++ /dev/null @@ -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 diff --git a/LICENSE.chromium b/native_mate/LICENSE.chromium similarity index 100% rename from LICENSE.chromium rename to native_mate/LICENSE.chromium diff --git a/README.md b/native_mate/README.md similarity index 100% rename from README.md rename to native_mate/README.md diff --git a/native_mate/arguments.cc b/native_mate/mate/arguments.cc similarity index 100% rename from native_mate/arguments.cc rename to native_mate/mate/arguments.cc diff --git a/native_mate/arguments.h b/native_mate/mate/arguments.h similarity index 100% rename from native_mate/arguments.h rename to native_mate/mate/arguments.h diff --git a/native_mate/constructor.h b/native_mate/mate/constructor.h similarity index 100% rename from native_mate/constructor.h rename to native_mate/mate/constructor.h diff --git a/native_mate/converter.cc b/native_mate/mate/converter.cc similarity index 100% rename from native_mate/converter.cc rename to native_mate/mate/converter.cc diff --git a/native_mate/converter.h b/native_mate/mate/converter.h similarity index 100% rename from native_mate/converter.h rename to native_mate/mate/converter.h diff --git a/native_mate/dictionary.cc b/native_mate/mate/dictionary.cc similarity index 100% rename from native_mate/dictionary.cc rename to native_mate/mate/dictionary.cc diff --git a/native_mate/dictionary.h b/native_mate/mate/dictionary.h similarity index 100% rename from native_mate/dictionary.h rename to native_mate/mate/dictionary.h diff --git a/native_mate/function_template.cc b/native_mate/mate/function_template.cc similarity index 100% rename from native_mate/function_template.cc rename to native_mate/mate/function_template.cc diff --git a/native_mate/function_template.h b/native_mate/mate/function_template.h similarity index 100% rename from native_mate/function_template.h rename to native_mate/mate/function_template.h diff --git a/native_mate/handle.h b/native_mate/mate/handle.h similarity index 100% rename from native_mate/handle.h rename to native_mate/mate/handle.h diff --git a/native_mate/object_template_builder.cc b/native_mate/mate/object_template_builder.cc similarity index 100% rename from native_mate/object_template_builder.cc rename to native_mate/mate/object_template_builder.cc diff --git a/native_mate/object_template_builder.h b/native_mate/mate/object_template_builder.h similarity index 100% rename from native_mate/object_template_builder.h rename to native_mate/mate/object_template_builder.h diff --git a/native_mate/persistent_dictionary.cc b/native_mate/mate/persistent_dictionary.cc similarity index 100% rename from native_mate/persistent_dictionary.cc rename to native_mate/mate/persistent_dictionary.cc diff --git a/native_mate/persistent_dictionary.h b/native_mate/mate/persistent_dictionary.h similarity index 100% rename from native_mate/persistent_dictionary.h rename to native_mate/mate/persistent_dictionary.h diff --git a/native_mate/promise.cc b/native_mate/mate/promise.cc similarity index 100% rename from native_mate/promise.cc rename to native_mate/mate/promise.cc diff --git a/native_mate/promise.h b/native_mate/mate/promise.h similarity index 100% rename from native_mate/promise.h rename to native_mate/mate/promise.h diff --git a/native_mate/scoped_persistent.h b/native_mate/mate/scoped_persistent.h similarity index 100% rename from native_mate/scoped_persistent.h rename to native_mate/mate/scoped_persistent.h diff --git a/native_mate/wrappable.cc b/native_mate/mate/wrappable.cc similarity index 100% rename from native_mate/wrappable.cc rename to native_mate/mate/wrappable.cc diff --git a/native_mate/wrappable.h b/native_mate/mate/wrappable.h similarity index 100% rename from native_mate/wrappable.h rename to native_mate/mate/wrappable.h diff --git a/native_mate/wrappable_base.h b/native_mate/mate/wrappable_base.h similarity index 100% rename from native_mate/wrappable_base.h rename to native_mate/mate/wrappable_base.h diff --git a/native_mate/native_mate_files.gypi b/native_mate/native_mate_files.gypi new file mode 100644 index 000000000000..6756a5ad1d08 --- /dev/null +++ b/native_mate/native_mate_files.gypi @@ -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', + ], + }, +} diff --git a/script/pump.py b/native_mate/script/pump.py similarity index 100% rename from script/pump.py rename to native_mate/script/pump.py diff --git a/native_mate_files.gypi b/native_mate_files.gypi deleted file mode 100644 index d7e9374971ca..000000000000 --- a/native_mate_files.gypi +++ /dev/null @@ -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', - ], - }, -} diff --git a/script/cibuild b/script/cibuild deleted file mode 100755 index 5370b287fe41..000000000000 --- a/script/cibuild +++ /dev/null @@ -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