summaryrefslogtreecommitdiffstats
path: root/webkit/default_plugin/default_plugin.gyp
Commit message (Collapse)AuthorAgeFilesLines
* Partially revert WebKit.gyp switch-over, because it broke build bot setupdglazkov@google.com2009-11-131-2/+2
| | | | | | | | | | | | | | | | | in subtle and devious ways. Renaming webkit.gyp -> webkit_glue.gyp changed webkit.sln to webkit_glue.sln, which occured unbeknownst to the builders who continued to build webkit.sln for most of the day. This wasn't an issue until we did a WebKit roll, where the trickery was discovered and hell broke loose. TBR=yaar TEST=green bots BUG=none Review URL: http://codereview.chromium.org/385084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31887 0039d316-1c4b-4281-b951-d872f2087c98
* Upstreaming WebKit.gypyaar@chromium.org2009-11-121-2/+2
| | | | | | | | | | | | This mega patch contains a few simple but tightly dependent changes: 1. Deletion of webkit/api/WebKit.gyp. The file now lives in webkit.org. 2. Rename of webkit/webkit.gyp to webkit/webkit_glue.gyp. Having two webkit.gyp was a source of developer confusion. 3. Gyp dependencies are updated across chromium to point at the upstream WebKit.gyp and the renamed webkit_glue.gyp. 4. Some 200+ files include paths fixed to point to third_party/WebKit/WebKit/chromium instead of webkit/api. The later will be deleted in a subsequent patch. Review URL: http://codereview.chromium.org/387020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31749 0039d316-1c4b-4281-b951-d872f2087c98
* Add comments setting emacs and vim tab width and expansion variables.sgk@google.com2009-10-061-0/+6
| | | | | | | | BUG=none TEST=successful builds Review URL: http://codereview.chromium.org/256059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28089 0039d316-1c4b-4281-b951-d872f2087c98
* Force inclusion of build/common.gypi for all chromium gyp files.yaar@chromium.org2009-09-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Why: Simpler build code. If everybody includes it, it should be included automatically. Why now: The webkit chromium builds need it be specified, since can't default to build/common.gypi. What was done: 1. build/common.gypi's contents were moved to a new file build/gyp_chromium.gypi 2. tools/gyp/gyp_chromium was moved to build/gyp_chromium and made to automatically include build/gyp_chromium.gypi. 3. lots of gyp files were fixed to not refer to build/common.gypi any more. 4. o3d which also builds independently of chrome, was fixed to have a gyp_o3d that includes gyp_chromium.gypi too. 5. build/common.gypi was left empty, because there are some external projects that still refer to it. Things that are left to do after this patch is in: 1. The following external files (in other repositories) need to stop include common.gypi ./third_party/hunspell/hunspell.gyp ./third_party/icu/icu.gyp ./v8/tools/gyp/v8.gyp 2. Once nobody refers to common.gypi anymore, delete common.gypi -or- Delete gyp_chromium.gypi and move its content back to common.gypi Tested on mac, win and linux. On win, got a few unit tests errors on chrome bookmarks, which should not be related. I'm running again with clobber to verify. Review URL: http://codereview.chromium.org/206006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26302 0039d316-1c4b-4281-b951-d872f2087c98
* Replace icu38/icu38.gyp with icu/icu.gyp in gyp files replace all the ↵jshin@chromium.org2009-09-091-2/+2
| | | | | | | | | | | | | | | | | | references to third_party/icu38 and icudt38.dll with third_party/icu and icudt42.dll in vsprops and cc files. Also, update the icu data module name and the icu data symbol in icu_util.cc In addition, add a dummy C++ source file (xmldummy_mac.cc) to libxml to work around an Xcode bug (xmllint and xmlcatalog are linked with gcc rather than g++ even though it's linked to a "C++ library", libicuuc.a). Also updated is the test results for net_util_unittests. This will not be landed until deps/third_party/icu42 is ready for all 3 platforms (Windows VS build files are not yet updated there). BUG=8198 TEST=On all platforms, all the targets are built fine. Review URL: http://codereview.chromium.org/172031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25708 0039d316-1c4b-4281-b951-d872f2087c98
* Take out the activex control.BUG=20259jam@chromium.org2009-09-081-3/+0
| | | | | | Review URL: http://codereview.chromium.org/200031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25650 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Reverting 23406" as it didn't break any tests.jhawkins@chromium.org2009-08-141-0/+1
| | | | | | | | | | | | | | Change PluginInstallImpl to use base::WindowImpl instead of CWindowImpl to reduce a dependency on ATL. BUG=5023 TEST=Uninstall flash. Visit hulu.com and install the flash plugin. Original review: http://codereview.chromium.org/165469 TBR=levin Review URL: http://codereview.chromium.org/165543 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23454 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 23406.levin@chromium.org2009-08-141-1/+0
| | | | | | | | | | | | It seems that Tab2OutOfTabStrip is failing consistently after this change. BUG=None TEST=None TBR=jhawkins@chromium.org Review URL: http://codereview.chromium.org/164543 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23411 0039d316-1c4b-4281-b951-d872f2087c98
* Change PluginInstallImpl to use base::WindowImpl instead of CWindowImpl to ↵jhawkins@chromium.org2009-08-141-0/+1
| | | | | | | | | | reduce a dependency on ATL. BUG=5023 TEST=Uninstall flash. Visit hulu.com and install the flash plugin. Review URL: http://codereview.chromium.org/165469 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23406 0039d316-1c4b-4281-b951-d872f2087c98
* Wean activex_shim from urlmon.lib:sgk@google.com2009-06-141-2/+3
| | | | | | | | | | | | | | Remove urlmon.lib from activex_shim's AdditionalDependencies. Add urlmon.lib to AdditionalDependencies in chrome_dll.vcproj and unittests.vcproj. Add activex_shim as a dependency of default_plugin, so the things that link against default_plugin get urlmon.lib from the activex_shim link_settings. BUG=none TEST=none Review URL: http://codereview.chromium.org/126103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18366 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r18359.sgk@google.com2009-06-141-3/+2
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/125106 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18360 0039d316-1c4b-4281-b951-d872f2087c98
* Convert chrome.dll to gyp generation.sgk@google.com2009-06-141-2/+3
| | | | | | | | | | | | | | | | Remove unnecessary addition of urlmon.lib to AdditionalDepenedencies of activex_shim. Add activex_shim as a dependency of default_plugin (so the things that link against it get urlmon.lib from the link_settings of activex_shim). Add urlmon.lib to AdditionalDependencies in unittests.vcproj (which is going away soon, but this makes the transition smooth). BUG=none TEST=none Review URL: http://codereview.chromium.org/126073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18359 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r18354.sgk@google.com2009-06-131-3/+2
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/125100 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18355 0039d316-1c4b-4281-b951-d872f2087c98
* Remove unnecessary addition of urlmon.lib to AdditionalDependenciessgk@google.com2009-06-131-2/+3
| | | | | | | | | | | of activex_shim. Add it as a dependency of default_plugin. Add urlmon.lib to AdditionalDependencies in unittests.vcproj (going away soon, but this makes the transition smooth). BUG=none TEST=none Review URL: http://codereview.chromium.org/125099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18354 0039d316-1c4b-4281-b951-d872f2087c98
* Capitalize -lurlmon.lib in default_plugin consistently with the othersgk@google.com2009-06-081-1/+1
| | | | | | | | | targets, to avoid -l[Uu]rlmon.lib duplication in link lines. BUG=none TEST=successful build Review URL: http://codereview.chromium.org/119316 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17892 0039d316-1c4b-4281-b951-d872f2087c98
* Adding missing dependency from default_plugin on webkit_strings.bradnelson@chromium.org2009-05-111-0/+1
| | | | | | Review URL: http://codereview.chromium.org/115192 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15771 0039d316-1c4b-4281-b951-d872f2087c98
* Basic underpinnings of the gyp equivalent of the Linux SHARED=1 build:sgk@google.com2009-04-081-1/+1
| | | | | | | | | parameterize the 'type' setting of the various library targets, with a default of 'static_library'. (Hat tip to Craig Schlenter.) Review URL: http://codereview.chromium.org/62127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13345 0039d316-1c4b-4281-b951-d872f2087c98
* Adding fixed guids to some modules to facilitate incremental switch to gyp.bradnelson@google.com2009-03-101-0/+1
| | | | | | Review URL: http://codereview.chromium.org/42044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11388 0039d316-1c4b-4281-b951-d872f2087c98
* Snapshotting progress.bradnelson@google.com2009-03-091-35/+42
| | | | | | | | | Got app and unit_tests linking with gyp under windows. Still missing pieces (things don't run). Review URL: http://codereview.chromium.org/39319 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11302 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes to gyp files to get test_shell building on windows from a gyp project ↵bradnelson@google.com2009-03-031-0/+47
(doesn't run correctly yet). Switched all uses of windows system libraries that assumed they were in the include path to use -l (which will be supported on windows in a separate change). Review URL: http://codereview.chromium.org/27362 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10781 0039d316-1c4b-4281-b951-d872f2087c98