summaryrefslogtreecommitdiffstats
path: root/third_party/bzip2
Commit message (Collapse)AuthorAgeFilesLines
* 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 yasm and ffmpeg into the build tree for linux.ajwong@chromium.org2009-10-301-1/+1
| | | | | | | | | BUG=22307 TEST=builds correctly, and an html5 video runs. Review URL: http://codereview.chromium.org/300013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30571 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 libbz2.agl@chromium.org2009-08-061-29/+56
| | | | | | | | | | | | | This follows the general style of r21663, which we agreed was the way to do this. Note that, currently, one cannot build with system libbz2 on a 64-bit system since it's not part of the ia32-compat package. http://codereview.chromium.org/165016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22640 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-86/+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 net over to use gyp on windows.bradnelson@google.com2009-03-181-88/+0
| | | | | | Review URL: http://codereview.chromium.org/48108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11942 0039d316-1c4b-4281-b951-d872f2087c98
* Adding back in files lost in 11688.bradnelson@google.com2009-03-141-0/+88
| | | | | | Review URL: http://codereview.chromium.org/46075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11694 0039d316-1c4b-4281-b951-d872f2087c98
* Switching net to gyp on windows.bradnelson@google.com2009-03-131-88/+0
| | | | | | Review URL: http://codereview.chromium.org/42184 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11688 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-213/+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/+39
| | | | | | Review URL: http://codereview.chromium.org/27158 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10380 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-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | 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-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
* Switch back svn:eol-style=native for .sln, .vcproj and .vsprops files.maruel@chromium.org2008-12-161-81/+81
| | | | | | | 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-81/+81
| | | | | | 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-212-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Allow chromium to be built with some system libs by introducingevanm@google.com2008-11-121-1/+1
| | | | | | | | | | | | | | a variable called SYSTEM_LIBS, consisting of a comma-separated list of system libraries. So far, bzip2, libpng, libjpeg, libxml, libxslt, lzma_sdk, zlib, hunspell, sqlite, libevent are recognized. BUG=4321 Review URL: http://codereview.chromium.org/10626 Patch from Fabien Tassin <fta@sofaraway.org>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5320 0039d316-1c4b-4281-b951-d872f2087c98
* SCons renaming updates for base, net and googleurl:sgk@google.com2008-10-213-60/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Use our own bz_internal_errormmentovai@google.com2008-08-271-0/+8
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1457 0039d316-1c4b-4281-b951-d872f2087c98
* Build and run bzip2 and gzip filter tests in net. Brings net, bzip2, and zlibmmentovai@google.com2008-08-181-34/+40
| | | | | | project files into the new xcconfig-based setup. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1001 0039d316-1c4b-4281-b951-d872f2087c98
* Set the svn:eol-style to LF on all SConscript filestc@google.com2008-08-131-60/+60
| | | | | | 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
* Replace our cygwin binaries with another set that we can get the source for ↵jabdelmalek@google.com2008-08-071-0/+65
| | | | | | (checked into cygwin_src). git-svn-id: svn://svn.chromium.org/chrome/trunk/src@490 0039d316-1c4b-4281-b951-d872f2087c98
* Add some licensing/copyright info that is missing from directories in ↵mal@google.com2008-08-052-0/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | third_party. buildbot\pylibs\simplejson :: missing LICENSE.txt (referenced in README.google) bzip2\ :: No README or LICENSE file cygwin\ :: README.google refers to an intranet host libjpeg\ :: Missing README listed in Copyright header libxml\ :: refers to an intranet host --- cygwin\ :: Add the CYGWIN_LICENSE from the web and a copy of the GPLv2 license that the CYGWIN_LICENSE says you should have received. CYGWIN_LICENSE is taken directly from the cygwin CVS server. I won't include the source until we can (at least try to) exclude it from .gclient by default. lzma_sdk\ :: Added reference to license on web to README.google. pthread\ :: Add pointer to source and license info to README.google py\ :: Add pointer to license and copyright info to README.google. svn\ :: Removed reference to svn.corp, made the source of the build more explicit, and added a pointer to license terms. Downloaded COPYING from http://svn.collab.net/viewvc/*checkout*/svn/trunk/COPYING?revision=27760 and included it. ./README.google Created a top-level README.google whose main purpose will be to host a table of license pointers for third_party code (that will come from dannyb and live in the help center, but I think we should have a copy in the tree, too). General note: I'll change README.google to README.chromium globally, once I am sure that is the name we are going to use. BUG=1294007 R= pamg@google.com git-svn-id: svn://svn.chromium.org/chrome/trunk/src@369 0039d316-1c4b-4281-b951-d872f2087c98
* Convert third-party SConscript files to psuedo-builder calls.sgk@google.com2008-08-031-1/+1
| | | | | | | | TBR: evanm,bradnelson git-svn-id: svn://svn.chromium.org/chrome/trunk/src@303 0039d316-1c4b-4281-b951-d872f2087c98
* Update xcodeprojsmmentovai@google.com2008-08-011-0/+199
| | | | | | Review URL: http://chrome-reviews.prom.corp.google.com/996 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256 0039d316-1c4b-4281-b951-d872f2087c98
* Get SCons building Windows again without having to Import()/re-Export(): ↵sgk@google.com2008-07-311-3/+1
| | | | | | | | use the $PLATFORM construction variable supplied in the construction environment instead of passing around our own PLATFORM variable in Python. R=keunwoo,evanm git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202 0039d316-1c4b-4281-b951-d872f2087c98
* Initial commit to get a handful of third_party packages building properly ↵keunwoo@google.com2008-07-311-5/+12
| | | | | | | | | | | | | | | | under Linux. Uses some temporary shims to detect platform and omit processing of some stuff that doesn't seem to work for me. As previously discussed, I'm just doing whatever's expedient to getting *something* building under Linux, since we decided with the current state of Chrome head (with the upcoming freeze and release branch) it would be too disruptive to try to land all the latest site_scons in Chrome's copy. The main thing to note is the SConscript.main.linux file which uses #/../third_party/* instead of #/$BUILD_ROOT/third_party/* and then uses variant_dir in the env.SConscript() call at the bottom to explicitly emit output into Hammer/third_party/*. If either of these hacks is absent, scons under Linux simply concludes that all targets are up to date (there's nothing to build). Explanations for this behavior or alternative workarounds are welcome. Alternatively we could just commit this as-is and let someone with more knowledge of SCons internals try to debug it under Linux. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194 0039d316-1c4b-4281-b951-d872f2087c98
* Initial cleanups en route to coalescing the get-it-built cut-and-paste from ↵sgk@google.com2008-07-311-4/+3
| | | | | | | | | | | | | | | | | | various SConscripts into readable and maintainable shape. To wit: * Put the near-universal settings of /DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS, /DWIN32_LEAN_AND_MEAN, /wd4503 and /wd4819 in the base construction environment. * Sort various unsorted source file lists. * Fix indentation and quoting for consistency in a couple SConscript files that escaped previous dragnets. * Eliminate two left-over uses of Split() for input file lists. * Give the devenv invocation to build v8_shell.exe the full path to the relevant .vcproj file. * Add /nologo to the base LINKFLAGS setting. * Remove various CPPPATH and other settings that have been hanging around commented out from the Visual Studio build (in case we needed them, which we evidently don't). * Get rid of unnecessary env.File() and env.Dir() calls in various settings (esp. CPPPATH) and source file lists. * Add copyright notice to an overlooked SConscript file. * Clean up version.bat invocation. TBR: bradnelson git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174 0039d316-1c4b-4281-b951-d872f2087c98
* Use own our bzip2 error handler instead of the default which prints error ↵deanm@google.com2008-07-302-0/+3
| | | | | | | | | messages to STDERR and calls exit(1). This is better, since we will now crash instead of exiting. This also removes some unnecessary code and error strings from bzip2. BUG=1289861 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121 0039d316-1c4b-4281-b951-d872f2087c98
* Add third_party to the repository.initial.commit2008-07-2712-0/+5290
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19 0039d316-1c4b-4281-b951-d872f2087c98