Skip to content

Commit

Permalink
deps: hack for gyp flaw on windows
Browse files Browse the repository at this point in the history 
See: nodejs/gyp-next#60
  • Loading branch information
@gengjiawen
gengjiawen committed Aug 23, 2020
1 parent 88b199e commit 7b2e7f9
Show file tree
Hide file tree
Showing 36 changed files with 43 additions and 46 deletions.
16 changes: 8 additions & 8 deletions deps/v8/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4152,7 +4152,7 @@ v8_source_set("cppgc_base") {
visibility = [ ":*" ]

sources = [
"include/cppgc/allocation.h",
"include/cppgc/cppgc-allocation.h",
"include/cppgc/common.h",
"include/cppgc/custom-space.h",
"include/cppgc/garbage-collected.h",
Expand All @@ -4179,9 +4179,9 @@ v8_source_set("cppgc_base") {
"include/cppgc/type-traits.h",
"include/cppgc/visitor.h",
"include/v8config.h",
"src/heap/cppgc/allocation.cc",
"src/heap/cppgc/free-list.cc",
"src/heap/cppgc/free-list.h",
"src/heap/cppgc/cppgc-allocation.cc",
"src/heap/cppgc/cppgc-free-list.cc",
"src/heap/cppgc/cppgc-free-list.h",
"src/heap/cppgc/garbage-collector.h",
"src/heap/cppgc/gc-info-table.cc",
"src/heap/cppgc/gc-info-table.h",
Expand All @@ -4201,8 +4201,8 @@ v8_source_set("cppgc_base") {
"src/heap/cppgc/heap-space.cc",
"src/heap/cppgc/heap-space.h",
"src/heap/cppgc/heap-visitor.h",
"src/heap/cppgc/heap.cc",
"src/heap/cppgc/heap.h",
"src/heap/cppgc/cppgc-heap.cc",
"src/heap/cppgc/cppgc-heap.h",
"src/heap/cppgc/liveness-broker.cc",
"src/heap/cppgc/logging.cc",
"src/heap/cppgc/marker.cc",
Expand All @@ -4229,8 +4229,8 @@ v8_source_set("cppgc_base") {
"src/heap/cppgc/source-location.cc",
"src/heap/cppgc/stats-collector.cc",
"src/heap/cppgc/stats-collector.h",
"src/heap/cppgc/sweeper.cc",
"src/heap/cppgc/sweeper.h",
"src/heap/cppgc/cppgc-sweeper.cc",
"src/heap/cppgc/cppgc-sweeper.h",
"src/heap/cppgc/task-handle.h",
"src/heap/cppgc/virtual-memory.cc",
"src/heap/cppgc/virtual-memory.h",
Expand Down
0 deps/v8/include/cppgc/allocation.h → deps/v8/include/cppgc/cppgc-allocation.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc-js/cpp-heap.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "src/base/macros.h"
#include "src/base/platform/time.h"
#include "src/flags/flags.h"
#include "src/heap/cppgc/cppgc-sweeper.h"
#include "src/heap/cppgc/gc-info-table.h"
#include "src/heap/cppgc/heap-base.h"
#include "src/heap/cppgc/heap-object-header-inl.h"
Expand All @@ -18,7 +19,6 @@
#include "src/heap/cppgc/object-allocator.h"
#include "src/heap/cppgc/prefinalizer-handler.h"
#include "src/heap/cppgc/stats-collector.h"
#include "src/heap/cppgc/sweeper.h"
#include "src/heap/marking-worklist.h"
#include "src/heap/sweeper.h"
#include "src/init/v8.h"
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/allocation.cc → deps/v8/src/heap/cppgc/cppgc-allocation.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "include/cppgc/allocation.h"
#include "include/cppgc/cppgc-allocation.h"

#include "src/base/logging.h"
#include "src/base/macros.h"
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/free-list.cc → deps/v8/src/heap/cppgc/cppgc-free-list.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "src/heap/cppgc/free-list.h"
#include "src/heap/cppgc/cppgc-free-list.h"

#include <algorithm>

Expand Down
0 deps/v8/src/heap/cppgc/free-list.h → deps/v8/src/heap/cppgc/cppgc-free-list.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/heap.cc → deps/v8/src/heap/cppgc/cppgc-heap.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "src/heap/cppgc/heap.h"
#include "src/heap/cppgc/cppgc-heap.h"

#include "src/heap/base/stack.h"
#include "src/heap/cppgc/garbage-collector.h"
Expand Down
0 deps/v8/src/heap/cppgc/heap.h → deps/v8/src/heap/cppgc/cppgc-heap.h
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions deps/v8/src/heap/cppgc/sweeper.cc → deps/v8/src/heap/cppgc/cppgc-sweeper.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "src/heap/cppgc/sweeper.h"
#include "src/heap/cppgc/cppgc-sweeper.h"

#include <atomic>
#include <memory>
Expand All @@ -11,7 +11,7 @@
#include "include/cppgc/platform.h"
#include "src/base/optional.h"
#include "src/base/platform/mutex.h"
#include "src/heap/cppgc/free-list.h"
#include "src/heap/cppgc/cppgc-free-list.h"
#include "src/heap/cppgc/globals.h"
#include "src/heap/cppgc/heap-object-header-inl.h"
#include "src/heap/cppgc/heap-object-header.h"
Expand Down
0 deps/v8/src/heap/cppgc/sweeper.h → deps/v8/src/heap/cppgc/cppgc-sweeper.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/garbage-collector.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#ifndef V8_HEAP_CPPGC_GARBAGE_COLLECTOR_H_
#define V8_HEAP_CPPGC_GARBAGE_COLLECTOR_H_

#include "src/heap/cppgc/cppgc-sweeper.h"
#include "src/heap/cppgc/marker.h"
#include "src/heap/cppgc/sweeper.h"

namespace cppgc {
namespace internal {
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/gc-invoker.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <memory>

#include "include/cppgc/platform.h"
#include "src/heap/cppgc/heap.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/task-handle.h"

namespace cppgc {
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/heap-base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
#include "include/cppgc/internal/persistent-node.h"
#include "include/cppgc/macros.h"
#include "src/base/macros.h"
#include "src/heap/cppgc/cppgc-sweeper.h"
#include "src/heap/cppgc/object-allocator.h"
#include "src/heap/cppgc/raw-heap.h"
#include "src/heap/cppgc/sweeper.h"

#if defined(CPPGC_CAGED_HEAP)
#include "src/heap/cppgc/caged-heap.h"
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/heap-growing.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#include "include/cppgc/platform.h"
#include "src/base/macros.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/globals.h"
#include "src/heap/cppgc/heap.h"
#include "src/heap/cppgc/stats-collector.h"
#include "src/heap/cppgc/task-handle.h"

Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/heap-object-header-inl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef V8_HEAP_CPPGC_HEAP_OBJECT_HEADER_INL_H_
#define V8_HEAP_CPPGC_HEAP_OBJECT_HEADER_INL_H_

#include "include/cppgc/allocation.h"
#include "include/cppgc/cppgc-allocation.h"
#include "include/cppgc/internal/gc-info.h"
#include "src/base/atomic-utils.h"
#include "src/base/logging.h"
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/heap-page.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

#include "include/cppgc/internal/api-constants.h"
#include "src/base/logging.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/globals.h"
#include "src/heap/cppgc/heap-object-header-inl.h"
#include "src/heap/cppgc/heap-space.h"
#include "src/heap/cppgc/heap.h"
#include "src/heap/cppgc/object-start-bitmap-inl.h"
#include "src/heap/cppgc/object-start-bitmap.h"
#include "src/heap/cppgc/page-memory-inl.h"
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/heap-space.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "src/base/logging.h"
#include "src/base/macros.h"
#include "src/base/platform/mutex.h"
#include "src/heap/cppgc/free-list.h"
#include "src/heap/cppgc/cppgc-free-list.h"

namespace cppgc {
namespace internal {
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/marker.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
#include "src/heap/cppgc/marker.h"

#include "include/cppgc/internal/process-heap.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/heap-object-header-inl.h"
#include "src/heap/cppgc/heap-page-inl.h"
#include "src/heap/cppgc/heap-visitor.h"
#include "src/heap/cppgc/heap.h"
#include "src/heap/cppgc/marking-visitor.h"
#include "src/heap/cppgc/stats-collector.h"

Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/marking-visitor.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include "src/heap/cppgc/marking-visitor.h"

#include "include/cppgc/garbage-collected.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/heap-object-header-inl.h"
#include "src/heap/cppgc/heap-page-inl.h"
#include "src/heap/cppgc/heap.h"

namespace cppgc {
namespace internal {
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/marking-visitor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include "include/v8config.h"
#include "src/base/macros.h"
#include "src/heap/base/stack.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/globals.h"
#include "src/heap/cppgc/heap.h"
#include "src/heap/cppgc/marker.h"
#include "src/heap/cppgc/visitor.h"

Expand Down
6 changes: 3 additions & 3 deletions deps/v8/src/heap/cppgc/object-allocator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@

#include "src/base/logging.h"
#include "src/base/macros.h"
#include "src/heap/cppgc/free-list.h"
#include "src/heap/cppgc/cppgc-free-list.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/cppgc-sweeper.h"
#include "src/heap/cppgc/globals.h"
#include "src/heap/cppgc/heap-object-header-inl.h"
#include "src/heap/cppgc/heap-object-header.h"
#include "src/heap/cppgc/heap-page.h"
#include "src/heap/cppgc/heap-space.h"
#include "src/heap/cppgc/heap-visitor.h"
#include "src/heap/cppgc/heap.h"
#include "src/heap/cppgc/object-allocator-inl.h"
#include "src/heap/cppgc/object-start-bitmap.h"
#include "src/heap/cppgc/page-memory.h"
#include "src/heap/cppgc/stats-collector.h"
#include "src/heap/cppgc/sweeper.h"

namespace cppgc {
namespace internal {
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/object-allocator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef V8_HEAP_CPPGC_OBJECT_ALLOCATOR_H_
#define V8_HEAP_CPPGC_OBJECT_ALLOCATOR_H_

#include "include/cppgc/allocation.h"
#include "include/cppgc/cppgc-allocation.h"
#include "include/cppgc/internal/gc-info.h"
#include "include/cppgc/macros.h"
#include "src/heap/cppgc/heap-space.h"
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/pointer-policies.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include "include/cppgc/internal/persistent-node.h"
#include "src/base/macros.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/heap-page-inl.h"
#include "src/heap/cppgc/heap.h"

namespace cppgc {
namespace internal {
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/prefinalizer-handler.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include <memory>

#include "src/base/platform/platform.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/heap-page-inl.h"
#include "src/heap/cppgc/heap.h"

namespace cppgc {
namespace internal {
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/heap/cppgc/write-barrier.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
#include "include/cppgc/internal/write-barrier.h"

#include "include/cppgc/internal/pointer-policies.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/globals.h"
#include "src/heap/cppgc/heap-object-header-inl.h"
#include "src/heap/cppgc/heap-object-header.h"
#include "src/heap/cppgc/heap-page-inl.h"
#include "src/heap/cppgc/heap.h"
#include "src/heap/cppgc/marker.h"
#include "src/heap/cppgc/marking-visitor.h"

Expand Down
2 changes: 1 addition & 1 deletion deps/v8/test/unittests/heap/cppgc/concurrent-sweeper-unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "include/cppgc/allocation.h"
#include "include/cppgc/platform.h"
#include "include/v8-platform.h"
#include "src/heap/cppgc/cppgc-sweeper.h"
#include "src/heap/cppgc/globals.h"
#include "src/heap/cppgc/heap-object-header-inl.h"
#include "src/heap/cppgc/heap-page-inl.h"
Expand All @@ -17,7 +18,6 @@
#include "src/heap/cppgc/page-memory-inl.h"
#include "src/heap/cppgc/raw-heap.h"
#include "src/heap/cppgc/stats-collector.h"
#include "src/heap/cppgc/sweeper.h"
#include "test/unittests/heap/cppgc/test-platform.h"
#include "test/unittests/heap/cppgc/tests.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
3 changes: 1 addition & 2 deletions deps/v8/test/unittests/heap/cppgc/free-list-unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "src/heap/cppgc/free-list.h"

#include <memory>
#include <numeric>
#include <vector>

#include "src/base/bits.h"
#include "src/heap/cppgc/cppgc-free-list.h"
#include "src/heap/cppgc/globals.h"
#include "src/heap/cppgc/heap-object-header.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/test/unittests/heap/cppgc/garbage-collected-unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include "include/cppgc/allocation.h"
#include "include/cppgc/type-traits.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/heap-object-header-inl.h"
#include "src/heap/cppgc/heap.h"
#include "test/unittests/heap/cppgc/tests.h"
#include "testing/gtest/include/gtest/gtest.h"

Expand Down
2 changes: 1 addition & 1 deletion deps/v8/test/unittests/heap/cppgc/gc-invoker-unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "src/heap/cppgc/gc-invoker.h"

#include "include/cppgc/platform.h"
#include "src/heap/cppgc/heap.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "testing/gmock/include/gmock/gmock-matchers.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/test/unittests/heap/cppgc/heap-growing-unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "src/heap/cppgc/heap-growing.h"

#include "include/cppgc/platform.h"
#include "src/heap/cppgc/heap.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/stats-collector.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
3 changes: 1 addition & 2 deletions deps/v8/test/unittests/heap/cppgc/heap-unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "src/heap/cppgc/heap.h"

#include <algorithm>
#include <iterator>
#include <numeric>

#include "include/cppgc/allocation.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/globals.h"
#include "test/unittests/heap/cppgc/tests.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/test/unittests/heap/cppgc/persistent-unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "include/cppgc/internal/pointer-policies.h"
#include "include/cppgc/member.h"
#include "include/cppgc/type-traits.h"
#include "src/heap/cppgc/heap.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/visitor.h"
#include "test/unittests/heap/cppgc/tests.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/test/unittests/heap/cppgc/prefinalizer-unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "include/cppgc/allocation.h"
#include "include/cppgc/garbage-collected.h"
#include "include/cppgc/persistent.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/heap-object-header-inl.h"
#include "src/heap/cppgc/heap.h"
#include "test/unittests/heap/cppgc/tests.h"
#include "testing/gtest/include/gtest/gtest.h"

Expand Down
5 changes: 2 additions & 3 deletions deps/v8/test/unittests/heap/cppgc/sweeper-unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "src/heap/cppgc/sweeper.h"

#include <algorithm>

#include "include/cppgc/allocation.h"
#include "include/cppgc/persistent.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "src/heap/cppgc/cppgc-sweeper.h"
#include "src/heap/cppgc/globals.h"
#include "src/heap/cppgc/heap-object-header-inl.h"
#include "src/heap/cppgc/heap-object-header.h"
#include "src/heap/cppgc/heap-page-inl.h"
#include "src/heap/cppgc/heap-visitor.h"
#include "src/heap/cppgc/heap.h"
#include "src/heap/cppgc/page-memory-inl.h"
#include "src/heap/cppgc/page-memory.h"
#include "src/heap/cppgc/stats-collector.h"
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/test/unittests/heap/cppgc/tests.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "include/cppgc/heap.h"
#include "include/cppgc/platform.h"
#include "src/heap/cppgc/heap.h"
#include "src/heap/cppgc/cppgc-heap.h"
#include "test/unittests/heap/cppgc/test-platform.h"
#include "testing/gtest/include/gtest/gtest.h"

Expand Down
Loading

0 comments on commit 7b2e7f9

Please sign in to comment.