Index: tools/gyp/v8.gyp |
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp |
index be9fb3ee8d2f0175b269feefe5215e9931034972..c455c1f33dd473d4560d326253118a4abdac70bc 100644 |
--- a/tools/gyp/v8.gyp |
+++ b/tools/gyp/v8.gyp |
@@ -387,8 +387,6 @@ |
'../../src/cpu-profiler-inl.h', |
'../../src/cpu-profiler.cc', |
'../../src/cpu-profiler.h', |
- '../../src/cpu.cc', |
- '../../src/cpu.h', |
'../../src/data-flow.cc', |
'../../src/data-flow.h', |
'../../src/date.cc', |
@@ -579,16 +577,6 @@ |
'../../src/ostreams.h', |
'../../src/parser.cc', |
'../../src/parser.h', |
- '../../src/platform/elapsed-timer.h', |
- '../../src/platform/time.cc', |
- '../../src/platform/time.h', |
- '../../src/platform.h', |
- '../../src/platform/condition-variable.cc', |
- '../../src/platform/condition-variable.h', |
- '../../src/platform/mutex.cc', |
- '../../src/platform/mutex.h', |
- '../../src/platform/semaphore.cc', |
- '../../src/platform/semaphore.h', |
'../../src/preparse-data-format.h', |
'../../src/preparse-data.cc', |
'../../src/preparse-data.h', |
@@ -674,11 +662,8 @@ |
'../../src/utils-inl.h', |
'../../src/utils.cc', |
'../../src/utils.h', |
- '../../src/utils/random-number-generator.cc', |
- '../../src/utils/random-number-generator.h', |
'../../src/v8.cc', |
'../../src/v8.h', |
- '../../src/v8checks.h', |
'../../src/v8memory.h', |
'../../src/v8threads.cc', |
'../../src/v8threads.h', |
@@ -917,30 +902,139 @@ |
] |
}], |
], |
+ }, |
+ } |
+ ], |
+ ['OS=="win"', { |
+ 'variables': { |
+ 'gyp_generators': '<!(echo $GYP_GENERATORS)', |
+ }, |
+ 'msvs_disabled_warnings': [4351, 4355, 4800], |
+ }], |
+ ['component=="shared_library"', { |
+ 'defines': [ |
+ 'BUILDING_V8_SHARED', |
+ 'V8_SHARED', |
+ ], |
+ }], |
+ ['v8_postmortem_support=="true"', { |
+ 'sources': [ |
+ '<(SHARED_INTERMEDIATE_DIR)/debug-support.cc', |
+ ] |
+ }], |
+ ['v8_enable_i18n_support==1', { |
+ 'dependencies': [ |
+ '<(icu_gyp_path):icui18n', |
+ '<(icu_gyp_path):icuuc', |
+ ] |
+ }, { # v8_enable_i18n_support==0 |
+ 'sources!': [ |
+ '../../src/i18n.cc', |
+ '../../src/i18n.h', |
+ ], |
+ }], |
+ ['OS=="win" and v8_enable_i18n_support==1', { |
+ 'dependencies': [ |
+ '<(icu_gyp_path):icudata', |
+ ], |
+ }], |
+ ['icu_use_data_file_flag==1', { |
+ 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'], |
+ }, { # else icu_use_data_file_flag !=1 |
+ 'conditions': [ |
+ ['OS=="win"', { |
+ 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'], |
+ }, { |
+ 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'], |
+ }], |
+ ], |
+ }], |
+ ], |
+ }, |
+ { |
+ 'target_name': 'v8_libbase', |
+ 'type': 'static_library', |
+ 'variables': { |
+ 'optimize': 'max', |
+ }, |
+ 'include_dirs+': [ |
+ '../..', |
+ ], |
+ 'sources': [ |
+ '../../src/base/atomicops.h', |
+ '../../src/base/atomicops_internals_arm64_gcc.h', |
+ '../../src/base/atomicops_internals_arm_gcc.h', |
+ '../../src/base/atomicops_internals_atomicword_compat.h', |
+ '../../src/base/atomicops_internals_mac.h', |
+ '../../src/base/atomicops_internals_mips_gcc.h', |
+ '../../src/base/atomicops_internals_tsan.h', |
+ '../../src/base/atomicops_internals_x86_gcc.cc', |
+ '../../src/base/atomicops_internals_x86_gcc.h', |
+ '../../src/base/atomicops_internals_x86_msvc.h', |
+ '../../src/base/build_config.h', |
+ '../../src/base/cpu.cc', |
+ '../../src/base/cpu.h', |
+ '../../src/base/lazy-instance.h', |
+ '../../src/base/logging.cc', |
+ '../../src/base/logging.h', |
+ '../../src/base/macros.h', |
+ '../../src/base/once.cc', |
+ '../../src/base/once.h', |
+ '../../src/base/platform/elapsed-timer.h', |
+ '../../src/base/platform/time.cc', |
+ '../../src/base/platform/time.h', |
+ '../../src/base/platform/condition-variable.cc', |
+ '../../src/base/platform/condition-variable.h', |
+ '../../src/base/platform/mutex.cc', |
+ '../../src/base/platform/mutex.h', |
+ '../../src/base/platform/platform.h', |
+ '../../src/base/platform/semaphore.cc', |
+ '../../src/base/platform/semaphore.h', |
+ '../../src/base/safe_conversions.h', |
+ '../../src/base/safe_conversions_impl.h', |
+ '../../src/base/safe_math.h', |
+ '../../src/base/safe_math_impl.h', |
+ '../../src/base/utils/random-number-generator.cc', |
+ '../../src/base/utils/random-number-generator.h', |
+ ], |
+ 'conditions': [ |
+ ['want_separate_host_toolset==1', { |
+ 'toolsets': ['host', 'target'], |
+ }, { |
+ 'toolsets': ['target'], |
+ }], |
+ ['component=="shared_library"', { |
+ 'defines': [ |
+ 'BUILDING_V8_SHARED', |
+ 'V8_SHARED', |
+ ], |
+ }], |
+ ['OS=="linux"', { |
+ 'link_settings': { |
'libraries': [ |
'-lrt' |
] |
}, |
- 'sources': [ ### gcmole(os:linux) ### |
- '../../src/platform-linux.cc', |
- '../../src/platform-posix.cc' |
+ 'sources': [ |
+ '../../src/base/platform/platform-linux.cc', |
+ '../../src/base/platform/platform-posix.cc' |
], |
} |
], |
['OS=="android"', { |
'sources': [ |
- '../../src/platform-posix.cc' |
+ '../../src/base/platform/platform-posix.cc' |
], |
'conditions': [ |
['host_os=="mac"', { |
'target_conditions': [ |
['_toolset=="host"', { |
'sources': [ |
- '../../src/platform-macos.cc' |
+ '../../src/base/platform/platform-macos.cc' |
] |
}, { |
'sources': [ |
- '../../src/platform-linux.cc' |
+ '../../src/base/platform/platform-linux.cc' |
] |
}], |
], |
@@ -968,7 +1062,7 @@ |
}], |
], |
'sources': [ |
- '../../src/platform-linux.cc' |
+ '../../src/base/platform/platform-linux.cc' |
] |
}], |
], |
@@ -990,22 +1084,23 @@ |
], |
}, |
'sources': [ |
- '../../src/platform-posix.cc', |
+ '../../src/base/platform/platform-posix.cc', |
+ '../../src/base/qnx-math.h', |
], |
'target_conditions': [ |
['_toolset=="host" and host_os=="linux"', { |
'sources': [ |
- '../../src/platform-linux.cc' |
+ '../../src/base/platform/platform-linux.cc' |
], |
}], |
['_toolset=="host" and host_os=="mac"', { |
'sources': [ |
- '../../src/platform-macos.cc' |
+ '../../src/base/platform/platform-macos.cc' |
], |
}], |
['_toolset=="target"', { |
'sources': [ |
- '../../src/platform-qnx.cc' |
+ '../../src/base/platform/platform-qnx.cc' |
], |
}], |
], |
@@ -1017,8 +1112,8 @@ |
'-L/usr/local/lib -lexecinfo', |
]}, |
'sources': [ |
- '../../src/platform-freebsd.cc', |
- '../../src/platform-posix.cc' |
+ '../../src/base/platform/platform-freebsd.cc', |
+ '../../src/base/platform/platform-posix.cc' |
], |
} |
], |
@@ -1028,8 +1123,8 @@ |
'-L/usr/local/lib -lexecinfo', |
]}, |
'sources': [ |
- '../../src/platform-openbsd.cc', |
- '../../src/platform-posix.cc' |
+ '../../src/base/platform/platform-openbsd.cc', |
+ '../../src/base/platform/platform-posix.cc' |
], |
} |
], |
@@ -1039,8 +1134,8 @@ |
'-L/usr/pkg/lib -Wl,-R/usr/pkg/lib -lexecinfo', |
]}, |
'sources': [ |
- '../../src/platform-openbsd.cc', |
- '../../src/platform-posix.cc' |
+ '../../src/base/platform/platform-openbsd.cc', |
+ '../../src/base/platform/platform-posix.cc' |
], |
} |
], |
@@ -1050,15 +1145,15 @@ |
'-lnsl', |
]}, |
'sources': [ |
- '../../src/platform-solaris.cc', |
- '../../src/platform-posix.cc' |
+ '../../src/base/platform/platform-solaris.cc', |
+ '../../src/base/platform/platform-posix.cc' |
], |
} |
], |
['OS=="mac"', { |
'sources': [ |
- '../../src/platform-macos.cc', |
- '../../src/platform-posix.cc' |
+ '../../src/base/platform/platform-macos.cc', |
+ '../../src/base/platform/platform-posix.cc' |
]}, |
], |
['OS=="win"', { |
@@ -1076,14 +1171,15 @@ |
'conditions': [ |
['build_env=="Cygwin"', { |
'sources': [ |
- '../../src/platform-cygwin.cc', |
- '../../src/platform-posix.cc' |
+ '../../src/base/platform/platform-cygwin.cc', |
+ '../../src/base/platform/platform-posix.cc' |
], |
}, { |
'sources': [ |
- '../../src/platform-win32.cc', |
- '../../src/win32-math.cc', |
- '../../src/win32-math.h' |
+ '../../src/base/platform/platform-win32.cc', |
+ '../../src/base/win32-headers.h', |
+ '../../src/base/win32-math.cc', |
+ '../../src/base/win32-math.h' |
], |
}], |
], |
@@ -1092,9 +1188,10 @@ |
}, |
}, { |
'sources': [ |
- '../../src/platform-win32.cc', |
- '../../src/win32-math.cc', |
- '../../src/win32-math.h' |
+ '../../src/base/platform/platform-win32.cc', |
+ '../../src/base/win32-headers.h', |
+ '../../src/base/win32-math.cc', |
+ '../../src/base/win32-math.h' |
], |
'msvs_disabled_warnings': [4351, 4355, 4800], |
'link_settings': { |
@@ -1109,83 +1206,6 @@ |
'V8_SHARED', |
], |
}], |
- ['v8_postmortem_support=="true"', { |
- 'sources': [ |
- '<(SHARED_INTERMEDIATE_DIR)/debug-support.cc', |
- ] |
- }], |
- ['v8_enable_i18n_support==1', { |
- 'dependencies': [ |
- '<(icu_gyp_path):icui18n', |
- '<(icu_gyp_path):icuuc', |
- ] |
- }, { # v8_enable_i18n_support==0 |
- 'sources!': [ |
- '../../src/i18n.cc', |
- '../../src/i18n.h', |
- ], |
- }], |
- ['OS=="win" and v8_enable_i18n_support==1', { |
- 'dependencies': [ |
- '<(icu_gyp_path):icudata', |
- ], |
- }], |
- ['icu_use_data_file_flag==1', { |
- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'], |
- }, { # else icu_use_data_file_flag !=1 |
- 'conditions': [ |
- ['OS=="win"', { |
- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'], |
- }, { |
- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'], |
- }], |
- ], |
- }], |
- ], |
- }, |
- { |
- 'target_name': 'v8_libbase', |
- 'type': 'static_library', |
- 'variables': { |
- 'optimize': 'max', |
- }, |
- 'include_dirs+': [ |
- '../..', |
- ], |
- 'sources': [ |
- '../../src/base/atomicops.h', |
- '../../src/base/atomicops_internals_arm64_gcc.h', |
- '../../src/base/atomicops_internals_arm_gcc.h', |
- '../../src/base/atomicops_internals_atomicword_compat.h', |
- '../../src/base/atomicops_internals_mac.h', |
- '../../src/base/atomicops_internals_mips_gcc.h', |
- '../../src/base/atomicops_internals_tsan.h', |
- '../../src/base/atomicops_internals_x86_gcc.cc', |
- '../../src/base/atomicops_internals_x86_gcc.h', |
- '../../src/base/atomicops_internals_x86_msvc.h', |
- '../../src/base/build_config.h', |
- '../../src/base/lazy-instance.h', |
- '../../src/base/macros.h', |
- '../../src/base/once.cc', |
- '../../src/base/once.h', |
- '../../src/base/safe_conversions.h', |
- '../../src/base/safe_conversions_impl.h', |
- '../../src/base/safe_math.h', |
- '../../src/base/safe_math_impl.h', |
- '../../src/base/win32-headers.h', |
- ], |
- 'conditions': [ |
- ['want_separate_host_toolset==1', { |
- 'toolsets': ['host', 'target'], |
- }, { |
- 'toolsets': ['target'], |
- }], |
- ['component=="shared_library"', { |
- 'defines': [ |
- 'BUILDING_V8_SHARED', |
- 'V8_SHARED', |
- ], |
- }], |
], |
}, |
{ |