summaryrefslogtreecommitdiffstats
path: root/webkit/SConscript
Commit message (Collapse)AuthorAgeFilesLines
* Fix Scons build I broke with r7592 and r7594. jungshik@google.com2009-01-081-0/+1
| | | | | | | | | | | | | | Add WebCore/platform/graphics/opentype to CPPPATH for Windows. TEST=run 'hammer webkit' on Windows in src/chrome and build should go through without an error about not being able to find 'OpenTypeUtilities.h' when compiling platform/graphics/chromium/FontCustomPlatformData.cpp Review URL: http://codereview.chromium.org/16597 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7712 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: add missing include path for GdkSkia.hagl@chromium.org2009-01-071-0/+1
| | | | | | | | | | My change to move GdkSkia, yesterday, broke because our WebKit port doesn't include skia/ext as an include path. Review URL: http://codereview.chromium.org/16593 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7692 0039d316-1c4b-4281-b951-d872f2087c98
* cChrome side of WebKit merge 39369:39410.pamg@google.com2008-12-221-0/+2
| | | | | | | | | | | | * Move files from platform/graphics into platform/animation and platform/graphics/transforms and update include path * Add stubs for two new methods in FrameLoaderClient * Re-baseline one new layout test for Windows and add two to tests_fixable. Review URL: http://codereview.chromium.org/14917 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7352 0039d316-1c4b-4281-b951-d872f2087c98
* Convert from using env['PLATFORM'] directly to using the more flexiblesgk@google.com2008-12-181-6/+6
| | | | | | | | | | | | | | | | | | and better-thought-out Hammer env.Bits() idioms: * env['PLATFORM'] == 'win32' => env.Bit('windows') * env['PLATFORM'] == 'posix' => env.Bit('linux') * env['PLATFORM'] == 'darwin' => env.Bit('mac') New idioms: * env.Bit('posix') => really does mean "any POSIX platform" * env.AnyBits('mac', 'linux') => specifically mac or linux, excluding other POSIX platforms Where we were using compound conditionals (e.g., "env['PLATFORM'] in ('posix', 'darwin')") I tried to take my best shot at translating the intent (i.e., "env.Bits('posix')" for something POSIX, "not env.Bits('mac')" for something not yet ported to Mac, etc.) Review URL: http://codereview.chromium.org/15051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7270 0039d316-1c4b-4281-b951-d872f2087c98
* Remove few more errors in mac scons build.phajdan.jr@chromium.org2008-12-151-2/+18
| | | | | | | BUG=5525 Review URL: http://codereview.chromium.org/14113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6981 0039d316-1c4b-4281-b951-d872f2087c98
* Have GRIT generate files into a common directory.tc@google.com2008-12-121-1/+4
| | | | | | | | | | | | | | | Joi has convinced me that GRIT should generate platform specific resources files. This is easier than parsing .rc files because GRIT effectively has an .rc parser. To that end, we need to convert some existing .rc files to .grd files (e.g., net_resources.rc and webkit_resources.rc). Rather than having every grd file output to a different place and -I all the different paths, have GRIT generate all files into one directory. This directory is grit_derived_sources. Review URL: http://codereview.chromium.org/13776 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6940 0039d316-1c4b-4281-b951-d872f2087c98
* I wanted env.subst() afterall, env.Dir is apparently incorrect.deanm@chromium.org2008-12-021-2/+1
| | | | | | Review URL: http://codereview.chromium.org/12860 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6209 0039d316-1c4b-4281-b951-d872f2087c98
* Pre-substitute webkit includes to avoid repeated subsitution. This causes ↵deanm@chromium.org2008-12-021-16/+19
| | | | | | | | my null build to go from 45s to 30s. Review URL: http://codereview.chromium.org/12828 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6206 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 6072.ojan@google.com2008-11-271-1/+1
| | | | | | | Caused a slew of layout test crashes Review URL: http://codereview.chromium.org/12513 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6077 0039d316-1c4b-4281-b951-d872f2087c98
* ActiveX changes part 2: remove old #defines, replace with new one.pkasting@chromium.org2008-11-261-1/+1
| | | | | | Review URL: http://codereview.chromium.org/12506 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6072 0039d316-1c4b-4281-b951-d872f2087c98
* less include pathstc@google.com2008-11-251-41/+49
| | | | | | | | | | | | | | Change the include paths for webkit/port and third_party/WebKit/WebCore directories to not fall include directories from $OBJ_ROOT. We can't just change $PORT_DIR or $WEBCORE_DIR because that causes the object files to be ouput next to the source file rather than in $OBJ_ROOT. Instead, we just use a new env variable for adding the include paths that don't depend on OBJ_ROOT. Review URL: http://codereview.chromium.org/12615 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5995 0039d316-1c4b-4281-b951-d872f2087c98
* Second try ad faster scons builds of test shell.tc@google.com2008-11-241-55/+31
| | | | | | | | | | | | | | This is the same as the previous patch except it doesn't change the WEBCORE_DIR variable. It needs the OBJ_ROOT in the resolution path so .o files end up in Hammer/. I'll fix the include paths in a follow up change. TBR=sgk Review URL: http://codereview.chromium.org/12411 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5937 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "faster scons builds of test shell"tc@google.com2008-11-241-31/+55
| | | | | | | | | | | | It's putting .o files next to .cpp files. I will debug offline then resubmit. TBR=sgk Review URL: http://codereview.chromium.org/12610 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5930 0039d316-1c4b-4281-b951-d872f2087c98
* faster scons builds of test shelltc@google.com2008-11-241-55/+31
| | | | | | | | | | | | | | | | | By reducing the number of include paths that are specified as $WEBKIT_DIR/port, we reduce the number of paths that get expanded by the addRepository functions. Instead, we only specify directories from $WEBKIT_DIR/port if we have header files in those directories. The down side is that if we add a header to port, we need to update the include paths. Also, don't specify WebCore includes with OBJ_ROOT as the fallback repository so we save on -I expansion. Remove $WEBKIT_PORT_DIR because it's the same as $PORT_DIR. The change to glue/SConscript is to pick up webkit_version.h since glue is the only place that needs it. Review URL: http://codereview.chromium.org/11598 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5923 0039d316-1c4b-4281-b951-d872f2087c98
* Fix use of LOAD= with WantSystemLib() (we could blow up if a variablesgk@google.com2008-11-211-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hadn't been added to the config) and extend use of LOAD= into submodules: * Add a ChromeLoadSConscriptModules() method that encapsulates the conditional logic, and makes things more readable by specifying component names as keyword arguments, not hard-coding the logic as a series of if-tests. * Put the ChromeLoadSConscriptModules() logic in a Tool module in site_scons/site_tools, so it doesn't clutter up build/SConscript.main directly. * Move env.WantSystemLib() calls into the individual *.scons files, so we call them each time (or not, based one LOAD=) and the config itself just returns if the system library is requested and we don't need to build anything locally. * Move the settings where a library name changes based on whether or not the system lib is being used into the using_*.scons files, so they're available to clients independently of whether or not the component's *.scons configuration is loaded. * While here: rename the affected third_party SConscript files: third_party/libjpeg/SConscript => third_party/libjpeg/libjpeg.scons third_party/libxml/SConscript => third_party/libxml/libxml.scons third_party/libxslt/SConscript => third_party/libxslt/libxslt.scons * While here: move the Chrome{Program,SharedLibrary}() etc. builder definitions from build/SConscript.main to a new too Ad the ChromeLoadSConscriptModules() logic in a Tool module, to remove more clutter from build/SConscript.main. Review URL: http://codereview.chromium.org/11430 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5820 0039d316-1c4b-4281-b951-d872f2087c98
* Finish release (opt) builds on Windows, including the parallelsgk@google.com2008-11-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | build\*.scons structure (mirroring build\*.vsprops files): * Use env.ApplySConscript() instead of env.SConscript with a hand-crafted dictionary defining 'env'. * Move various CPPPATH, CCFLAGS, CPPDEFINES, LIBS and LIBPATH definitions from build/SConscript.main and target-specific *.scons files into the build\*.scons files that mirror the existing build\*.vsprops hierarchy. * Use the new build\{debug,release}.scons files to update the windows_dbg and windows_opt construction environments. * Mirror current support for CHROME_BUILD_TYPE and CHROMIUM_BUILD external environment variables. * Remove hard-coded /TP options. * Massage $CXXFLAGS to remove $CCFLAGS, avoiding duplication of options on command lines. Handle the ripple effect in $PCHCOM by adding $CCFLAGS back to that command line. * Delete hammer's default settings of {CC,LINK}FLAGS_{DEBUG,OPTIMIZED} so they don't pollute our construction environments. * Update chrome config to link against v8 for opt, v8_g for dbg. * Get rid of fragile by-hand order of using_net.scons before other using_*.scons files. We're now using --start-group and --end-group on Linux to deal with dependency cycles in libraries. Review URL: http://codereview.chromium.org/11478 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5741 0039d316-1c4b-4281-b951-d872f2087c98
* Expect icudt38.dll in $DESTINATION_ROOT, not $TARGET_ROOT.sgk@google.com2008-11-141-2/+2
| | | | | | Review URL: http://codereview.chromium.org/10928 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5441 0039d316-1c4b-4281-b951-d872f2087c98
* fix linux build by updating webcore xml pathtc@google.com2008-11-121-1/+1
| | | | | | | | | TBR=mmoss Review URL: http://codereview.chromium.org/10640 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5267 0039d316-1c4b-4281-b951-d872f2087c98
* Cache the GdkSkia object in PlatformContextSkia so that we aren't creatingagl@chromium.org2008-11-111-0/+1
| | | | | | | | | and deleting them for every widget drawn. Review URL: http://codereview.chromium.org/9757 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5195 0039d316-1c4b-4281-b951-d872f2087c98
* More efficient webkit addRepository() mapping.sgk@google.com2008-11-061-1/+8
| | | | | | | | | | | | | | | | | | Get rid of some unnecessary addRepository() calls that mapped specific webkit\port\ subdirectories to third_party\WebKit\WebCore subdirectories, in ways that were already covered by the mapping in webkit\SConscript of all of $WEBKIT_DIR\port to third_party\WebKit\WebCore. This takes about 40 duplicate /I options out of a typical compilation command line (and, more importantly, out of the .h file searches). Add additional comments about future potential efficiency that we can get from eliminating the quirky way we remap specific directories into webkit\port, instead of just maintaining a completely parallel directory structure and mapping the whole tree once. Review URL: http://codereview.chromium.org/9466 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4918 0039d316-1c4b-4281-b951-d872f2087c98
* Remove unnecessary, deleted pending/ subdirectories from CPPPATH.sgk@google.com2008-11-051-2/+0
| | | | | | Review URL: http://codereview.chromium.org/9434 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4820 0039d316-1c4b-4281-b951-d872f2087c98
* enable database in scons buildtc@google.com2008-11-031-1/+1
| | | | | | | Review URL: http://codereview.chromium.org/9272 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4492 0039d316-1c4b-4281-b951-d872f2087c98
* Merge linux and windows test shells to share code.tc@google.com2008-10-311-1/+1
| | | | | | | | | This also forces the webkit grd files to be run through grit and .h files generated. Review URL: http://codereview.chromium.org/8976 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4345 0039d316-1c4b-4281-b951-d872f2087c98
* SCons config changes from webkit merge:sgk@google.com2008-10-311-2/+2
| | | | | | | | | | | * Don't build platform\win\FileSystemWin.cpp. * Add platform\chromium\FileSystemChromiumWin.cpp. * Add platform\chromium\ScrollBarThemeChromiumWin.cpp. * icudt38.dll installs into $TARGET__ROOT, not $OBJ_ROOT. * Re-sort a few input file lists. Review URL: http://codereview.chromium.org/8957 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4277 0039d316-1c4b-4281-b951-d872f2087c98
* Landing 36102:37604 merge on trunkdglazkov@google.com2008-10-301-0/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4222 0039d316-1c4b-4281-b951-d872f2087c98
* More stubbing out. With this and the rest of Linux pending, test_shell links.agl@chromium.org2008-10-241-0/+1
| | | | | | | | | | | | There doesn't appear to be a WebKit PLATFORM macro for LINUX and, since we're in the middle of a merge, adding one isn't a great idea either. So I'm using __linux__ here. Also, several the stubs were very temporary and since stubbing them required getting their headers to work as well I just aliased them away. Review URL: http://codereview.chromium.org/8131 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3964 0039d316-1c4b-4281-b951-d872f2087c98
* Removing more dependencies on the relative location of $CHROME_SRC_DIR.bradnelson@google.com2008-10-231-2/+2
| | | | | | Review URL: http://codereview.chromium.org/7860 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3843 0039d316-1c4b-4281-b951-d872f2087c98
* Using $CHROME_SRC_DIR in place of hash/..bradnelson@google.com2008-10-221-4/+4
| | | | | | | | This will facilitate changing where the main sconstruct lives. Review URL: http://codereview.chromium.org/7847 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3725 0039d316-1c4b-4281-b951-d872f2087c98
* remove PLATFORM_GTK-ismstc@google.com2008-10-211-15/+0
| | | | | | | | | After the change to PlatformScrollbar.h, this just works (tm). Review URL: http://codereview.chromium.org/7821 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3665 0039d316-1c4b-4281-b951-d872f2087c98
* Rolling back switch to hammer patterns again.bradnelson@chromium.org2008-10-201-10/+6
| | | | | | Review URL: http://codereview.chromium.org/7530 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3637 0039d316-1c4b-4281-b951-d872f2087c98
* Adding in new hammer patterns. Restored from rollback change 3578.bradnelson@chromium.org2008-10-181-6/+10
| | | | | | Review URL: http://codereview.chromium.org/7656 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3597 0039d316-1c4b-4281-b951-d872f2087c98
* fix linux buildtc@google.com2008-10-181-0/+1
| | | | | | | | | TBR=darin Review URL: http://codereview.chromium.org/7652 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3592 0039d316-1c4b-4281-b951-d872f2087c98
* Rolling back CL 3578, discovered hammer.bat had not been updated yet.bradnelson@chromium.org2008-10-181-10/+6
| | | | | | Review URL: http://codereview.chromium.org/7507 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3582 0039d316-1c4b-4281-b951-d872f2087c98
* Applying software construction toolkit patterns in scons build.bradnelson@chromium.org2008-10-171-6/+10
| | | | | | Review URL: http://codereview.chromium.org/6569 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3578 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Linux build.evanm@google.com2008-10-151-0/+4
| | | | | | | Review URL: http://codereview.chromium.org/7425 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3432 0039d316-1c4b-4281-b951-d872f2087c98
* compile a few more files needed by WTFtc@google.com2008-10-151-1/+3
| | | | | | | | | also reorder the link libraries so more stuff links Review URL: http://codereview.chromium.org/7342 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3408 0039d316-1c4b-4281-b951-d872f2087c98
* include platform/gtk in the CPPPATH on linuxtc@google.com2008-10-141-0/+11
| | | | | | | Review URL: http://codereview.chromium.org/7289 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3335 0039d316-1c4b-4281-b951-d872f2087c98
* Build WebCore on linux. Seems to compile cleanly after disabling warnings.tc@google.com2008-10-131-3/+1
| | | | | | | Review URL: http://codereview.chromium.org/471 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3302 0039d316-1c4b-4281-b951-d872f2087c98
* Minimal change to make test_shell_tests link and run zero tests on Linux.evanm@google.com2008-10-131-1/+1
| | | | | | | Review URL: http://codereview.chromium.org/1603 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3288 0039d316-1c4b-4281-b951-d872f2087c98
* libxml DerivedSourcestc@google.com2008-10-101-1/+1
| | | | | | | | | | put libxml's config.h and xmlversion.h in Hammer/third_party/libxml/DerivedSources instead of scons. Review URL: http://codereview.chromium.org/7040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3204 0039d316-1c4b-4281-b951-d872f2087c98
* Some small linux build cleanups:tc@google.com2008-10-091-0/+4
| | | | | | | | | | | - Move WTF_USE_ICU_UNICODE from config.h.in to our SConscript file - Fix the include path for libxml/xmlversion.h (use the file copied into Hammer rather than the one from the linux subdir) - Make precompiled_v8bindings.cpp be conditionally added, rather than conditionally removed. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3142 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit merge hits the SCons build, the sequel:sgk@google.com2008-10-091-39/+79
| | | | | | | | | | | | | | | | | * Un-revert r3063 (basic file list updates). * Un-revert r3079 (os-win32 subdirectory). * Add icu.lib to the npapi_test_plugin.dll link. * Add libpng.lib to the port.lib link. * Updates for recently un-forked files. * Incorporate Linux fixes from phajdan.jr (many thanks): * Add libxml/linux/include to relevant CPPPATH lists. * Use -Wno-error to suppress warnings-as-errors. * Re-order lines in ExceptionContext. * Remove unused WebCore::SharedBuffer declaration in SkiaUtils.h. * Spelling fix: V8CSSSTyleDeclaration.h => V8CSSStyleDeclaration.h Review URL: http://codereview.chromium.org/7024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3118 0039d316-1c4b-4281-b951-d872f2087c98
* Revert both 3079 and 3063 because they caused linux and mac breakage.maruel@google.com2008-10-091-79/+39
| | | | | | Review URL: http://codereview.chromium.org/7015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3098 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Linux build breakage from the webkit merge.sgk@google.com2008-10-091-8/+19
| | | | | | Review URL: http://codereview.chromium.org/7004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3079 0039d316-1c4b-4281-b951-d872f2087c98
* Update the SCons build for the WebKit merge:sgk@google.com2008-10-081-38/+67
| | | | | | | | | | | | | | | | | * Update relevant file lists. * Modify CPPPATH directory lists to mirror the VS build. * Add new command-line defines. * Remove an incorrect /css/ subdirectory from the generated CSS*.in paths so the DAG properly hooks them up with the right source files. * Change the idiom when we exclude files that just haven't been ported yet: keep all the to-be-ported files on the global list, and explicitly remove them on the necessary platforms. (This should make it a little easier to verify that we have all the right files, and the config change when porting a file will be to just delete the relevant line.) * Comment the use of addRepository(). Review URL: http://codereview.chromium.org/6323 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3063 0039d316-1c4b-4281-b951-d872f2087c98
* Make -Wno-multichar come after -Wall on the command-line.mmoss@google.com2008-10-031-0/+2
| | | | | | | | | When -Wall comes after, it turns -Wmultichar back on. This fixes Linux build error: webkit/port/platform/image-decoders/bmp/BMPImageDecoder.cpp:65:16: error: multi-character character constant git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2858 0039d316-1c4b-4281-b951-d872f2087c98
* -Wno-multichar isn't a MSVC compiler option;sgk@google.com2008-10-031-6/+4
| | | | | | | move it to non-Windows initialization. Review URL: http://codereview.chromium.org/6452 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2844 0039d316-1c4b-4281-b951-d872f2087c98
* Get more of webkit building under Linux.erg@google.com2008-10-021-0/+5
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2798 0039d316-1c4b-4281-b951-d872f2087c98
* * Get linux building with the merge brancherg@google.com2008-10-011-6/+13
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2781 0039d316-1c4b-4281-b951-d872f2087c98
* Eliminate calling the create-config.sh script (throughsgk@google.com2008-09-301-1/+1
| | | | | | | | | | | | | | | | prebuild.bat on Windows) in favor of generating the WebCore config.h file directly from SCons. (We don't need the other .h file copying that create-config.sh does because the CPPPATH lists in SCons already give us the right /I or -I options to #include files from their source directories.) This also gets rid of an unnecessary "obj" subdirectory in the generated config.h path. We're already in the build directory hierarchy. Review URL: http://codereview.chromium.org/5611 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2731 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2025-01-20 18:52:19 +0000