summaryrefslogtreecommitdiffstats
path: root/third_party/libjpeg
Commit message (Collapse)AuthorAgeFilesLines
* GN: libjpeg_turbo and various mac fixesjamesr@chromium.org2014-06-171-1/+10
| | | | | | | | | | | | This adds yasm rules for the assembly in libjpeg_turbo and fixes various issues that show up on the Mac GN build. With this blink_heap_unittests builds and runs. R=brettw@chromium.org, kbr@chromium.org Review URL: https://codereview.chromium.org/334013002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277689 0039d316-1c4b-4281-b951-d872f2087c98
* Add GN targets for third_party/libjpeg_turbockocagil@chromium.org2014-05-061-0/+3
| | | | | | | | R=brettw@chromium.org Review URL: https://codereview.chromium.org/267723015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268421 0039d316-1c4b-4281-b951-d872f2087c98
* Add GN buildfile for gfxbrettw@chromium.org2014-04-101-0/+67
| | | | | | | | | | | | | Adds libjpeg and some global flags for Ozone from the GYP build. Improves error messages for mismatched item types I noticed when writing this patch (changes in builder.cc). BUG= R=bradnelson@google.com Review URL: https://codereview.chromium.org/224633002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263086 0039d316-1c4b-4281-b951-d872f2087c98
* Disable getenv() in libjpeg and libjpeg_turbo (roll to 238232)wangxianzhu@chromium.org2013-12-031-0/+3
| | | | | | | | | | | | | | getenv() is used in libjpeg and libjpeg_turbo to get environment variable JPEGMEM which overrides the default max_memory setting from jpeg_mem_init. However, getenv() is not thread-safe. Now libjpeg may be called from multiple threads when impl-side-painting is enabled. BUG=322228 TBR=cpu Review URL: https://codereview.chromium.org/100483003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238278 0039d316-1c4b-4281-b951-d872f2087c98
* Better handle SOS CSi values and ordernoel@chromium.org2013-10-123-0/+26
| | | | | | | | | | | | Image SOS CSi markers should be distinct. Enforce that constraint when reading multiple CSi values in get_sos(). TBR=darin@chromium.org BUG=258723 Review URL: https://codereview.chromium.org/27008002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228354 0039d316-1c4b-4281-b951-d872f2087c98
* In some situation on CrOS we need to have with both IJG libjpeg and ↵saintlou@chromium.org2012-08-292-104/+106
| | | | | | | | | | | | | | | | libjpeg_turbo. This CL update the jpeg name mangling to allow linking both. 1) Prefixing with just chromium_ was insufficient because WebKit will pull libjpeg_turbo on most platforms and that has the same demangling rules 2) Two symbols were missing: jpeg_std_message_table jpeg_natural_order 3) Sorted macros in alpha order. BUG=144296 Review URL: https://chromiumcodereview.appspot.com/10894031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153947 0039d316-1c4b-4281-b951-d872f2087c98
* Add a function to provide the list of third-party directories which are ↵steveblock@chromium.org2012-08-141-0/+1
| | | | | | | | | | | | | | incompatible with Android. For most directories, we use a regex of whitelisted licenses to parse the 'License' field from the metadata. In some case, for example, where a custom license is used, we rely on a new 'Android Compatibility' field. This functionality will be used by the snapshot tool, which will exclude these incompatible directories from the snapshot in the Android tree. BUG=138921 Review URL: https://chromiumcodereview.appspot.com/10829272 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151462 0039d316-1c4b-4281-b951-d872f2087c98
* Make 'License' field in third-party metadata requiredsteveblock@chromium.org2012-08-011-0/+2
| | | | | | | | | | | | | | | | This will simplify the addition of a tool to check licenses for the purpose of the Android WebView build. See also http://codereview.chromium.org/10827099 Also adds other missing fields to these README.chromium files as required by presubmit checks and fixes a regex used to enforce this. BUG=138921 Review URL: https://chromiumcodereview.appspot.com/10821103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149423 0039d316-1c4b-4281-b951-d872f2087c98
* Hook up use_system_libjpeg for Androidsteveblock@chromium.org2012-07-231-0/+5
| | | | | | | | Also enable it by default when builing with the Android build system. Review URL: https://chromiumcodereview.appspot.com/10807019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147850 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up gyp settings for libjpegsteveblock@chromium.org2012-07-181-10/+9
| | | | | | | | | | | | | | | | | The gyp settings for libjpeg currently have a number of problems ... - Settings for using the system libjpeg are replicated in the gyp files for both libjpeg and libjpeg_turbo. - The default setting for use_system_libjpeg is different depending on whether libjpeg or libjpeg_turbo is in use. This is unintuitive, as libjpeg_turbo is a drop-in replacement for libjpeg. This patch improves the situation ... - Improve documentation about the interaction between use_system_libjpeg and use_libjpeg_turbo. - Use the libjpeg gyp file whenever use_system_libjpeg==1. This means that the settings for using the system libjpeg are only needed here. (A later patch will remove them from libjpeg_turbo's gyp file). It also means that the libjpeg_turbo repository can be excluded when use_system_libjpeg==1. - Move all settings concerned with use_system_libjpeg to the libjpeg gyp file. Note that with this change, we lose the OS-specific defaults for use_system_libjpeg when use_libjpeg_turbo==0. These defaults are currently not used, as use_libjpeg_turbo==1 always. Review URL: https://chromiumcodereview.appspot.com/10696082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147254 0039d316-1c4b-4281-b951-d872f2087c98
* Remove 'settings' type from gyp filesevan@chromium.org2011-09-221-1/+1
| | | | | | | | | | | It is not actually supported by gyp; the fact that it works is a bug that I am working on fixing. BUG=96629 Review URL: http://codereview.chromium.org/7889051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102306 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the comments setting emands and vim tab width and expansion variables.tony@chromium.org2011-07-111-6/+0
| | | | | | | | | | | | | | | | | These were added in r28089 (http://codereview.chromium.org/256059) but are unnecessary bloat for everyone to carry around, even those that don't use emacs or vim. In an earlier change, I added editor config files in src/tools/emacs/ and src/tools/vim/ so users of the appropriate editor can source those instead. BUG=none TEST=none Review URL: http://codereview.chromium.org/7310019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92046 0039d316-1c4b-4281-b951-d872f2087c98
* Remove msvs_guids from third_party, webkit, tools and views.tony@chromium.org2011-06-141-1/+0
| | | | | | | | BUG=28727 Review URL: http://codereview.chromium.org/7146001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89100 0039d316-1c4b-4281-b951-d872f2087c98
* Final gyp patch to make use of the new cross-platform POSIX defines ↵tony@chromium.org2011-05-231-2/+2
| | | | | | | | toolkit_uses_gtk, os_posix, and use_x11. For lists of source files that use a mix of POSIX and Gtk APIs, toolkit_uses_gtk was given precedence. Solaris was made to use ALSA also, as libasound has been ported to FreeBSD and Solaris as a wrapper around the native OSS. Review URL: http://codereview.chromium.org/7055003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86352 0039d316-1c4b-4281-b951-d872f2087c98
* Globally replace <(library) with static_libraryevan@chromium.org2011-05-191-1/+1
| | | | | | | | | | | We provided <(library) as a variable to support a peculiar build configuration on Linux. We no longer support that build configuration, so we can simplify this code to no longer use a variable. Review URL: http://codereview.chromium.org/7051014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86004 0039d316-1c4b-4281-b951-d872f2087c98
* Cleaning up third_party readmes and adding a template for future use.cdn@chromium.org2011-03-161-0/+2
| | | | | | | | | | | The next step is a presubmit rule that will make people use the template. We are doing this so that we can better track dependancy versions. BUG=None TEST=N/A Review URL: http://codereview.chromium.org/6610030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78316 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-0/+75
| | | | | | | | | | 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
* Pass license check script for most of the tree.evan@chromium.org2010-03-191-0/+3
| | | | | | | | | | | | | Modified license-checker script to allow pruning directories we know to be ok. Still need to do a bit of third_party/* , as well as file a bunch of bugs on pieces where the licenses aren't clear, but I'm running out of energy. Review URL: http://codereview.chromium.org/1100003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42045 0039d316-1c4b-4281-b951-d872f2087c98
* Dropping unconnected obsolete vsprops files.bradnelson@google.com2010-02-031-11/+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
* 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
* 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
* Linux: add GYP flag to build with system jpeg.agl@chromium.org2009-08-061-68/+92
| | | | | | | | | | This follows the general style of r21663, which we agreed was the way to do this. http://codereview.chromium.org/164080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22645 0039d316-1c4b-4281-b951-d872f2087c98
* Mangle the names of the libjpeg functions so gtk/gdk doesn't try to use our ↵estade@chromium.org2009-07-033-0/+121
| | | | | | | | | | | libjpeg. TEST=along with <http://codereview.chromium.org/151100>, it's possible to preview jpeg images BUG=none Review URL: http://codereview.chromium.org/151163 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19873 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-161/+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-265/+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/+265
| | | | 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-265/+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/+265
| | | | | | | | 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-265/+0
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11429 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing typo in gyp file guid.bradnelson@google.com2009-03-111-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11425 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-373/+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/+79
| | | | | | Review URL: http://codereview.chromium.org/27158 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10380 0039d316-1c4b-4281-b951-d872f2087c98
* Fix duplicate entries in third_party scons files.thestig@chromium.org2009-02-131-18/+0
| | | | | | Review URL: http://codereview.chromium.org/20365 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9775 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
* Generation of .vcproj files for remaining third_party components.sgk@google.com2009-01-272-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | Updates the .vcproj files themselves for stylistic consistency with the rest. Affected .vcproj files: * No change (byte-for-byte identical): third_party\libxml\build\libxml.vcproj third_party\bsdiff\bsdiff.vcproj third_party\sqlite\sqlite.vcproj * Add empty <ToolFiles>, <References> and <Globals> sections: third_party\libxslt\build\libxslt.vcproj third_party\bspatch\bspatch.vcproj third_party\bzip2\bzip2.vcproj third_party\lzma\7z_C.vcproj third_party\modp_b64\modp_b64.vcproj third_party\libjpeg\libjpeg.vcproj * Add explicit RootNamspace attribute: third_party\bzip2\bzip2.vcproj * Reorder DisableSpecificWarnings and PreprocessorDefinitions attributes in VCCLCompilerTool: third_party\bzip2\bzip2.vcproj Review URL: http://codereview.chromium.org/18785 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8688 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 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-2/+2
| | | | | | | | | | | | | | | | | | 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
* Switch back svn:eol-style=native for .sln, .vcproj and .vsprops files.maruel@chromium.org2008-12-161-259/+259
| | | | | | | 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-259/+259
| | | | | | 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-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Refactor building unit_tests with SCons for the new structure:sgk@google.com2008-11-031-0/+36
| | | | | | | | | | | | | | | | | | | | * Rename SConscript.unit_tests to test/unit/unit_tests.scons. * Add a new chrome/chrome.scons "master" for building everything chrome. Have it just load the existing SConscript file, and the new test/unit/unit_tests.scons file. We'll move things from SConscript (or elsewhere) into chrome.scons as they get convertd. * Change build/SConscript.main to load chrome/chrome.scons. * Add new using_libjpeg.scons, using_libxml.scons, and using_libxslt.scons "properties" files. * Convert test/unit/unit_tests.scons to use the available using_*.scons files. * Combine settings that were scattered throught test/unit/unit_tests.scons to make it a little more readable. * Add $CHROME_DIR/ to the beginning of the file listed in test/unit/unit_tests.scons, since they're now being interpreted from a SConscript file down two directory levels. Review URL: http://codereview.chromium.org/9005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4448 0039d316-1c4b-4281-b951-d872f2087c98
* Removing more dependencies on the relative location of $CHROME_SRC_DIR.bradnelson@google.com2008-10-231-1/+1
| | | | | | Review URL: http://codereview.chromium.org/7860 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3843 0039d316-1c4b-4281-b951-d872f2087c98
* Move libjpeg and libxml Xcode projects over to our new happy familymmentovai@google.com2008-08-221-111/+81
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1206 0039d316-1c4b-4281-b951-d872f2087c98