diff options
| author | Ben Murdoch <benm@google.com> | 2011-11-30 15:57:28 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:27:08 +0000 |
| commit | 257744e915dfc84d6d07a6b2accf8402d9ffc708 (patch) | |
| tree | 19d8782d5686697f36b1771e7fcd46f290b82c3c /build | |
| parent | 92022043ea907575278de828a5c9cf6939b51e5e (diff) | |
| download | android_external_v8-257744e915dfc84d6d07a6b2accf8402d9ffc708.tar.gz android_external_v8-257744e915dfc84d6d07a6b2accf8402d9ffc708.tar.bz2 android_external_v8-257744e915dfc84d6d07a6b2accf8402d9ffc708.zip | |
Upgrade to V8 3.3
Merge V8 at 3.3.10.39
Simple merge required updates to makefiles only.
Bug: 5688872
Change-Id: I14703f418235f5ce6013b9b3e2e502407a9f6dfd
Diffstat (limited to 'build')
| -rw-r--r-- | build/README.txt | 26 | ||||
| -rw-r--r-- | build/common.gypi | 64 |
2 files changed, 88 insertions, 2 deletions
diff --git a/build/README.txt b/build/README.txt index 7cd7e18b..f6b92558 100644 --- a/build/README.txt +++ b/build/README.txt @@ -5,21 +5,45 @@ This is currently work in progress but this is expected to replace the SCons based build system. To use this a checkout of GYP is needed inside this directory. From the root of -the V8 project do the following +the V8 project do the following: $ svn co http://gyp.googlecode.com/svn/trunk build/gyp To generate Makefiles and build 32-bit version on Linux: +-------------------------------------------------------- $ GYP_DEFINES=target_arch=ia32 build/gyp_v8 $ make To generate Makefiles and build 64-bit version on Linux: +-------------------------------------------------------- $ GYP_DEFINES=target_arch=x64 build/gyp_v8 $ make To generate Makefiles and build for the arm simulator on Linux: +--------------------------------------------------------------- $ build/gyp_v8 -I build/arm.gypi $ make + +To generate Visual Studio solution and project files on Windows: +---------------------------------------------------------------- + +On Windows an additional third party component is required. This is cygwin in +the same version as is used by the Chromium project. This can be checked out +from the Chromium repository. From the root of the V8 project do the following: + +> svn co http://src.chromium.org/svn/trunk/deps/third_party/cygwin@66844 third_party/cygwin + +To run GYP Python is required and it is reccomended to use the same version as +is used by the Chromium project. This can also be checked out from the Chromium +repository. From the root of the V8 project do the following: + +> svn co http://src.chromium.org/svn/trunk/tools/third_party/python_26@70627 third_party/python_26 + +Now generate Visual Studio solution and project files: + +> third_party\python_26\python build/gyp_v8 -D target_arch=ia32 + +Now open build\All.sln in Visual Studio. diff --git a/build/common.gypi b/build/common.gypi index 3b5358e3..19b4dc2c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -77,6 +77,68 @@ }], ], }, - }], + }], # 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"' + ['OS=="win"', { + 'target_defaults': { + 'defines': [ + 'WIN32', + '_CRT_SECURE_NO_DEPRECATE', + '_CRT_NONSTDC_NO_DEPRECATE', + ], + 'conditions': [ + ['component=="static_library"', { + 'defines': [ + '_HAS_EXCEPTIONS=0', + ], + }], + ], + 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], + 'msvs_disabled_warnings': [4355, 4800], + 'msvs_settings': { + 'VCCLCompilerTool': { + 'MinimalRebuild': 'false', + 'BufferSecurityCheck': 'true', + 'EnableFunctionLevelLinking': 'true', + 'RuntimeTypeInfo': 'false', + 'WarningLevel': '3', + 'WarnAsError': 'true', + 'DebugInformationFormat': '3', + 'Detect64BitPortabilityProblems': 'false', + 'conditions': [ + [ 'msvs_multi_core_compile', { + 'AdditionalOptions': ['/MP'], + }], + ['component=="shared_library"', { + 'ExceptionHandling': '1', # /EHsc + }, { + 'ExceptionHandling': '0', + }], + ], + }, + 'VCLibrarianTool': { + 'AdditionalOptions': ['/ignore:4221'], + }, + 'VCLinkerTool': { + 'AdditionalDependencies': [ + 'ws2_32.lib', + ], + 'GenerateDebugInformation': 'true', + 'MapFileName': '$(OutDir)\\$(TargetName).map', + 'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib', + 'FixedBaseAddress': '1', + # LinkIncremental values: + # 0 == default + # 1 == /INCREMENTAL:NO + # 2 == /INCREMENTAL + 'LinkIncremental': '1', + # SubSystem values: + # 0 == not set + # 1 == /SUBSYSTEM:CONSOLE + # 2 == /SUBSYSTEM:WINDOWS + 'SubSystem': '1', + }, + }, + }, + }] ], } |
