Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: src/d8.cc

Issue 356843005: Unbreak "os" stuff in shared d8 builds. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | src/d8.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 5
6 // Defined when linking against shared lib on Windows. 6 // Defined when linking against shared lib on Windows.
7 #if defined(USING_V8_SHARED) && !defined(V8_SHARED) 7 #if defined(USING_V8_SHARED) && !defined(V8_SHARED)
8 #define V8_SHARED 8 #define V8_SHARED
9 #endif 9 #endif
10 10
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 global_template->Set(String::NewFromUtf8(isolate, "Realm"), realm_template); 865 global_template->Set(String::NewFromUtf8(isolate, "Realm"), realm_template);
866 866
867 #ifndef V8_SHARED 867 #ifndef V8_SHARED
868 Handle<ObjectTemplate> performance_template = ObjectTemplate::New(isolate); 868 Handle<ObjectTemplate> performance_template = ObjectTemplate::New(isolate);
869 performance_template->Set(String::NewFromUtf8(isolate, "now"), 869 performance_template->Set(String::NewFromUtf8(isolate, "now"),
870 FunctionTemplate::New(isolate, PerformanceNow)); 870 FunctionTemplate::New(isolate, PerformanceNow));
871 global_template->Set(String::NewFromUtf8(isolate, "performance"), 871 global_template->Set(String::NewFromUtf8(isolate, "performance"),
872 performance_template); 872 performance_template);
873 #endif // !V8_SHARED 873 #endif // !V8_SHARED
874 874
875 #if !defined(V8_SHARED) && !defined(_WIN32) && !defined(_WIN64)
876 Handle<ObjectTemplate> os_templ = ObjectTemplate::New(isolate); 875 Handle<ObjectTemplate> os_templ = ObjectTemplate::New(isolate);
877 AddOSMethods(isolate, os_templ); 876 AddOSMethods(isolate, os_templ);
878 global_template->Set(String::NewFromUtf8(isolate, "os"), os_templ); 877 global_template->Set(String::NewFromUtf8(isolate, "os"), os_templ);
879 #endif // !V8_SHARED && !_WIN32 && !_WIN64
880 878
881 return global_template; 879 return global_template;
882 } 880 }
883 881
884 882
885 void Shell::Initialize(Isolate* isolate) { 883 void Shell::Initialize(Isolate* isolate) {
886 #ifdef COMPRESS_STARTUP_DATA_BZ2 884 #ifdef COMPRESS_STARTUP_DATA_BZ2
887 BZip2Decompressor startup_data_decompressor; 885 BZip2Decompressor startup_data_decompressor;
888 int bz2_result = startup_data_decompressor.Decompress(); 886 int bz2_result = startup_data_decompressor.Decompress();
889 if (bz2_result != BZ_OK) { 887 if (bz2_result != BZ_OK) {
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after
1633 } 1631 }
1634 1632
1635 } // namespace v8 1633 } // namespace v8
1636 1634
1637 1635
1638 #ifndef GOOGLE3 1636 #ifndef GOOGLE3
1639 int main(int argc, char* argv[]) { 1637 int main(int argc, char* argv[]) {
1640 return v8::Shell::Main(argc, argv); 1638 return v8::Shell::Main(argc, argv);
1641 } 1639 }
1642 #endif 1640 #endif
OLDNEW
« no previous file with comments | « no previous file | src/d8.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698