Граф коммитов

6299 Коммитов

Автор SHA1 Сообщение Дата
maruel@google.com ae4f4e223e Disable warning 4355 on Windows builds: "'this' : used in base member initializer list".
git-svn-id: http://src.chromium.org/svn/trunk/src/build@1100 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-20 19:54:12 +00:00
erg@google.com 3f66425ff4 Get JSConfig and JavaScriptCore/libWTF.a building under linux.
- Mainly separating out windows options into env['PLATFROM'] sections.
- Fix for case sensitive filesystems.

git-svn-id: http://src.chromium.org/svn/trunk/src/build@1064 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-19 22:47:45 +00:00
sgk@google.com 216ed56612 Add renderer\external_host_bindings.cc to the SCons build.
TBR: joshia

git-svn-id: http://src.chromium.org/svn/trunk/src/build@1043 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-19 18:02:13 +00:00
mmentovai@google.com 7aa570c14c Add googleurl.xcodeproj.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@1006 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-18 23:01:45 +00:00
maruel@google.com 76fe1204c4 Remove /Wp64 compiler flag as it gets in the way of the porting effort. This is not substitute to porting to x64.
BUG=1308991

git-svn-id: http://src.chromium.org/svn/trunk/src/build@995 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-18 21:15:54 +00:00
mmentovai@google.com 9c7822e327 Add more useful settings to the xcconfigs.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@988 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-18 20:16:00 +00:00
mmentovai@google.com 050eb8447e Use a common directory for all build output on the Mac.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@987 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-18 18:10:23 +00:00
deanm@google.com b96060ff32 Add a COVERAGE=1 argument to the Linux scons build. This compiles the object files with support for gcov.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@983 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-18 13:22:29 +00:00
mmentovai@google.com 606a00436e Move all settings except for the ones that really need to be per-target into
xcconfig files, which we can use on many project files.

git-svn-id: http://src.chromium.org/svn/trunk/src/build@947 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-15 17:43:22 +00:00
tc@google.com 5c0b1011dd Get googleurl and net to build on linux so we can parallelize even more. This builds an empty net_unittests.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@915 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-15 00:05:39 +00:00
sgk@google.com a1989c4ffc Call an external command on Windows (xcopy) to install .lib files into
our library directory.

This works around some weird Windows? Python?  SCons? threading race
condition where a file copied by Python code in one thread sometimes
prevents it from being opened by an external command spawned in another
thread (specifically the linker, leading an 1104 error), despite the
fact that the copy has concluded.

git-svn-id: http://src.chromium.org/svn/trunk/src/build@905 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-14 22:53:00 +00:00
tc@google.com 0d736699ab Add skia and our png wrappers. png_codec_unittest and image_operations_unittest pass. This gives us 70 passing unittests.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@878 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-14 19:45:07 +00:00
deanm@google.com 2480fda82d Detect linux with '__linux__' since 'linux' is not defined with -ansi.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@864 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-14 11:21:28 +00:00
deanm@google.com 04cd61d31f Implement nspr time on Linux.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@863 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-14 11:17:51 +00:00
tc@google.com 0f4a7703c4 Add a helper method to SConscript.main for adding .pdb files to the
output target of .exe files on Windows.  Change all the callers to
only pass in the basename of the target (e.g., 'base_unittests').
The only exception is chrome.exe which uses chrome_exe.pdb.

This lets us remove a "if env['PLATFORM'] == 'win32'" condition from
base/SConscript and these other files going forward.


git-svn-id: http://src.chromium.org/svn/trunk/src/build@836 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-13 22:53:51 +00:00
tc@google.com c038705ab2 Allow MSVC to be on a different drive letter than the source code.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@832 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-13 22:01:49 +00:00
evanm@google.com 1c190a77b5 Pull in some environment flags that affect distcc.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@827 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-13 21:21:53 +00:00
rahulk@google.com 8cb7e21133 Adding preprocessor definitions to separate Google Chrome from Chromium.
- I assume we will need to build Debug version also for Google Chrome.
- Code changes will come soon that will rely on GOOGLE_CHROME_BUILD being defined to add Google branding.
- Currently I do not want to change the default behavior so it is inhreiting chromium_build_google_chrome.vsprops. Once buildbot scripts have been configured properly and we know what to do for developers machines, we will inherit chromium_build$CHROMIUM_BUILD.vsprops

BUG=1296800


git-svn-id: http://src.chromium.org/svn/trunk/src/build@809 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-13 15:56:35 +00:00
evanm@google.com 1b816194d1 Parse /proc/cpuinfo to guess the number of available CPUs.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@768 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-13 01:13:04 +00:00
evanm@google.com afc3ddef7b Last changes to get Linux unit tests building:
Some minor SConscript changes.  Removed the obsolete .linux file.



git-svn-id: http://src.chromium.org/svn/trunk/src/build@758 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-12 22:42:01 +00:00
mmoss@google.com bf352d4f8e Make breakpad handler compile on Linux.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@754 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-12 22:40:32 +00:00
sgk@google.com 20f41783e7 Get rid of separate SConscript.main.linux:
* Set -j default to %NUMBER_OF_PROCESSORS% + 1 only on Windows.
* Initialize LOAD= modules up front, and let Linux override to the subset that are currently building.
* Initialize Linux CCFLAGS, LINKFLAGS and LIBS in a separate if-clause (like we do for Windows).
* Remove SCONSCRIPT_MAIN code in {base,chrome}/SConstruct in favor of just call ../build/SConscript.main.
* Merge in evanm's changes to base/SConscript for separate lists of platform-neutral and platform-specific source files and test files.
R=evanm,deanm

git-svn-id: http://src.chromium.org/svn/trunk/src/build@727 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-12 18:09:13 +00:00
sgk@google.com 359f71d771 SCons build updates:
* Add base\file_util_linux.cc.
* Add unit tests base\{idletimer,string_escape}_unittest.cc.
* Add chrome\browser\views\hwnd_html_view.cc.
* Add chrome\browser\tabs\tab_dragging_test.cc.
* Add chrome\browser\views\bookmark_bar_view_test.cc
* Add chrome\test\ui\view_event_test_base.cc.
* Only define on Windows build of base:  _Win32_WINNT=0x0600, WINVER=0x0600, _HAS_EXCEPTIONS=0.
TBR: bradnelson

git-svn-id: http://src.chromium.org/svn/trunk/src/build@688 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-12 00:31:12 +00:00
sgk@google.com 29de584cbf User the "v8.exe" binary from the V8 SCons-based release build instead of the "v8_shell.exe" binary generated by the Visual Studio build.
TBR: sgjesse,ager

git-svn-id: http://src.chromium.org/svn/trunk/src/build@670 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-11 20:04:29 +00:00
brettw@google.com 0db2852eb7 Add defines for the size of wchar_t to build_config.h. Use this in places where we currently have an OS-specific check.
Remove all WIN32 ifdefs from base and replace them with proper defined(OS...).

I also fixed random style bits when I encountered them. I made major style fixes to string16.

git-svn-id: http://src.chromium.org/svn/trunk/src/build@524 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-07 18:31:40 +00:00
mmoss@google.com 8fa72e3dde Allow third_party/libxslt to compile on Linux. Like libxml, this uses pre-generated configure headers in linux/.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@470 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-06 23:45:11 +00:00
mmoss@google.com 3c9e70fff1 Allow third_party/libxml to compile on Linux. This uses static config.h and xmlversion.h files generated by ./configure, which probably isn't ideal, but it's a start.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@441 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-06 18:37:03 +00:00
maruel@google.com 9fac40c89b Reapply 382 since it wasn't the cause of the build breakage.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@395 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-05 21:24:26 +00:00
nsylvain@google.com 9d263646e6 Revert revision 382 to see if it fixes the build.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@391 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-05 19:55:57 +00:00
niranjan@google.com 13348e73eb M internal/release_impl_purify.vsprops
git-svn-id: http://src.chromium.org/svn/trunk/src/build@382 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-05 18:15:43 +00:00
deanm@google.com 807421862a Add process information (ARCH_CPU_*) to build_config.h.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@371 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-05 11:56:30 +00:00
evanm@google.com 16ff93d70e Fix line-ending property on some SCons files.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@348 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-04 23:10:29 +00:00
evanm@google.com d3ab3e4fc2 Include debug information in Linux builds.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@347 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-04 22:55:35 +00:00
mmentovai@google.com d33d43515b OS_WINDOWS conflicted with a macro in Windows' shlwapi.h, use OS_WIN
git-svn-id: http://src.chromium.org/svn/trunk/src/build@339 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-04 21:32:57 +00:00
mmentovai@google.com 189150f004 Provide OS_ and COMPILER_ macros for OS and compiler differentiation
Review URL: http://chrome-reviews.prom.corp.google.com/1108

git-svn-id: http://src.chromium.org/svn/trunk/src/build@338 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-04 21:16:50 +00:00
sgk@google.com 3662e5cfae Checking in the rest of the .lib changes, previous commit was only done from chrome/ and only got those SConscript files.
R=evanm,bradnelson


git-svn-id: http://src.chromium.org/svn/trunk/src/build@331 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-04 18:46:02 +00:00
sgk@google.com 0550c230d8 Pull the block of common Windows system libraries that we link with everywhere into the base Windows environment.
TBR: evanm,bradnelson

git-svn-id: http://src.chromium.org/svn/trunk/src/build@310 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-04 05:18:29 +00:00
evanm@google.com 2e1d718e77 Pass 32-bit linker flag.
TBR=deanm

git-svn-id: http://src.chromium.org/svn/trunk/src/build@309 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-04 02:54:58 +00:00
sgk@google.com bfd3340a9a Convert submodules SConscript files to psuedo-builder calls.
TBR: evanm,bradnelson



git-svn-id: http://src.chromium.org/svn/trunk/src/build@304 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-03 21:21:33 +00:00
sgk@google.com 2f9fb5ab96 Add Chrome* pseudo-builders to the base construction environment to wrap the Command() and {Static,Shared}Library() builders calls. These provide a common place for us to abstact Windows/Mac/Linux differences in how we want these built.
Added to both SConscript.main and SConscript.main.linux.

TBR: evanm,bradnelson

git-svn-id: http://src.chromium.org/svn/trunk/src/build@301 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-03 21:09:06 +00:00
evanm@google.com 96d8921952 Merge a bunch of SConscript.main back into SConscript.main.linux. My goal is to track .main as close as possible to minimize divergence.
Using this (and the split SConstruct that keunwoo already wrote) you can build third_party by:
  scons Hammer/third_party
and you can attempt to build base, though there's still a lot of work to be done.

git-svn-id: http://src.chromium.org/svn/trunk/src/build@265 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-01 22:00:31 +00:00
sgk@google.com 8644fc3565 SCons build:
* Add base\object{,_watcher}.cc.
* Add chrome\browser\bookmark_{codec,storage}.cc.
* Add chrome\views\frame\browser_window_factory.cc.
* Split of app\main.cc into app\chrome_{dll,exe}_main.cc, with added CPPDEFINES for {BROWSER,RENDERER,PLUGIN}_DLL.
* Move $CSCRIPT, $PLATFORMSDK* and $VISUAL_STUDIO variables to the win32-specific construction environment.
* Remove unnecessary comments.
TBR: bradnelson

git-svn-id: http://src.chromium.org/svn/trunk/src/build@261 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-01 21:45:48 +00:00
sgk@google.com 2b84924b9b Steps towards isolating Windows-isms in the construction environment from Linux/Posix/Mac-isms, and fixes:
* Only put Windows settings on the construction environment when PLATFORM == 'win32', and provide a PLATFORM == 'posix' block for necessary settings there.
* Don't hard-code C:/ as the location of Microsoft Visual Studio 8, so we can find memset.obj even on buildbot systems that have it installed on D:.
* Work around how SCons 0.98.3 fails to handle environment variables imported from Visual Studio that use | to separate diferent architecture types in the (e.g.) PATH.  (This is fixed in 0.98.4, after which we can remove the workaround.)
* Deep copy the environment we use to build v8_shell.exe so objects therein can't pollute other environments.
TBR: evanm,bradnelson

git-svn-id: http://src.chromium.org/svn/trunk/src/build@223 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-08-01 04:12:25 +00:00
sgk@google.com 7819c1248e Get SCons building Windows again without having to Import()/re-Export(): use the $PLATFORM construction variable supplied in the construction environment instead of passing around our own PLATFORM variable in Python.
R=keunwoo,evanm

git-svn-id: http://src.chromium.org/svn/trunk/src/build@202 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-07-31 21:32:20 +00:00
keunwoo@google.com af82317f10 Initial commit to get a handful of third_party packages building properly under Linux. Uses some temporary shims to detect platform and omit processing of some stuff that doesn't seem to work for me.
As previously discussed, I'm just doing whatever's expedient to getting *something* building under Linux, since we decided with the current state of Chrome head (with the upcoming freeze and release branch) it would be too disruptive to try to land all the latest site_scons in Chrome's copy.  The main thing to note is the SConscript.main.linux file which uses

  #/../third_party/*

instead of

  #/$BUILD_ROOT/third_party/*

and then uses variant_dir in the env.SConscript() call at the bottom to explicitly emit output into Hammer/third_party/*.  If either of these hacks is absent, scons under Linux simply concludes that all targets are up to date (there's nothing to build).  Explanations for this behavior or alternative workarounds are welcome.  Alternatively we could just commit this as-is and let someone with more knowledge of SCons internals try to debug it under Linux.

git-svn-id: http://src.chromium.org/svn/trunk/src/build@194 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-07-31 20:21:49 +00:00
sgk@google.com d1c14385ab Initial cleanups en route to coalescing the get-it-built cut-and-paste from various SConscripts into readable and maintainable shape. To wit:
* Put the near-universal settings of /DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS, /DWIN32_LEAN_AND_MEAN, /wd4503 and /wd4819 in the base construction environment.
* Sort various unsorted source file lists.
* Fix indentation and quoting for consistency in a couple SConscript files that escaped previous dragnets.
* Eliminate two left-over uses of Split() for input file lists.
* Give the devenv invocation to build v8_shell.exe the full path to the relevant .vcproj file.
* Add /nologo to the base LINKFLAGS setting.
* Remove various CPPPATH and other settings that have been hanging around commented out from the Visual Studio build (in case we needed them, which we evidently don't).
* Get rid of unnecessary env.File() and env.Dir() calls in various settings (esp. CPPPATH) and source file lists.
* Add copyright notice to an overlooked SConscript file.
* Clean up version.bat invocation.
TBR: bradnelson

git-svn-id: http://src.chromium.org/svn/trunk/src/build@174 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-07-31 07:25:19 +00:00
maruel@google.com b890f6bc3e Fix two issues with Visual Studio 2008.
BUG=1290595

git-svn-id: http://src.chromium.org/svn/trunk/src/build@126 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-07-30 18:31:40 +00:00
sgk@google.com 7e5d0f4fa1 Accommodate the change from ..\third_party\scons-0.98.3 to ..\third_party\scons in the recursive invocation of scons to build the necessary v8 targets.
TBR: bradnelson,nsylvain

git-svn-id: http://src.chromium.org/svn/trunk/src/build@42 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-07-28 20:13:34 +00:00
initial.commit a94d40f912 Add the build directory to the repository.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@7 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-07-26 20:52:30 +00:00