Reviewers: Jakob,
Description:
Unbreak "os" stuff in shared d8 builds.
Note that "os" still has no properties on Windows, but at least it's there.
BUG=v8:3407
LOG=y
Please review this at https://codereview.chromium.org/356843005/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+10, -20 lines):
M src/d8.cc
M src/d8.gyp
M src/d8-posix.cc
M src/d8-windows.cc
Index: src/d8-posix.cc
diff --git a/src/d8-posix.cc b/src/d8-posix.cc
index
fc56123c5b93d73a4c4f4dd45b69e511929e3d35..177748b48697449bc5bc4192499f0afea1dc89e3
100644
--- a/src/d8-posix.cc
+++ b/src/d8-posix.cc
@@ -2,22 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-
#include <errno.h>
#include <fcntl.h>
-#include <signal.h>
#include <stdlib.h>
+#include <string.h>
+#include <sys/select.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <time.h>
#include <unistd.h>
-
#include "src/d8.h"
-#include "src/d8-debug.h"
-#include "src/debug.h"
namespace v8 {
Index: src/d8-windows.cc
diff --git a/src/d8-windows.cc b/src/d8-windows.cc
index
8fc4ad275a8ed27ec188d39fd047820c2473020b..06c0a4e87d6c5dc1c6d2fc83f37f2cdc6633eb08
100644
--- a/src/d8-windows.cc
+++ b/src/d8-windows.cc
@@ -2,11 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-
-#include "src/api.h"
#include "src/d8.h"
-#include "src/d8-debug.h"
-#include "src/debug.h"
namespace v8 {
Index: src/d8.cc
diff --git a/src/d8.cc b/src/d8.cc
index
1718fbd228707c861d5b7cedd61634cc80395343..c8a80390bb6957a7417d7e0c1d2dc63cdac694fe
100644
--- a/src/d8.cc
+++ b/src/d8.cc
@@ -872,11 +872,9 @@ Handle<ObjectTemplate>
Shell::CreateGlobalTemplate(Isolate* isolate) {
performance_template);
#endif // !V8_SHARED
-#if !defined(V8_SHARED) && !defined(_WIN32) && !defined(_WIN64)
Handle<ObjectTemplate> os_templ = ObjectTemplate::New(isolate);
AddOSMethods(isolate, os_templ);
global_template->Set(String::NewFromUtf8(isolate, "os"), os_templ);
-#endif // !V8_SHARED && !_WIN32 && !_WIN64
return global_template;
}
Index: src/d8.gyp
diff --git a/src/d8.gyp b/src/d8.gyp
index
b353eb01369714187781970a371c15fb5cd44fc6..908a29f6ba71d33e528500b93fe116fea330aadc
100644
--- a/src/d8.gyp
+++ b/src/d8.gyp
@@ -57,6 +57,14 @@
'libraries': [ '-lreadline', ],
'sources': [ 'd8-readline.cc' ],
}],
+ ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
+ or OS=="openbsd" or OS=="solaris" or OS=="android" \
+ or OS=="qnx")', {
+ 'sources': [ 'd8-posix.cc', ]
+ }],
+ [ 'OS=="win"', {
+ 'sources': [ 'd8-windows.cc', ]
+ }],
[ 'component!="shared_library"', {
'sources':
[ 'd8-debug.cc', '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc', ],
'conditions': [
@@ -69,14 +77,6 @@
'd8_js2c',
],
}],
- ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
- or OS=="openbsd" or OS=="solaris" or OS=="android" \
- or OS=="qnx")', {
- 'sources': [ 'd8-posix.cc', ]
- }],
- [ 'OS=="win"', {
- 'sources': [ 'd8-windows.cc', ]
- }],
],
}],
['v8_enable_vtunejit==1', {
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
