summaryrefslogtreecommitdiffstats
path: root/third_party/libpng
Commit message (Collapse)AuthorAgeFilesLines
* Enable color profile support in libpng. We're going to use this in WebKit.abarth@chromium.org2010-10-301-1/+1
| | | | | | | | | | R=pkasting http://codereview.chromium.org/4060002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64539 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Revert "libpng: update to 1.2.44""agl@chromium.org2010-10-286-110/+113
| | | | | | | | | This reverts commit r64079. The perf regression turned out not to be the fault of the libpng change. BUG=60942 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64243 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "libpng: update to 1.2.44"agl@chromium.org2010-10-276-113/+110
| | | | | | | | | This reverts commit r63744. This is a preemptive revert due to a perf regresssion as it's easier to revert this then a WebKit roll. BUG=60942 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64079 0039d316-1c4b-4281-b951-d872f2087c98
* libpng: update to 1.2.44agl@chromium.org2010-10-256-110/+113
| | | | | | | | | | | | r50937 updated the important bits of libpng to 1.2.44 but missed a few files. This change reduces the diffs between the upstream 1.2.44 and our copy to nothing (for *.c *.h). TEST=none BUG=none TBR=mhm git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63744 0039d316-1c4b-4281-b951-d872f2087c98
* Build libpng.dll for chromium multi dll version.victorw@chromium.org2010-07-221-1/+12
| | | | | | | | | | R=darin TEST=none BUG=none Review URL: http://codereview.chromium.org/3053011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53354 0039d316-1c4b-4281-b951-d872f2087c98
* Update libpng to version 1.2.44mhm@chromium.org2010-06-267-58/+121
| | | | | | | | | | | According to libpng website, this will solve the vulnerability ID CVE-2010-1205. BUG=47633 TEST=None Review URL: http://codereview.chromium.org/2835021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50937 0039d316-1c4b-4281-b951-d872f2087c98
* GYP changes for FreeBSD and OpenBSDpvalchev@google.com2010-05-141-2/+2
| | | | | | Review URL: http://codereview.chromium.org/1480002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47327 0039d316-1c4b-4281-b951-d872f2087c98
* Add licensing info for another set of projects in third_party.evan@chromium.org2010-03-221-1/+3
| | | | | | | | | | Allow special cases in licenses.py for when we pull code directly from an upstream and can't check in a README.chromium. (In particular, we'll need this for WebKit.) Review URL: http://codereview.chromium.org/1075015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42288 0039d316-1c4b-4281-b951-d872f2087c98
* libpng: update to 1.2.43agl@chromium.org2010-03-1821-2069/+2932
| | | | | | | | | | | | | | | | | | | | I unpacked libpng 1.2.43 and did: cd third_party/libpng for x in $(ls -1) ; do cp /tmp/libpng-1.2.43/$x .; done The diffs appear to all be safe. The Chromium specific config is in pngusr.h and isn't touched by this change. 1.2.43 fixes http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0205 c7013d773eb45b8ed6a864e419e544106a0dd95d /tmp/libpng-1.2.43.tar.xz BUG=38512 TEST=none http://codereview.chromium.org/1118002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41972 0039d316-1c4b-4281-b951-d872f2087c98
* Dropping unconnected obsolete vsprops files.bradnelson@google.com2010-02-031-12/+0
| | | | | | | | | BUG=8042 TEST=None Review URL: http://codereview.chromium.org/567033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38016 0039d316-1c4b-4281-b951-d872f2087c98
* arm: fix pkgconfig for libpng when cross-compilingpiman@chromium.org2009-12-121-3/+14
| | | | | | Review URL: http://codereview.chromium.org/486039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34394 0039d316-1c4b-4281-b951-d872f2087c98
* Make sure the 'use_system_*' variables are actually visible in the relevant ↵mmoss@google.com2009-12-101-1/+8
| | | | | | | | | | | | | | gyp files. Retrying r34195, this time without libxslt, since we don't want to use the system version of that if we're not also using system libxml (merged from http://codereview.chromium.org/481011). BUG=29738 Review URL: http://codereview.chromium.org/486012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34255 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 34195 - Make sure the 'use_system_*' variables are actually visible ↵jrg@chromium.org2009-12-101-8/+1
| | | | | | | | | | | | | | | | | | | | | in the relevant gyp files. BUG=29738 Review URL: http://codereview.chromium.org/479005 TBR=mmoss@google.com Example choke: http://build.chromium.org/buildbot/waterfall/builders/Linux%20Perf/builds/4382/steps/compile/logs/stdio Compiling /b/slave/chromium-rel-linux-hardy/build/src/sconsbuild/Release/obj/chrome/unit_tests/common/bzip2_unittest.o /b/slave/chromium-rel-linux-hardy/build/src/chrome/common/bzip2_unittest.cc:6:19: error: bzlib.h: No such file or directory Review URL: http://codereview.chromium.org/484003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34213 0039d316-1c4b-4281-b951-d872f2087c98
* Make sure the 'use_system_*' variables are actually visible in the relevant ↵mmoss@google.com2009-12-091-1/+8
| | | | | | | | | | gyp files. BUG=29738 Review URL: http://codereview.chromium.org/479005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34195 0039d316-1c4b-4281-b951-d872f2087c98
* third_party/libpng/pngusr.h renames the various png_* functions to ↵maruel@chromium.org2009-11-071-0/+1
| | | | | | | | | | | | | | | webkit_png_*; however, it missed one: png_write_destroy. This change adds renaming for that function. The file _does_ rename png_read_destroy, as well as other png_write_* functions, so the omission would seem to be an oversight (presumably going back to WebKit) rather than a deliberate choice. Since browers don't generally need to write PNGs, this probably hasn't caused problems before. However, it is causing problems for me now because I am trying to write a Firefox plugin that links in (among other things) the Chromium libpng; because neither Firefox nor Chromium renames the png_write_destroy function, there is a conflict between Firefox's libpng and the one I'm trying to link in. This patch solves the issue for me. BUG=none TEST=none Patch contributed by Matthew Steele Review URL: http://codereview.chromium.org/374016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31359 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
* Build fix: I put the defines in the wrong section.agl@chromium.org2009-08-171-3/+3
| | | | | | | | | | | When building with use_system_libpng, the build will end up using the png.h from third_party because I put the defines stanza in the wrong place. (reported by fta) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23561 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: use 'settings' for system libpng.agl@chromium.org2009-08-061-1/+1
| | | | | | | | It turns out that 'settings' is the correct GYP target type for this sort of thing. Thanks to Evan for pointing out my mistake. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22646 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: add GYP variable to use the system libpng.agl@chromium.org2009-07-271-49/+82
| | | | | | | | | | | | Since our packagers have been requesting that we support using more system libraries, I'm starting to commit these sorts of changes. However, please note that one MUST NOT use the system libpng on, at least, Ubuntu 64-bit. Because Chromium on Linux is still a 32-bit build we end up with the 32-bit compat versions of libraries and, on Ubuntu at least, this includes a very old libpng with security issues. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21663 0039d316-1c4b-4281-b951-d872f2087c98
* This updates the PNG library to 1.2.37, which fixes some bugs internal to ↵gspencer@google.com2009-06-2221-1299/+1658
| | | | | | | | | | the PNG library, and it turns on some functionality that O3D needs for manipulating PNG files: It removes the definition of PNG_NO_WRITE_FILLER, PNG_NO_READ_FILLER, PNG_NO_SEQUENTIAL_READ_SUPPORTED, and PNG_NO_INFO_IMAGE from pngusr.h so that the functions used by O3D to read images progressively and for filler bytes for pixel expansion (RGB -> RGBX) are available. BUG=none TEST=successful trybot run for all platforms. Review URL: http://codereview.chromium.org/140074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18982 0039d316-1c4b-4281-b951-d872f2087c98
* Security bug for libpng, update needed to 1.2.36mhm@chromium.org2009-06-0115-151/+193
| | | | | | | | | | | | There's a new version of libpng, 1.2.36 which fixes a security bug. Chrome/Chromium still runs on 1.2.35 it seems BUG=13046 TEST=Ran tests Review URL: http://codereview.chromium.org/112080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17365 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
* Remove the checked-in scons configuration files.sgk@google.com2009-04-012-119/+0
| | | | | | Review URL: http://codereview.chromium.org/53121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12982 0039d316-1c4b-4281-b951-d872f2087c98
* Switching to gyp generated vcprojs for some components.bradnelson@google.com2009-03-121-129/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes propset changes: Property changes on: C:\clients\chrome6\src\skia ___________________________________________________________________ Modified: svn:ignore - skia.xcodeproj + skia.xcodeproj skia.sln Property changes on: C:\clients\chrome6\src\third_party\zlib ___________________________________________________________________ Modified: svn:ignore - zlib.xcodeproj + zlib.xcodeproj zlib.sln Property changes on: C:\clients\chrome6\src\third_party\libpng ___________________________________________________________________ Modified: svn:ignore - libpng.xcodeproj + libpng.xcodeproj libpng.sln Property changes on: C:\clients\chrome6\src\third_party\libjpeg ___________________________________________________________________ Modified: svn:ignore - libjpeg.xcodeproj + libjpeg.xcodeproj libjpeg.sln Property changes on: C:\clients\chrome6\src\build ___________________________________________________________________ Modified: svn:ignore - all.xcodeproj + all.xcodeproj all.sln All.vcproj Property changes on: C:\clients\chrome6\src\base ___________________________________________________________________ Modified: svn:ignore - base.xcodeproj + base.xcodeproj base.vcproj base_gfx.vcproj base_unittests.vcproj debug_message.vcproj Property changes on: C:\clients\chrome6\src\testing ___________________________________________________________________ Modified: svn:ignore - gtest gtest.xcodeproj + gtest gtest.xcodeproj gtest.sln Review URL: http://codereview.chromium.org/43101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11512 0039d316-1c4b-4281-b951-d872f2087c98
* Rolling back change 11431 (didn't work with a clobber either).bradnelson@google.com2009-03-111-0/+129
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11432 0039d316-1c4b-4281-b951-d872f2087c98
* Attempting to roll out gyp for base.bradnelson@google.com2009-03-111-129/+0
| | | | | | | Broke the build last time. Trying it again, this time with clobber. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11431 0039d316-1c4b-4281-b951-d872f2087c98
* Rolling back change 11429.bradnelson@google.com2009-03-111-0/+129
| | | | | | | | Attempt to roll gyp out for base. The gyp script is not getting called at the right time to make this work. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11430 0039d316-1c4b-4281-b951-d872f2087c98
* junkbradnelson@google.com2009-03-111-129/+0
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11429 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
* GYP it, GYP it good.mark@chromium.org2009-03-021-249/+0
| | | | | | | | Convert the Mac build to the new GYP-based Xcode build, and remove the old Xcode projects. Review URL: http://codereview.chromium.org/28305 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10693 0039d316-1c4b-4281-b951-d872f2087c98
* Import .gyp files into the Chromium treemark@chromium.org2009-02-251-0/+59
| | | | | | Review URL: http://codereview.chromium.org/27158 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10380 0039d316-1c4b-4281-b951-d872f2087c98
* Update libpng to 1.2.35.maruel@chromium.org2009-02-2018-517/+618
| | | | | | Review URL: http://codereview.chromium.org/27005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10118 0039d316-1c4b-4281-b951-d872f2087c98
* Rename README.google to README.chromium.mal@chromium.org2009-01-301-0/+0
| | | | | | | | | No code change. B=4380 Review URL: http://codereview.chromium.org/19501 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8988 0039d316-1c4b-4281-b951-d872f2087c98
* Prep for generated .vcproj files:sgk@google.com2009-01-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix minor stylistic inconsistencies in some .vcproj files: * /> tag termination: net\net_resources.vcproj * Add empty <ToolFiles>, <References> and <Globals> sections: net\net_resources.vcproj third_party\zlib\zlib.vcproj third_party\libpng\libpng.vcproj chrome\tools\test\image_diff\image_diff.vcproj * Remove .\ on file names where its use is inconsistent with the rest of the file names in the .vcproj: net\build\net.vcproj net\build\net_unittests.vcproj chrome\installer\util\util.vcproj * Add explicit RootNamespace attribute: chrome\test\automation\automation.vcproj testing\gtest.vcproj * Fix file order in four locales that don't match other locale .vcproj files: chrome\app\locales\da.vcproj chrome\app\locales\he.vcproj chrome\app\locales\zh-TW.vcproj chrome\app\locales\en-US.vcproj * Remove duplicate files from the list: chrome\browser\views\browser_views.vcproj (event_utils.[ch]) Review URL: http://codereview.chromium.org/18555 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8577 0039d316-1c4b-4281-b951-d872f2087c98
* Generate all chrome .vcproj files:sgk@google.com2009-01-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Path name translation (/ to \) of various MSVSTool attributes. * Explicit keyword= arguments to MSVSProject. This will likely go away eventually in favor of uniform behavior. * Add a relative_path_substitutions array that can be used to substitute in Visual Studio variable like $(OutDir). * Add a local_directory_prefix that can be set to './' to only affect files in the current directory. * Additional Keyword ordering in Tool attributes to continue to match the default order Visual Studio generates. * Add a Derived() proxy class that can wrap a File node to tell the .vcproj generation that we want the derived file, not its source(s), in the file list. * In the individual *.scons files, add the necessary files (mostly .h files) to file lists, and update MSVSProject() calls with the additional necessary information. Result is identical .vcproj files modulo the following differences: * Four locales .vcproj files (da, en-US, he and zh-TW) with source file orders that don't match the other locale .vcproj files have re-ordered file lists to match the rest. * Cosmetic XML changes (white space, ending tags) in: chrome/app/chrome_dll.vcproj chrome/app/generated_resources.vcproj net/build/net_resources.vcproj * Removal or addition of ./ prefixes from various files that don't match the other file specifications within their individual .vcproj files: chrome/installer/util/util.vcproj net/build/net.vcproj net/build/net_unittests.vcproj * Add missing empty sections (<ToolFiles>, <References>, <Globals>) for consistency with other .vcproj files: chrome/tools/test/image_diff/image_diff.vcproj third_party/libpng/libpng.vcproj third_party/zlib/zlib.vcproj * Add missing RootNameSpace attribute: chrome/test/automation/automation.vcproj testing/gtest.vcproj * Use && instead of \r\n as a command separator, to sidestep XML-generation problems: chrome/app/chrome_exe.vcproj * Remove unnecessary (?) duplicate files in the file list: chrome/browser/views/browser_views.vcproj (event_utils.cc and event_utils.h were duplicated) Review URL: http://codereview.chromium.org/17603 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8253 0039d316-1c4b-4281-b951-d872f2087c98
* Updates to Visual Studio project generation to accomodatesgk@google.com2009-01-101-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recent changes and get rid of cut-and-paste: * Add generation of the new net_resource.vcproj file. * Accomodate the net\net.vsprops file. * New base.vcproj dependency in activex_shim_dll.vcproj. * New tld_cleanup.vcproj dependency in net.vcproj. * New ondemand_updates.vcproj dependencies in gcapi_{dll,lib}.vcproj. * Re-order dump_cache.vcproj dependencies to match new checked-in solutions. * New input file directory layout in zlib (minizip folder) and testing\gtest (hierarchy). * Use a new dest= argument to ChromeMSVSSolution() and ChromeMSVSProject() to get rid of cut-and-pste installation code, and provide a central point for controlling when/whether we want to generate the files only under the build directory, or drop them in place for checking in. * Comment out an unnecessarily verbose warning if the buildtarget is executed with an action that we don't map to specific Visual Studio settings. Sometimes this is normal and okay, but the warning should get restored at some point when we work out the precise conditions under which it makes sense. Review URL: http://codereview.chromium.org/17602 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7856 0039d316-1c4b-4281-b951-d872f2087c98
* Mass convert ChromeStaticLibrary -> ChromeLibrary, including pulling the ↵evanm@google.com2008-12-261-1/+1
| | | | | | | | | | | updated ICU dep that uses it as well. Add a SHARED scons command-line flag to build shared libraries. Review URL: http://codereview.chromium.org/16477 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7479 0039d316-1c4b-4281-b951-d872f2087c98
* Initial subset of .vcproj file generation, covering generation of:sgk@google.com2008-12-241-19/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | base\build\base.vcproj base\build\base_gfx.vcproj base\build\base_unittests.vcproj base\build\debug_message.vcproj skia\skia.vcproj testing\gtest.vcproj third_party\icu38\icu.vcproj third_party\icu38\icudt.vcproj third_party\libpng\libpng.vcproj third_party\zlib\zlib.vcproj Supporting work in *.scons files: * Adds .h files to the input_files lists in the various *.scons files. * Add arguments to ChromeMSVSProject() to actually generate the .vcproj files. * Add MSVS.AddConfig() calls to the *.scons files to preserve the .vsprops inclusion in the generated .vcproj files. (These will go away eventually as we migrate away from .vsprops in favor of using the settings from the SCons configuration.) * Add MSVS.AddConfig() calls to preserve the .vsprops inclusion. * Move the special generation of dmg_fp/*.cc files ahead of the input file list so we can list the generated object files. * Change the 'solutions' Alias to 'msvs' so we don't mislead about what will actually be generated. Updates to the new _Node_MSVS.py module with latest from upstream prototype development: * Support configurability of: * buildtarget (used to generat project name) * RootNamespace * relative_path_prefix (to prepend './') * tools (to avoid repetition in the project configs) * Track the Visual Studio hierarchy in SCons Nodes, not DOM, so we can delay evaluation until after the complete configuration has been specified. * Add a FileList base class for the things that need, with a subclass hierarchy for the different concrete things in our tree, and a FileListWalk() function for traversing hierarchies. * Centralize turning strings into Nodes in the args2nodes() method and have AddFiles() just use it. Updates to chromium_builders.py to support all this * Add knowledge about stripping out noncompilable files (.h files) from input_files lists. * Return a Null() class if we're not generating MSVS files so we don't have to hide the other calls in if:-blocks. * Add custom ChromeFileList subclass of MSVS.FileList as a container for the file list manipulation we need to do. * Move the Chrome*() function definitions out to global space, and just use the generate() function for adding them to the passed-in environment as class methods. * Make a change to SCons (in Node/FS.py) to handle polymorphism in the new MSVS Node hierarchy. Review URL: http://codereview.chromium.org/16447 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7467 0039d316-1c4b-4281-b951-d872f2087c98
* Initial generation of native Visual Studio solution filessgk@google.com2008-12-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (project files still to come). To wit: * Solution file configuration is in *_sln.scons files (base\base_sln.scons, chrome\chrome_sln.scons). * Individual Project file configuration is in the the .scons file for the relevant target (base\base_unittests.scons, third_party\libxml\libxml.scons, etc.)--that is, where their file lists will live. * MSVSProject() calls are currently placeholders that establish the existence of Project Nodes (and Project dependencies) but don't yet have actual Project configuration information (file lists, .vsprops, etc.). * Configuraiton is very manual. In particular, the entries in the .sln file will be written out in exactly the order specified in the configuration(s). The current ordering is taken from our existing .sln files, so we can generate virtually the same configurations on output. * Generated solution files are nearly byte-for-byte identical with our existing .sln files, modulo: * net\dump_cache has a WebsiteProperties sections (making that configurable per project isn't important right now); * sandbox\sandbox.sln was missing a dependency of base.vcproj on on debug_message.vcproj (present in other .sln files) * webkit\webkit.sln was missing dependencies of WebCore.vcproj on libxml_config.vcproj and libxslt_config.vcproj (present in chrome.sln); * add a handful of other miscellaneous missing dependencies on various .vcproj definitions in chrome.sln (present in other .sln files). * remove stats_viewer.csproj from chrome.sln (sorry, mbelshe), which was complicating the solution configuration with unnecessary (for us) "Mixed Platform" types; * All MSVSFolder(), MSVSProject() and MSVSSolution() calls have hard-wired guid= values taken from our existing configuration, so we can: 1) verify generation of working configs; 2) minimize diffs when checking in generated .sln files. We can remove these in the future in favor of extracting them from existing .sln files if we wish. * Add ChromeMSVSFolder(), ChromeMSVSProject() and ChromeMSVSSolution() wrappers to chromium_builders.py, that gate the underlying call to the env.MSVS*() builders based on whether env.Bit('msvs') is set (i.e., we're in --mode=msvs). * Remove platform-specific gating of to-be-ported .scons files that we now need to load on any platform to generate coheren MSVS files. Move the env.Bit('windows') tests for actually building their executables into the individual .scons files. Review URL: http://codereview.chromium.org/14472 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7297 0039d316-1c4b-4281-b951-d872f2087c98
* Convert from using env['PLATFORM'] directly to using the more flexiblesgk@google.com2008-12-181-1/+1
| | | | | | | | | | | | | | | | | | 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
* Update libpng to 1.2.33.maruel@chromium.org2008-12-1820-974/+1368
| | | | | | Review URL: http://codereview.chromium.org/15041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7230 0039d316-1c4b-4281-b951-d872f2087c98
* Switch back svn:eol-style=native for .sln, .vcproj and .vsprops files.maruel@chromium.org2008-12-161-123/+123
| | | | | | | Patch fails otherwise on non-Windows platforms. Review URL: http://codereview.chromium.org/14478 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7093 0039d316-1c4b-4281-b951-d872f2087c98
* Changed svn:eol-style of all .sln and .vcproj files to CRLFscherkus@chromium.org2008-12-041-123/+123
| | | | | | Review URL: http://codereview.chromium.org/13133 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6372 0039d316-1c4b-4281-b951-d872f2087c98
* Fix use of LOAD= with WantSystemLib() (we could blow up if a variablesgk@google.com2008-11-211-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Using $CHROME_SRC_DIR in place of hash/..bradnelson@google.com2008-10-221-1/+1
| | | | | | | | 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
* SCons renaming updates for base, net and googleurl:sgk@google.com2008-10-213-77/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: svn://svn.chromium.org/chrome/trunk/src@3675 0039d316-1c4b-4281-b951-d872f2087c98
* Get base/gfx into shape, and start running/passing some base_gfx testsmmentovai@google.com2008-08-191-61/+45
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1066 0039d316-1c4b-4281-b951-d872f2087c98
* Set the svn:eol-style to LF on all SConscript filestc@google.com2008-08-131-77/+77
| | | | | | TBR=evanm git-svn-id: svn://svn.chromium.org/chrome/trunk/src@823 0039d316-1c4b-4281-b951-d872f2087c98
* Undo my extra changes.jabdelmalek@google.com2008-08-071-65/+0
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@491 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2024-08-25 18:51:25 +0000