summaryrefslogtreecommitdiffstats
path: root/chrome/installer/mini_installer.gyp
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Force inclusion of build/common.gypi for all chromium gyp files.yaar@chromium.org2009-09-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Why: Simpler build code. If everybody includes it, it should be included automatically. Why now: The webkit chromium builds need it be specified, since can't default to build/common.gypi. What was done: 1. build/common.gypi's contents were moved to a new file build/gyp_chromium.gypi 2. tools/gyp/gyp_chromium was moved to build/gyp_chromium and made to automatically include build/gyp_chromium.gypi. 3. lots of gyp files were fixed to not refer to build/common.gypi any more. 4. o3d which also builds independently of chrome, was fixed to have a gyp_o3d that includes gyp_chromium.gypi too. 5. build/common.gypi was left empty, because there are some external projects that still refer to it. Things that are left to do after this patch is in: 1. The following external files (in other repositories) need to stop include common.gypi ./third_party/hunspell/hunspell.gyp ./third_party/icu/icu.gyp ./v8/tools/gyp/v8.gyp 2. Once nobody refers to common.gypi anymore, delete common.gypi -or- Delete gyp_chromium.gypi and move its content back to common.gypi Tested on mac, win and linux. On win, got a few unit tests errors on chrome bookmarks, which should not be related. I'm running again with clobber to verify. Review URL: http://codereview.chromium.org/206006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26302 0039d316-1c4b-4281-b951-d872f2087c98
* Replace icu38/icu38.gyp with icu/icu.gyp in gyp files replace all the ↵jshin@chromium.org2009-09-091-1/+1
| | | | | | | | | | | | | | | | | | references to third_party/icu38 and icudt38.dll with third_party/icu and icudt42.dll in vsprops and cc files. Also, update the icu data module name and the icu data symbol in icu_util.cc In addition, add a dummy C++ source file (xmldummy_mac.cc) to libxml to work around an Xcode bug (xmllint and xmlcatalog are linked with gcc rather than g++ even though it's linked to a "C++ library", libicuuc.a). Also updated is the test results for net_util_unittests. This will not be landed until deps/third_party/icu42 is ready for all 3 platforms (Windows VS build files are not yet updated there). BUG=8198 TEST=On all platforms, all the targets are built fine. Review URL: http://codereview.chromium.org/172031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25708 0039d316-1c4b-4281-b951-d872f2087c98
* Parameterize the Google Update appid at build time instead of hard coding it ↵robertshield@chromium.org2009-09-011-0/+2
| | | | | | | | in the source. Review URL: http://codereview.chromium.org/178011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25072 0039d316-1c4b-4281-b951-d872f2087c98
* Add manifest to mini_installer debug builds.kuchhal@chromium.org2009-08-141-0/+3
| | | | | | | | | BUG=17581 TEST=Build mini_installer debug build and make sure it has manifest. Review URL: http://codereview.chromium.org/165474 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23494 0039d316-1c4b-4281-b951-d872f2087c98
* Add unit tests for unpacking and patching methods.kuchhal@chromium.org2009-08-051-0/+4
| | | | | | | | | BUG=12849 TEST=none Review URL: http://codereview.chromium.org/160623 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22535 0039d316-1c4b-4281-b951-d872f2087c98
* Adding two new windows configuration types:bradnelson@chromium.org2009-08-041-0/+26
| | | | | | | | | | | | | | | | | Purify Release - no tcmalloc This is done more pedantically than I'd like, so I've left in some TODOs. Eventually either gyp needs to support some notion of inheritance in configurations, or maybe we can make clever use of includes. BUG=None TEST=None Review URL: http://codereview.chromium.org/159362 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22433 0039d316-1c4b-4281-b951-d872f2087c98
* Modifying mini_installer to have different additional options.bradnelson@chromium.org2009-07-031-0/+1
| | | | | | | | | | | | This should not affect other targets. BUG=None TEST=None TBR=sgk Review URL: http://codereview.chromium.org/149152 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19916 0039d316-1c4b-4281-b951-d872f2087c98
* Create a project for maintaining default extensions.finnur@chromium.org2009-07-031-0/+1
| | | | | | | | | | | | | | | | | | | | | This project is responsible for listing and copying the extensions we want to ship with Chrome by default. It copies the .crx files listed in the project plus a .json file from: src\chrome\browser\extensions\default_extensions to debug\extensions ... where the mini_installer will pick them up. At the moment only the json file is getting copied, but we can add .crx files when they are ready. BUG=None TEST=I will give a build to QA for testing this. Review URL: http://codereview.chromium.org/155016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19889 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the tree. It looks like the previous change (19561)nsylvain@chromium.org2009-06-301-1/+0
| | | | | | | | | | | | | did not work as expected, since most of the windows machines are red trying to load dwmapi.dll, which should be in the delay load list. I'm reverting part of this change. TBR:bradnelson Review URL: http://codereview.chromium.org/150102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19581 0039d316-1c4b-4281-b951-d872f2087c98
* Learned that mini_installer's linker settings cannot actually be sharedbradnelson@chromium.org2009-06-301-0/+180
| | | | | | | | | | | | | by everyone else. Separated mini_installer into its own gyp file and isolated it from several common settings. BUG=None TEST=None Review URL: http://codereview.chromium.org/150045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19561 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting change 19472.bradnelson@chromium.org2009-06-281-173/+0
| | | | | | | | | | | | Broke the tree.... :-( BUG=None TEST=None TBR=sgk Review URL: http://codereview.chromium.org/150009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19473 0039d316-1c4b-4281-b951-d872f2087c98
* Switching over mini_installer to gyp.bradnelson@chromium.org2009-06-281-0/+173
Ended up moving it to a separate gyp file so that msvs_use_common_release gets applied at the right time (has to be before the include gets evaluated). BUG=None TEST=None TBR=sgk Review URL: http://codereview.chromium.org/150006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19472 0039d316-1c4b-4281-b951-d872f2087c98