summaryrefslogtreecommitdiffstats
path: root/chrome/installer/mini_installer.gyp
Commit message (Collapse)AuthorAgeFilesLines
* Another attempt to land http://codereview.chromium.org/8589029.siggi@chromium.org2011-11-211-4/+6
| | | | | | | | | | | | | | | | | | Start of mini_installer build config refactoring. Baby step one: - All intermediate files go into the intermediate directory. - The packed_files.txt file is gone, and instead the mini_installer is baked from a resource file output into the intermediate dir. - Cleanup use of implict global "options" in the python script. - Use subprocess.call with a list instead of os.system. R=robertshield@chromium.org,grt@chromium.org BUG=102115 Review URL: http://codereview.chromium.org/8615002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111012 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 110934 - Retry of http://codereview.chromium.org/8589029.siggi@chromium.org2011-11-211-6/+4
| | | | | | | | | | | | | | | | | | | | | Start of mini_installer build config refactoring. Baby step one: - All intermediate files go into the intermediate directory. - The packed_files.txt file is gone, and instead the mini_installer is baked from a resource file output into the intermediate dir. - Cleanup use of implict global "options" in the python script. - Use subprocess.call with a list instead of os.system. R=robertshield@chromium.org,grt@chromium.org BUG=102115 Review URL: http://codereview.chromium.org/8600008 TBR=siggi@chromium.org Review URL: http://codereview.chromium.org/8575019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110936 0039d316-1c4b-4281-b951-d872f2087c98
* Retry of http://codereview.chromium.org/8589029.siggi@chromium.org2011-11-211-4/+6
| | | | | | | | | | | | | | | | | | Start of mini_installer build config refactoring. Baby step one: - All intermediate files go into the intermediate directory. - The packed_files.txt file is gone, and instead the mini_installer is baked from a resource file output into the intermediate dir. - Cleanup use of implict global "options" in the python script. - Use subprocess.call with a list instead of os.system. R=robertshield@chromium.org,grt@chromium.org BUG=102115 Review URL: http://codereview.chromium.org/8600008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110934 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 110703 - Start of mini_installer build config refactoring.siggi@chromium.org2011-11-181-5/+4
| | | | | | | | | | | | | | | | | | | | Baby step one: - All intermediate files go into the intermediate directory. - The packed_files.txt file is gone, and instead the mini_installer is baked from a resource file output into the intermediate dir. - Cleanup use of implict global "options" in the python script. - Use subprocess.call with a list instead of os.system. R=robertshield@chromium.org,grt@chromium.org BUG=102115 Review URL: http://codereview.chromium.org/8589029 TBR=siggi@chromium.org Review URL: http://codereview.chromium.org/8569012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110716 0039d316-1c4b-4281-b951-d872f2087c98
* Start of mini_installer build config refactoring.siggi@chromium.org2011-11-181-4/+5
| | | | | | | | | | | | | | | | | Baby step one: - All intermediate files go into the intermediate directory. - The packed_files.txt file is gone, and instead the mini_installer is baked from a resource file output into the intermediate dir. - Cleanup use of implict global "options" in the python script. - Use subprocess.call with a list instead of os.system. R=robertshield@chromium.org,grt@chromium.org BUG=102115 Review URL: http://codereview.chromium.org/8589029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110703 0039d316-1c4b-4281-b951-d872f2087c98
* Use precompiled headers on Windows only when a flag is set.joi@chromium.org2011-09-271-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | I would have preferred if precompiled headers could be enabled by default. The motivation for this change is primarily that Visual Studio does the wrong thing on preprocessor flag changes - instead of rebuilding precompiled headers, it errors out on any file that uses them, saying that the precompiled header was built with different flags! This causes a world of hurt on our infrastructure stuff, particularly on trybots as they may be jumping back and forth between revisions before and after a flag change. Prior to this change, only Debug builds used precompiled headers and Release builds did not. The reason Release builds did not was that official builds were running out of memory with precompiled headers enabled. The distinction of Debug vs. Release is no longer necessary after the flag is added, so removing that extra bit of complexity from the .gyp files. BUG=none TEST=it builds Review URL: http://codereview.chromium.org/8041022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102839 0039d316-1c4b-4281-b951-d872f2087c98
* Relanding precompiled header support for VS 2008, now enabled forjoi@chromium.org2011-09-201-0/+15
| | | | | | | | | | | | | | | | | Debug builds only as official builds were failing with out of memory errors. This is mostly a revert of http://crrev.com/101836 which was a revert of the original change, http://crrev.com/101474, except for a modification to build/win_precompile.gypi to only enable use of precompiled headers in the Debug configuration. BUG=none TEST=it builds Review URL: http://codereview.chromium.org/7977003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102029 0039d316-1c4b-4281-b951-d872f2087c98
* Temporary revert of r101474, will re-land tomorrow with a change to disable ↵joi@chromium.org2011-09-191-4/+0
| | | | | | | | | | | | | | | | | | | | use of precompiled headers in Release builds as our Canary builds are failing with out of memory messages. Original change description: Switch on use of precompiled headers for VS 2008. The precompiled header brings in more definitions of abs() for the base/time_win.cc file, and a hint to the compiler was needed to let VS 2008 build the file correctly. On VS 2008 only, the mini_installer target did not link correctly with precompiled headers enabled so this change disables them for that project. BUG=none TEST=it builds (esp. on Windows), existing tests pass Review URL: http://codereview.chromium.org/7910002 TBR=laforge@chromium.org Review URL: http://codereview.chromium.org/7945017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101836 0039d316-1c4b-4281-b951-d872f2087c98
* Switch on use of precompiled headers for VS 2008.joi@chromium.org2011-09-161-0/+4
| | | | | | | | | | | | | The precompiled header brings in more definitions of abs() for the base/time_win.cc file, and a hint to the compiler was needed to let VS 2008 build the file correctly. On VS 2008 only, the mini_installer target did not link correctly with precompiled headers enabled so this change disables them for that project. BUG=none TEST=it builds (esp. on Windows), existing tests pass Review URL: http://codereview.chromium.org/7910002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101474 0039d316-1c4b-4281-b951-d872f2087c98
* Make the NaCl windows 64 bit binaries not depend on chrome targets. These ↵jam@chromium.org2011-09-121-1/+0
| | | | | | | | | | | | | targets are very simple and used little code from chrome targets. However their dependency on chrome targets was problematic because a lot of code wasn't being built for 64 bit on Windows, and so there were a lot of "dummy" files being added with stub functions and code was also being compiled out in random places for NACL_WIN64. I've made the NaCl 64 bit windows targets self contained. They do use a few files from common, but those files are self-contained. In the future, we could move these to be in the same 64 bit target as the constants from common. However that won't make a maintenance difference since someone could still introduce link dependencies to other files in common. Additionally, since we're not using chrome code anymore, we can avoid having both nacl.exe and nacl.dll. nacl.exe is sufficient, and this saves 1.4MB of uncompresed binaries in the installer. BUG=86322 Review URL: http://codereview.chromium.org/7863024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100767 0039d316-1c4b-4281-b951-d872f2087c98
* Use precompiled headers for most large projects where the .gyp filejoi@chromium.org2011-09-071-0/+3
| | | | | | | | | | | | | | is not a third party file. On my machine, this speeds up a full recompile of the 'chrome' target in Debug mode by about 18%. BUG=none TEST=it builds, existing tests pass Review URL: http://codereview.chromium.org/7706011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99949 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 98426 - Revert 98103 - Switch to using .pak files for locale data on ↵battre@chromium.org2011-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows. We were using .dlls, but the .pak files are smaller and this will allow us to share more code across platforms. - Remove app/locales.gyp (used on win to generate the locale dlls) and references to it in other gyp(i) files. - Update various packaging scripts. - Move functions from resource_bundle_posix.cc to resource_bundle.cc (LoadResourcesDataPak, UnloadLocaleResources, GetLocalizedString, LoadLocaleResources) and delete the corresponding functions from resource_bundle_win.cc. Fixes from previous patch: - Made dependencies of packed_resources explicit (MSVS can't figure it out from the inputs). - Removed a couple cases where we were looking for dlls on Windows (in l10n_util.cc and l10n_util_unittest.cc). BUG=92724 TBR=cpu Review URL: http://codereview.chromium.org/7714028 TBR=tony@chromium.org Review URL: http://codereview.chromium.org/7744053 TBR=battre@chromium.org Review URL: http://codereview.chromium.org/7759001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98427 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 98103 - Switch to using .pak files for locale data on Windows.battre@chromium.org2011-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using .dlls, but the .pak files are smaller and this will allow us to share more code across platforms. - Remove app/locales.gyp (used on win to generate the locale dlls) and references to it in other gyp(i) files. - Update various packaging scripts. - Move functions from resource_bundle_posix.cc to resource_bundle.cc (LoadResourcesDataPak, UnloadLocaleResources, GetLocalizedString, LoadLocaleResources) and delete the corresponding functions from resource_bundle_win.cc. Fixes from previous patch: - Made dependencies of packed_resources explicit (MSVS can't figure it out from the inputs). - Removed a couple cases where we were looking for dlls on Windows (in l10n_util.cc and l10n_util_unittest.cc). BUG=92724 TBR=cpu Review URL: http://codereview.chromium.org/7714028 TBR=tony@chromium.org Review URL: http://codereview.chromium.org/7744053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98426 0039d316-1c4b-4281-b951-d872f2087c98
* Switch to using .pak files for locale data on Windows.tony@chromium.org2011-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | We were using .dlls, but the .pak files are smaller and this will allow us to share more code across platforms. - Remove app/locales.gyp (used on win to generate the locale dlls) and references to it in other gyp(i) files. - Update various packaging scripts. - Move functions from resource_bundle_posix.cc to resource_bundle.cc (LoadResourcesDataPak, UnloadLocaleResources, GetLocalizedString, LoadLocaleResources) and delete the corresponding functions from resource_bundle_win.cc. Fixes from previous patch: - Made dependencies of packed_resources explicit (MSVS can't figure it out from the inputs). - Removed a couple cases where we were looking for dlls on Windows (in l10n_util.cc and l10n_util_unittest.cc). BUG=92724 TBR=cpu Review URL: http://codereview.chromium.org/7714028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98103 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Switch to using .pak files for locale data on Windows." (r97941)mattm@chromium.org2011-08-241-1/+1
| | | | | | | | | | | Revert "Fix a bug where windows can't find the locale paks." (r97951) Revert "Fix the windows build." (r97954) TBR=tony@chromium.org Review URL: http://codereview.chromium.org/7717017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97968 0039d316-1c4b-4281-b951-d872f2087c98
* Switch to using .pak files for locale data on Windows.tony@chromium.org2011-08-231-1/+1
| | | | | | | | | | | | | | | We were using .dlls, but the .pak files are smaller and this will allow us to share more code across platforms. - Remove app/locales.gyp (used on win to generate the locale dlls) and references to it in other gyp(i) files. - Update various packaging scripts. - Move functions from resource_bundle_posix.cc to resource_bundle.cc (LoadResourcesDataPak, UnloadLocaleResources, GetLocalizedString, LoadLocaleResources) and delete the corresponding functions from resource_bundle_win.cc. BUG=92724 Review URL: http://codereview.chromium.org/7677004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97941 0039d316-1c4b-4281-b951-d872f2087c98
* Make sure /PROFILE is off when linking the mini_installer (Windows)rogerm@google.com2011-08-101-0/+1
| | | | | | | | The mini_installer is linked with /FIXED to avoid creating RELOCs, saving size (about 3K ... is it worth it?). Review URL: http://codereview.chromium.org/7606005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96235 0039d316-1c4b-4281-b951-d872f2087c98
* Fix diff updates for MSI installs. Also makes diff updates possible for GCF ↵grt@chromium.org2011-07-191-0/+2
| | | | | | | | | | | | and pure multi-install updates. While in there, I also removed the old (and no longer used) "-multifail" ap value tag. BUG=72899,89315 TEST=run a diff installer (chrome_updater.exe) and see that it works to update an MSI-based installation of Chrome. R=robertshield@chromium.org Review URL: http://codereview.chromium.org/7401014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93005 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_guid in gyp files in src/chrome/.tony@chromium.org2011-06-231-1/+0
| | | | | | | | BUG=28727 Review URL: http://codereview.chromium.org/7191022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90243 0039d316-1c4b-4281-b951-d872f2087c98
* NaCl: Add the integrated runtime (IRT) library to Windows install imagesmseaborn@chromium.org2011-05-101-0/+2
| | | | | | | | | | | | | | The dependencies in mini_installer.gyp should be OK, because the target that produces chrome.exe also copies nacl_irt_* into <(PRODUCT_DIR) as a side effect. BUG=http://code.google.com/p/nativeclient/issues/detail?id=1595 TEST=not sure how to test this, apart from manually testing the install images that are produced after this is committed Review URL: http://codereview.chromium.org/6995015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84826 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 84252 - NaCl: Add the integrated runtime (IRT) library to install imageshansl@chromium.org2011-05-051-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mac (x86-32 only): chrome/chrome_dll.gypi Linux (x86-32 or x86-64, depending on the target arch): chrome/chrome_installer.gypi chrome/tools/build/linux/FILES.cfg Windows (both x86-32 and x86-64 in the same install image) chrome/installer/mini_installer.gyp chrome/installer/mini_installer/chrome.release chrome/tools/build/win/FILES.cfg I am not sure if I need to add to the lists in chrome/tools/build/{linux,win}/FILES. Since there are files listed in FILES.cfg that are not in FILES, I will assume not. BUG=http://code.google.com/p/nativeclient/issues/detail?id=1595 TEST=not sure how to test this, apart from manually testing the install images that are produced after this is committed Review URL: http://codereview.chromium.org/6927015 TBR=mseaborn@chromium.org Review URL: http://codereview.chromium.org/6927050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84266 0039d316-1c4b-4281-b951-d872f2087c98
* NaCl: Add the integrated runtime (IRT) library to install imagesmseaborn@chromium.org2011-05-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Mac (x86-32 only): chrome/chrome_dll.gypi Linux (x86-32 or x86-64, depending on the target arch): chrome/chrome_installer.gypi chrome/tools/build/linux/FILES.cfg Windows (both x86-32 and x86-64 in the same install image) chrome/installer/mini_installer.gyp chrome/installer/mini_installer/chrome.release chrome/tools/build/win/FILES.cfg I am not sure if I need to add to the lists in chrome/tools/build/{linux,win}/FILES. Since there are files listed in FILES.cfg that are not in FILES, I will assume not. BUG=http://code.google.com/p/nativeclient/issues/detail?id=1595 TEST=not sure how to test this, apart from manually testing the install images that are produced after this is committed Review URL: http://codereview.chromium.org/6927015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84252 0039d316-1c4b-4281-b951-d872f2087c98
* WinDDK ATL and MSVC express 2008/2005 compatability mark@chromium.org2011-03-211-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gives 'out of the box' compatability with VC2008 express - i.e. no modifications needed to system headers or .gyp* files or related hacks. Just set the GYP_MSVS_VERSION to 200Xe (e for express, same as the linked blog on the issue and first google hit as well). 1) Changes to build\common.gypi to turn off to define COMPILER_MSVC_EXPRESS if a express is detected (through the GYP_MSVC_VERSION environment variable), turn off the _SECURE_ATL define (which is flagged as an error with WinDDK's ATL, _SECURE_ATL adds [more] CRT checks to other ATL versions) and hard to link to the atl stdthunk library with express editions. Also, explicitly link to the base WinSDK libraries in common.gypi and mini_installer.gypi for MSVC 2005 express. 2) Fixes a few .cc files that have the wrong include order with the ATL headers when using the Windows DDK ATL. The Windows DDK ATL brings in intsafe.h (WinSDK, not WinDDK) with atlwin.h and generates multiple INTXX_MIN/MAX def warnings which get flagged as errors with the warnings as errors flag if not included before other libraries that have the same definitions like ICU. 3) Changes to .rc files to avoid pulling in afxres.h (an MFC header - it's available in the WinDDK) and winres.h which VCExpress doesn't have (it's available in a WinSDK sample, but that kind of the purpose of it). The main Chromium .rc files are already structured this way, I just changed the rest and changed the output of grit to do the same. 4) Removes the memset obj file linking in mini_installer.gyp and simply implements memset for mini_installer.cc. Only changes to the chromium branch now. There are some .rc files in the Python26, Native Client, and Angle in samples that could #3 changes. They are not required for Chromium, however. ------ VC2005SP1 can be downloaded at http://www.microsoft.com/downloads/en/details.aspx?FamilyId=7B0B0339-613A-46E6-AB4D-080D4D4A8C4E&displaylang=en (or non-SP1 at http://download.microsoft.com/download/8/3/a/83aad8f9-38ba-4503-b3cd-ba28c360c27b/ENU/vcsetup.exe) VC2008SP1 can be downloaded at http://www.microsoft.com/downloads/en/details.aspx?FamilyId=F3FBB04E-92C2-4701-B4BA-92E26E408569&displaylang=en currently. The base developer instructions work fine afterwards with a couple tweaks for express versions: http://www.chromium.org/developers/how-tos/build-instructions-windows Under "Additional (free) downloads" under step 2: X) Only the first 3 Non-SP KB Patches are needed for express. Don't forget to forget GYP_MSVS_VERSION environment as appropriate - 2008e for Visual C++ 2008 Express, for example. Under "Additional (free) downloads" after step 5 [These only apply to 2008 express, 2005 works fine out of the box]: 6A) Download the WinDDK for the atl headers and libs - http://msdn.microsoft.com/en-us/windows/hardware/gg487463.aspx. It works fine, but you do not need to install the whole DDK. In the WDK directory just install headers.msi, libs_x86fre.msi, and libs_x64fre.msi; just grab the atl headers and atl*.lib libs; right click the installers and uninstall afterwards. Add the appropriate include and lib paths to your global settings. 6B) To build x64 targets (x64 Native Client) download: http://www.cppblog.com/Files/xcpp/VCE64BIT_WIN7SDK.zip Follow the readme instructions. Further information behind that and x64 target building with express: - http://jenshuebel.wordpress.com/2009/02/12/visual-c-2008-express-edition-and-64-bit-targets/ - http://www.cppblog.com/xcpp/archive/2009/09/09/vc2008express_64bit_win7sdk.html ---------------- BUG=1433, 5026, 72885 TEST=Compiles in both Debug and Release mode in Visual C++ Express 2008/2005 and does not effect other build setups. In addition, the WinDDK ATL compiles with the secure_atl=0 in the GYP_DEFINES environment variable on non-express versions of MSVC. Review URL: http://codereview.chromium.org/6676030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78921 0039d316-1c4b-4281-b951-d872f2087c98
* Switch out the setup api for using the cabinet API directly.tommi@chromium.org2011-03-161-2/+2
| | | | | | | | | | | | | | The setup API and tools such as expand.exe and makecab.exe all use the cabinet API. However, the setup API has additional dependencies that we don't need or want in the mini installer. So, this is a part of a pet pieve effort of mine to remove these dependencies and hopefully reduce the number of installation failures. TEST=Run accompanied unit test and also make sure that the mini installer works as before. BUG=none Review URL: http://codereview.chromium.org/6693015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78434 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up temporary files and folders left over from previous installations.tommi@chromium.org2011-03-161-2/+2
| | | | | | | | | | | | | | | | | | | | Installation failures due to out-of-disk-space seem to be getting more and more frequent and upon inspection, I found that we can in some cases do a terrible job and leave cruft behind. Worst of all we can do this if an installation fails due to low free disk space, thus only adding to the problem. I suspect there maybe users stuck on a specific revision of Chrome because of this. I'm also implementing Robert's idea of supporting for a --cleanup command line arg that can be passed to the mini installer to only do the cleanup and not the installation. BUG=74777 TEST=This should reduce the number of crashes we're getting due to out of disk space. Review URL: http://codereview.chromium.org/6670023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78424 0039d316-1c4b-4281-b951-d872f2087c98
* Drop the icu version number from the name of icu data file on Windows. jshin@chromium.org2011-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | This is to avoid having to change a bunch of build/release configuration files everytime ICU version is changed. This will bring in the following two CLs in ICU and googleurl: http://codereview.chromium.org/6625032 http://codereview.chromium.org/6623060 BUG=74076 TEST=Chrome can be built and a binary built runs fine with an accompanying Chrome CL in place. Review URL: http://codereview.chromium.org/6624060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77684 0039d316-1c4b-4281-b951-d872f2087c98
* ICU 4.6 upgrade chrome changes in phase 2jshin@chromium.org2011-02-241-1/+1
| | | | | | | | | | | | | | | | | A bunch of hard-coded references to icudt42.dll are updated to refer to icudt46.dll. See also http://codereview.chromium.org/6575042/ (and there's one more accompanying CL - internal). I'll follow up this CL with a change to rename icudtXX.dll to icudt.dll so that I don't have to do this again next time. BUG=73991,61514 TEST=daily archived builds have icudt46.dll Review URL: http://codereview.chromium.org/6580046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75961 0039d316-1c4b-4281-b951-d872f2087c98
* Hack to have Chrome compile under Visual Studio 2010. The files ↵jeanluc@chromium.org2011-02-141-5/+22
| | | | | | | | | | | | | | | crt/src/intel/mt_lib/memset.obj and P4_memset.obj are not distributed with VS2010. For now, include those distributed with 2009. The downside is that you can't compile with only VS2010 installed. BUG=25628 Review URL: http://codereview.chromium.org/6509008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74777 0039d316-1c4b-4281-b951-d872f2087c98
* Adding ppGoogleNaClPluginChrome.dll to the list of stuff bundledbradnelson@google.com2011-02-111-0/+1
| | | | | | | | | | | into chrome.packed.7z BUG=http://code.google.com/p/nativeclient/issues/detail?id=1418 TEST=None Review URL: http://codereview.chromium.org/6502008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74678 0039d316-1c4b-4281-b951-d872f2087c98
* Remove need to invoke expand.exe from mini_installer.amit@chromium.org2011-02-081-0/+1
| | | | | | | | | | | | | | | Error 102 (0x66) has one of the highest occurances in setup failures. Once reason could be failure to successfully invoke expand.exe to extract setup.exe. Hopefully this should make this step more reliable. BUG=none TEST=none Review URL: http://codereview.chromium.org/6250175 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74125 0039d316-1c4b-4281-b951-d872f2087c98
* Add support for --multi-install to mini_installer, fixed a memory leak, ↵grt@chromium.org2010-12-201-0/+3
| | | | | | | | | | | | fixed use of Win32 registry API, and refactored SetFullInstallerFlag so that it can be exercised in unit tests (tests to follow). Also explicitly turn off ExceptionHandling in the msvs_settings so that builds succeed in shared_library configs. When --multi-install is not on command-line, "-full" is still added to the appropriate product "ap" value in official builds. When --multi-install is present, "-full" is added to the multi installer's "ap" value unless a product is being migrated from single-install to multi-install, in which case it is put on the product's "ap" value as before. BUG=61609 TEST=Manual for now: run mini_installer.exe in various configurations, inspecting "ap" values as you go. Review URL: http://codereview.chromium.org/6025003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69710 0039d316-1c4b-4281-b951-d872f2087c98
* Include the Chrome Frame binary in Chrome installers. Note that it will only ↵robertshield@chromium.org2010-07-071-56/+0
| | | | | | | | | | | | | be registered (and thus used) if the installer is run with the --chrome-frame flag. Remove a bunch of CF-specific code in the process. BUG=46818 TEST=Can use the same mini_installer.exe to install either Chrome or Chrome Frame. Review URL: http://codereview.chromium.org/2839009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51729 0039d316-1c4b-4281-b951-d872f2087c98
* Break gyp cycles on Linux.tony@chromium.org2010-05-241-1/+1
| | | | | | | | | | The cycle is between installer.gyp and chrome.gyp. The fix is to switch installer.gyp into installer.gypi and include it into chrome.gyp BUG=35308 Review URL: http://codereview.chromium.org/2067018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48007 0039d316-1c4b-4281-b951-d872f2087c98
* svn prop fixes. Applied to all files not in third_party.pkasting@chromium.org2010-03-091-0/+0
| | | | | | | | | | | | * Removed eol-style, executable and mergeinfo from BMP/GIF/ICO/JPEG files, and set correct mime-type. * Removed executable and mergeinfo from .c/.cc/.cpp/.h/.m/.mm and .gyp files, and set eol-style to LF. TBR=evanm BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40991 0039d316-1c4b-4281-b951-d872f2087c98
* Set eol-style for mini_installer.gyp to unbreak the build for people who use ↵pkasting@chromium.org2010-03-081-278/+278
| | | | | | | | | | | Windows Pythons that barf on CRLF. TBR=gregoryd BUG=none TEST=none Review URL: http://codereview.chromium.org/674001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40965 0039d316-1c4b-4281-b951-d872f2087c98
* Remove nacl win64 binary from chrome dependencies, add it to installer ↵gregoryd@google.com2010-03-081-277/+278
| | | | | | | | | | | dependencies. This will allow developers who don't have the 64-bit tools installed to build Chrome successfully (without the support for NaCl on Win64), while making sure all the binaries are in place when building the installer. To build Chrome with NaCl support for Win64 developers will have to build both 'chrome' and 'chrome_nacl_win64' targets. Review URL: http://codereview.chromium.org/671017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40957 0039d316-1c4b-4281-b951-d872f2087c98
* Add 64-bit binaries that are required for NaCl support to Chrome ↵gregoryd@google.com2010-03-041-0/+4
| | | | | | | | | | | installation on Windows. NaCl uses two additional binaries on 64-bit Windows: nacl64.exe and nacl64.dll, so these binaries need to be installed and updated as part of Chrome installation/update. Review URL: http://codereview.chromium.org/567028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40639 0039d316-1c4b-4281-b951-d872f2087c98
* Roll gyp DEPS, and mostly revert r38366 which was fixed better in gyp.mmoss@google.com2010-02-171-3/+1
| | | | | | | | | | This properly triggers build targets that depend on "always run" actions. BUG=22044 Review URL: http://codereview.chromium.org/604061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39223 0039d316-1c4b-4281-b951-d872f2087c98
* Forcing correct subsystem for mini_installer and chrome_frame_mini_installer.robertshield@chromium.org2010-02-171-0/+2
| | | | | | | | | | For some reason 'SubSystem': 2 was getting ignored in the generated projects in spite of being in the target_defaults section for this file. Fixed by adding it again to the Debug_Base and Release_Base configurations. BUG=None TEST=Run mini_installer.exe by double clicking it in Windows Explorer. Verify that no command shell appears. Review URL: http://codereview.chromium.org/601089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39188 0039d316-1c4b-4281-b951-d872f2087c98
* Make LASTCHANGE work properly for make build.mmoss@google.com2010-02-081-1/+3
| | | | | | | | BUG=22044 Review URL: http://codereview.chromium.org/579014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38366 0039d316-1c4b-4281-b951-d872f2087c98
* Cause Chrome Frame mini_installer to generate a separate ↵robertshield@chromium.org2010-01-251-0/+1
| | | | | | | | chrome_frame.packed.7z as a build artifact, since we need that for signing purposes. Review URL: http://codereview.chromium.org/552127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37039 0039d316-1c4b-4281-b951-d872f2087c98
* Adding a secondary mini_installer target for Chrome Frame. This will remove ↵robertshield@chromium.org2010-01-191-124/+185
| | | | | | | | | | | | | | the need to have different build scripts to build either Chrome or Chrome Frame. Also remove the now-unneeded gyp variables 'chrome_frame_define' and 'google_update_appid'. BUG=Both Chrome and Chrome Frame products should be buildable from a single solution file - we shouldn't need to run GYP with different settings to get a CF solution. TEST=none Review URL: http://codereview.chromium.org/542078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36546 0039d316-1c4b-4281-b951-d872f2087c98
* Removing the last remaining vsprops files (that are hooked in).bradnelson@google.com2010-01-041-16/+33
| | | | | | | | | | | | | Also pulling in a newer nacl version. Switching to use AdditionalOptions in list form. BUG=None TEST=None TBR=mmentovai Review URL: http://codereview.chromium.org/523027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35449 0039d316-1c4b-4281-b951-d872f2087c98
* Refactoring build configurations - make it clearer and allow better support ↵gregoryd@google.com2009-12-221-1/+1
| | | | | | | | | | | | | for x64 on Windows TEST=none BUG=29467 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=35012 Review URL: http://codereview.chromium.org/501127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35129 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 35012 - Rearrange build configurations make it clearer and allow ↵gregoryd@google.com2009-12-191-1/+1
| | | | | | | | | | | | | | better support for x64 on Windows TEST=none BUG=29467 Review URL: http://codereview.chromium.org/501127 TBR=gregoryd@google.com Review URL: http://codereview.chromium.org/500149 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35016 0039d316-1c4b-4281-b951-d872f2087c98
* Rearrange build configurations - make it clearer and allow better support ↵gregoryd@google.com2009-12-191-1/+1
| | | | | | | | | | | for x64 on Windows TEST=none BUG=29467 Review URL: http://codereview.chromium.org/501127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35012 0039d316-1c4b-4281-b951-d872f2087c98
* Taking advantage of new configuration inheritance option.bradnelson@chromium.org2009-10-291-26/+0
| | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/342041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30515 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
* Reduce the number of unneeded dependencies.maruel@chromium.org2009-09-251-1/+0
| | | | | | | | | | Split constants in common off so the projects that wants to pull that don't need to pull half-the-world. TEST=still compiles BUG=22926 Review URL: http://codereview.chromium.org/241006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27296 0039d316-1c4b-4281-b951-d872f2087c98