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

5396 Коммитов

Автор SHA1 Сообщение Дата
evanm@google.com f1d16e8aae Revert "Use SCons -C to invoke the v8 build from our own build directory,"
This reverts r4041.

Review URL: http://codereview.chromium.org/8822


git-svn-id: http://src.chromium.org/svn/trunk/src/build@4045 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-28 00:26:28 +00:00
sgk@google.com 1788802d6d Use SCons -C to invoke the v8 build from our own build directory,
using the -Y option to pull all source files from the v8 source
directory.  This requires making sure the build directory exists
before we invoke the subsidiary SCons that will chdir there.
Other clean up:
* Use the actual file names involved instead of local Python variables.
* Don't forcibly add our targets to other component's Aliases.
Review URL: http://codereview.chromium.org/8639

git-svn-id: http://src.chromium.org/svn/trunk/src/build@4041 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-28 00:11:18 +00:00
tc@google.com f496518795 speed up scons
I did some profiling and found that we spend a lot of
time in SCons/Subst.py resolving paths with $ vars in
them.  By pre-resolving some common $ vars, we can get
a 16% speed up of an empty build (running hammer Hammer
when everything is already built).  On my work desktop,
this is a saving from ~180s to do an empty build to
~150s to do an empty build.

I found which symbols to pre-resolve by gathering stats
on what symbols were resolved during a single run.
Originally, these were the top 10 calls to
StringSubber.substitute:

  91466 /src/gclient-git/src/chrome
  89457 $MAIN_DIR/Hammer
  89457 $DESTINATION_ROOT
  89447 $TARGET_ROOT/obj
  65514 $OBJ_ROOT/webkit
  18169 $OBJ_ROOT/third_party
   8991 -I/src/gclient-git/src/webkit/pending
   5700 $THIRD_PARTY_DIR/WebKit
   4488 -I/src/gclient-git/src/webkit/port/platform/network
   4488 -I/src/gclient-git/src/webkit/port/platform

Afterwards, the top 10 calls were:
  65514 /src/gclient-git/src/chrome/Hammer/obj/webkit
  23933 /src/gclient-git/src/chrome/Hammer/obj
  18169 $OBJ_ROOT/third_party
   8991 -I/src/gclient-git/src/webkit/pending
   5700 $THIRD_PARTY_DIR/WebKit
   4488 -I/src/gclient-git/src/webkit/port/platform/network
   4488 -I/src/gclient-git/src/webkit/port/platform
   3813 $OBJ_ROOT/skia
   3498 $THIRD_PARTY_DIR/icu38
   3456 $THIRD_PARTY_WEBKIT_DIR/JavaScriptCore

Adding these rules cuts the total number of calls to
StringSubber.substitute from 1001817 to 665933.

Review URL: http://codereview.chromium.org/8608


git-svn-id: http://src.chromium.org/svn/trunk/src/build@4010 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-27 18:21:49 +00:00
maruel@google.com 00305b7af3 A *very short term* fix to help the linux try bot, otherwise this file is clobbered and a v8 rebuild is done on each try.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@4009 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-27 18:14:03 +00:00
tc@google.com a85ca9d18c Add CCACHE_DIR to the list of environment variables
that get passed to the build environment.  This allows
us to have our CCACHE_DIR off of NFS.

Review URL: http://codereview.chromium.org/8610


git-svn-id: http://src.chromium.org/svn/trunk/src/build@4002 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-27 17:10:16 +00:00
sgk@google.com 7f8ef6eace Fix SCons build of the sandbox module, splitting out the individual
targets into the new *.scons file naming scheme.
Review URL: http://codereview.chromium.org/8616

git-svn-id: http://src.chromium.org/svn/trunk/src/build@4000 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-27 16:11:15 +00:00
sgk@google.com 73d0a5c0b7 Fix SCons modules build on Windows:
* Add 'midl' Tool module.
* Filter out the default OS_WINDOWS= definition from the Hammer
  modules, which messes up our build.
* Fix the $PLATFORMSDK_VISTA definition.
* Remove the current directory from the 'base' Alias (avoid cycles).
* Remove by-hand addition of .lib, .pdb and .ilk files to the target
  list when build shared libraries (multiple places).
* Comment out a post-action Touch() of the themes/default resource.
(Thanks to bradnelson for many of the above individual fixes.)
Review URL: http://codereview.chromium.org/8207

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3980 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-25 17:20:48 +00:00
bradnelson@google.com bc67d77a8d Actually adding the new scons toolkit (hammer) base tools to the built
environment.
Things have been rigged temporarily so they emit to the same directories.

Review URL: http://codereview.chromium.org/8139

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3908 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-24 05:08:22 +00:00
mark@chromium.org 59b342db8b Build TestShell again
Review URL: http://codereview.chromium.org/7966

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3900 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-24 02:11:01 +00:00
mark@chromium.org 32cc0d778a Put webkit.xcodeproj:port back into the "all" build by making all.xcodeproj
depend on the "all" target in webkit.  (Re-sniff port?)
Review URL: http://codereview.chromium.org/7959

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3890 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-24 01:02:23 +00:00
bradnelson@google.com 0145549939 Removing more dependencies on the relative location of $CHROME_SRC_DIR.
Review URL: http://codereview.chromium.org/7860

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3843 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-23 19:44:27 +00:00
mark@chromium.org cb4889de1f Don't build glue as Objective-C++ now that PLATFORM_MAC is off. Re-sniff glue
in all.xcodeproj.
Review URL: http://codereview.chromium.org/7901

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3800 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-23 00:12:16 +00:00
mark@chromium.org 81941da1ab Build libxslt on the Mac. This seems to be needed while disabling
PLATFORM(MAC).
Review URL: http://codereview.chromium.org/7893

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3786 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-22 23:09:17 +00:00
mark@chromium.org 23fb291bb1 Take TestShell.xcodeproj:TestShell, webkit.xcodeproj:glue, and
webkit.xcodeproj:port out of the "all" Mac build temporarily to accommodate
PLATFORM(MAC) killing in progress.
Review URL: http://codereview.chromium.org/7870

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3738 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-22 17:21:45 +00:00
mark@chromium.org 72f25dbf15 Fix Mac bustage from DEPS roll r3728
Review URL: http://codereview.chromium.org/8058

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3735 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-22 16:30:55 +00:00
bradnelson@google.com 6e8abee914 Using $CHROME_SRC_DIR in place of hash/..
This will facilitate changing where the main sconstruct lives.

Review URL: http://codereview.chromium.org/7847

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3725 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-22 05:03:39 +00:00
sgk@google.com 10d56a6590 SCons renaming updates for base, net and googleurl:
* Rename SConscript files to {module}.scons or {moduel}_lib.scons,
  depending on the primary target involved.
* Separate targets into individual *.scons files, with one
  construction environment (named "env") per *.scons file.
* Add using_{module}.scons files (like .vsprops) that will be used
  by other modules to add CPPDEFINES, CPPPATH, LIBS and LIBPATH values.
* Update other modules' *.scons files to use the new using_{module}.scons
  files (using a temporary one-liner idiom until we have the
  ApplySConscript() method from the Hammer modules).
* Use the idiom of removing to-be-ported files from the master list,
  so they can be simply deleted from the to-be-ported list as they
  get ported in the future, instead of having to shuffle entries
  between lists.
* Use $OBJ_ROOT instead of hard-coded '#/$BUILD_TYPE/' for the $*_DIR
  variables.
* Add a addRepository() call mapping build/ to $TARGET_ROOT/googleurl,
  so its $OBJ_ROOT value can look like the others'.
* Formatting changes, primarily modifying indentation to conform to
  style guidelines.
* Fix copyright headers in some third_party/* modules
  previously overlooked.
* Add rudimentary __doc__ strings, setting up for a future
  ability to generate meaningful documentation.


Review URL: http://codereview.chromium.org/7807

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3675 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-21 20:24:56 +00:00
bradnelson@google.com c3bd7a7bc0 Incrementally moving to new patterns.
HASH/$BUILD_TYPE -> $OBJ_ROOT

Review URL: http://codereview.chromium.org/7801

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3646 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-21 04:56:28 +00:00
bradnelson@chromium.org 4120a26e47 Rolling back switch to hammer patterns again.
Review URL: http://codereview.chromium.org/7530

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3637 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-20 23:29:20 +00:00
sgk@google.com 4f10b6df24 Modules Linux fixes:
Construct the $THIRD_PARTY_DIR and $WEBKIT_DIR variables consistently
with other $*_DIR variables.
Don't execute test scripts from the VariantDir by default; everything
isn't installed in the proper place yet.
Use the 'build_component' variable from the submodule SConstruct
files to restrict how much we build by default (e.g. don't try to
build all of webkit if you're only working in base or net).
Review URL: http://codereview.chromium.org/7524

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3626 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-20 20:33:37 +00:00
agl@chromium.org 4ba799c581 We have several cases where archives depend on each other in a cyclic fashion.
(V8Bindings, libport and WebCore being the most significant example.) Since the
GNU linker does only a single pass over the archives we need some extra
trickery to deal with these unavoidable cycles. That trickey is --start-group
and --end-group (aka -( and -) ). That causes ld to loop over the group until
no more undefined symbols are found. In an ideal world we would only make
groups from those libraries which we knew to be in cycles. However, that's
tough with SCons, so we bodge it by making all the archives a group by
redefining the linking command here.

Review URL: http://codereview.chromium.org/7523


git-svn-id: http://src.chromium.org/svn/trunk/src/build@3623 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-20 20:04:03 +00:00
bradnelson@chromium.org 6a0765e94a Adding in new hammer patterns. Restored from rollback change 3578.
Review URL: http://codereview.chromium.org/7656

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3597 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-18 06:04:24 +00:00
bradnelson@chromium.org d668aadc5a Rolling back CL 3578, discovered hammer.bat had not been updated yet.
Review URL: http://codereview.chromium.org/7507

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3582 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-18 00:30:22 +00:00
bradnelson@chromium.org 26dc8f7b99 Applying software construction toolkit patterns in scons build.
Review URL: http://codereview.chromium.org/6569

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3578 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-17 23:44:26 +00:00
pinkerton@google.com 16bbaf557d improve layout tests by removing definition of DEBUG (libxml uses it to spew diagnostic output to stderr)
Review URL: http://codereview.chromium.org/7149

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3394 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-15 13:17:40 +00:00
evanm@google.com cd7d3886ac Basic GTK test shell: links in the SConscript and brings up a window with nonfunctioning UI.
Review URL: http://codereview.chromium.org/2983


git-svn-id: http://src.chromium.org/svn/trunk/src/build@3299 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-13 18:39:46 +00:00
tc@google.com d6eab8ba27 Manually specify where googleurl object files should be
generated.  They're currently ending up in src/build/googleurl
but they should be in $TARGET_ROOT/googleurl.


git-svn-id: http://src.chromium.org/svn/trunk/src/build@3121 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-09 20:08:02 +00:00
mark@chromium.org c7a236142e Build some code and unit tests inside chrome. This depended on sqlite, so
adding that too.
Review URL: http://codereview.chromium.org/6361

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3055 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-08 21:27:02 +00:00
pinkerton@google.com 9f0d43a188 changes to get mac layout tests moving forward. Turn off objc GC and remove asserts in the plugin stub code that throw off the layout tests.
Review URL: http://codereview.chromium.org/6588

git-svn-id: http://src.chromium.org/svn/trunk/src/build@3026 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-08 18:55:36 +00:00
dsh@google.com e69d872979 Implement MessageLoopForUI using GLib. This gets some exercise from
base_unittest.

BUG=1319

Review URL: http://codereview.chromium.org/4261

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2834 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-03 16:52:59 +00:00
sgk@google.com 0bf7c158d3 Re-catch-up SCons webkit build (r2734) plus:
* Have v8 build v8.lib with snapshot=off.
* Call the v8 build again to build copies of libraries-empty.obj
  and snapshot.obj with which we build v8_snapshot.lib.
Review URL: http://codereview.chromium.org/6403

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2810 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-02 21:08:06 +00:00
brettw@google.com 14f11e29ef Remove the network state notifier and the corresponding DLL. This is likely causing some startup performance regressions, and we don't really need it now anyway. We should have a different design when we implement this in the future.
BUG=3076
Review URL: http://codereview.chromium.org/6404

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2808 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-02 20:40:49 +00:00
erg@google.com 3b02591f38 Get more of webkit building under Linux.
git-svn-id: http://src.chromium.org/svn/trunk/src/build@2798 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-02 19:36:26 +00:00
sgk@google.com b053e2fc8a Revert r2734 (catch up SCons build with webkit). It relied on a
leftover file from previous incremental builds.
Review URL: http://codereview.chromium.org/6084

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2797 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-02 18:34:48 +00:00
erg@google.com 39ef903dcc * Get linux building with the merge branch
git-svn-id: http://src.chromium.org/svn/trunk/src/build@2781 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-01 23:20:38 +00:00
tc@google.com 295f6efb3b Merge the chrome_webkit_merge_branch back on to trunk. This brings us
up to webkit@36102.


git-svn-id: http://src.chromium.org/svn/trunk/src/build@2778 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-01 22:31:35 +00:00
sgk@google.com 66b5896f1d Move Perl construction variables into the base construction
environment to generate bindings on all platforms.
Review URL: http://codereview.chromium.org/5619

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2766 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-10-01 18:10:25 +00:00
sgk@google.com 702d831569 Catch up the SCons webkit build:
* Use the configuration options of the webkit SCons build itself
  to build a v8.lib with snapshot=off.
* Move the build of v8_snapshot.lib (renamed from snapshotv8.lib)
  from chrome\SConscript to build\SConscript.v8.
* Use the libraries{,-empty}.obj and snapshot{,-empty}.obj
  files from the v8 build itself instead of rolling our own.
* Re-order thing in build/SConscript.v8 for readability (I hope).
Review URL: http://codereview.chromium.org/5615

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2734 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-09-30 21:57:59 +00:00
sgk@google.com 62013b4970 Get open-vcdiff building on Linux and Mac (in SCons) using
captured values for generating a config.h file.

Builds base/sdch_{filter,manager}.cc on all platforms and links
the 'sdch' library.

Add sdch to the SCons configuration loaded on Mac and Linux.

Removes platform #ifs in net/base/filter.cc initialization code
(reverting r2740).

B=2662
Review URL: http://codereview.chromium.org/5204

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2710 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-09-30 01:37:05 +00:00
sgk@google.com 1049a2ad4b ICU changes
* Add an ICU_UTIL_DATA_IMPL #defines to control whether we're expecting
  the ICU data as ICU_UTIL_DATA_{SHARED,STATIC,FILE}.
* Set defaults on the platforms to match our current practice:
  Windows => shared, Linux => file, Mac => static.
* On Mac, link the separate icui18n, icuuc and icudata libs (matching
  how we're building there), instead of the common icu lib.
* Roll the icu38 revision in DEPS to get the updated SCons build.
Review URL: http://codereview.chromium.org/5022

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2669 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-09-29 04:59:00 +00:00
sgk@google.com b0f67c1562 Roll the third_party/icu38 revision in DEPS to have SCons build libicu,
not libicuuc.  Add a new $ICU_LIBS construction variable to allow
different platforms to link with different sets of ICU libraries.
Use it in the LIBS lists of the various construction environments
used to build the things that link with it.
Review URL: http://codereview.chromium.org/4312

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2651 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-09-26 23:11:54 +00:00
mmoss@google.com b7962576c0 "--clobber" should come before the build directory setup.
Otherwise it deletes the build directory and db file which are needed by the rest of the build, causing the build to fail.

Fixes error:
scons: *** [Errno 2] No such file or directory: 'src/chrome/src/chrome/Hammer/.sconsign.dblite'

Review URL: http://codereview.chromium.org/5010

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2638 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-09-26 20:19:40 +00:00
mark@chromium.org 8b6eca4e70 Use open-vcdiff for sdch compression on the Mac
Review URL: http://codereview.chromium.org/4096

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2628 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-09-26 14:26:07 +00:00
sgk@google.com eba007c668 When we re-invoke SCons for the V8 build, quiet the warning
from the latest SCons version about the lack of pywin32
extensions making parallel support shaky in some corner cases.
Review URL: http://codereview.chromium.org/4280

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2598 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-09-25 19:47:27 +00:00
sgk@google.com 26d702db44 Get libevent building and linking in base_unittests in the Mac SCons build:
* Call the $LIBEVENT_DIR/SConscript file on both Linux and Mac.
* Add generation of the config.h file.
* Modify the libevent_prebuild.sh script so SCons can pass in the input
  file name (because SCons executes things from top of tree) but the
  script still defaults to what XCode wants.
* Only build epoll.c and epoll_sub.c on Linux.
* Only build kqueue.c on Mac.
* Add -framework AppKit to the link lines.
* Add -fobjc-gc to Objective C compilation.
* Add message_pump_mac.mm to the base input file list on Mac.
* Build message_pump_libevent.cc on for base on both Linux and Mac.
* Link against -levent on both Linux and Mac.
Review URL: http://codereview.chromium.org/4254

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2555 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-09-24 18:26:24 +00:00
sgk@google.com 0a9281147b Replace duplicate compiler output lines when compiling shared C/C++ object files with the same "Compiling ..." messages we get when compiling static object files.
Review URL: http://codereview.chromium.org/3802

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2550 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-09-24 17:09:16 +00:00
sgk@google.com 1b851a781a Update v8 path for snapshot-empty.obj.
Review URL: http://codereview.chromium.org/4060

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2535 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-09-24 00:16:27 +00:00
mark@chromium.org 0f7c216ec1 Add TestShell to the All target. Makes the Mac buildbot build TestShell.
Review URL: http://codereview.chromium.org/4052

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2511 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-09-23 19:25:20 +00:00
mark@chromium.org fba26110c7 Set GCC_ENABLE_OBJC_GC = supported globally. Valid values are unsupported,
supported, and required.
Review URL: http://codereview.chromium.org/4047

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2508 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-09-23 19:11:42 +00:00
sgk@google.com fbdc3349e6 Add a 'googleurl' Alias so we don't have to list specific
googleurl target files by hand on the command line.
Review URL: http://codereview.chromium.org/4226

git-svn-id: http://src.chromium.org/svn/trunk/src/build@2506 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2008-09-23 18:58:54 +00:00