summaryrefslogtreecommitdiffstats
path: root/chrome/installer/installer.gyp
Commit message (Collapse)AuthorAgeFilesLines
* Recommit r36640 "Choose right installer strings based on branding."kuchhal@chromium.org2010-01-211-2/+3
| | | | | | Review URL: http://codereview.chromium.org/553037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36706 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r36640 "Choose right installer strings based on branding."kuchhal@chromium.org2010-01-201-3/+2
| | | | | | | | This reverts commit 4a533e019a51b12a0b027243a06da6ee6b2bc49a. Review URL: http://codereview.chromium.org/548089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36643 0039d316-1c4b-4281-b951-d872f2087c98
* Choose right installer strings based on branding.kuchhal@chromium.org2010-01-201-2/+3
| | | | | | | | | BUG=11950 TEST=see bug 11950 Review URL: http://codereview.chromium.org/548081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36640 0039d316-1c4b-4281-b951-d872f2087c98
* Adding a secondary mini_installer target for Chrome Frame. This will remove ↵robertshield@chromium.org2010-01-191-7/+5
| | | | | | | | | | | | | | 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
* Some Chrome Frame cleanup:robertshield@chromium.org2010-01-051-1/+1
| | | | | | | | | | | | | | | | | | 1) Rearrange the chrome_frame.gyp file to: a) Split out most of CF into a static lib to make writing unit tests easier (not having to re-include source files). b) Remove most of the un-needed xulrunner-sdk includes. 2) Move all OBJECT_ENTRY_AUTO macros to chrome_tab.cc since they don't work without extra work when residing in a lib. 3) Rename npchrome_tab.dll to npchrome_frame.dll. BUG=none TEST=none Review URL: http://codereview.chromium.org/523040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35543 0039d316-1c4b-4281-b951-d872f2087c98
* Split installer.gyp and add installer_util_nacl_win64 target.gregoryd@google.com2009-12-051-77/+6
| | | | | | | | | | | This is required for supporting NaCl on 64-bit Windows. 32-bit and 64-bit versions of the installer_util target are now defined in installer_util.gypi and share some of the settings. TEST=none BUG=28176 Review URL: http://codereview.chromium.org/460055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33932 0039d316-1c4b-4281-b951-d872f2087c98
* Chrome updates should not change shortcut icon if there is an index ↵kuchhal@chromium.org2009-12-031-0/+1
| | | | | | | | | | | specified in prefs file. BUG=none TEST=Specify a chrome with alternative icon (using master prefs), install an update and make sure the icon doesnt change. Review URL: http://codereview.chromium.org/455041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33732 0039d316-1c4b-4281-b951-d872f2087c98
* Make Linux packaging options more granular.mmoss@chromium.org2009-11-231-101/+278
| | | | | | | | | This allows us to not waste time building packages/channels we don't care about. Also added option to build new 'trunk' channel packages, which are a special configuration for developer testing. Review URL: http://codereview.chromium.org/418021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32879 0039d316-1c4b-4281-b951-d872f2087c98
* Add a Debian .menu file.thestig@chromium.org2009-11-111-0/+2
| | | | | | | | | | This is the external change. BUG=26826 TEST=none Review URL: http://codereview.chromium.org/388011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31691 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor Linux packaging targets for better dependency tracking.mmoss@chromium.org2009-11-041-22/+44
| | | | | | | | | | This makes sure Linux packages are rebuilt if any of the packaging scripts or config files change. Review URL: http://codereview.chromium.org/360017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31001 0039d316-1c4b-4281-b951-d872f2087c98
* Remove reference to obsolete themes/default.pak (removed in r30644)mmoss@chromium.org2009-11-021-1/+0
| | | | | | | Review URL: http://codereview.chromium.org/341066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30704 0039d316-1c4b-4281-b951-d872f2087c98
* Add yasm and ffmpeg into the build tree for linux.ajwong@chromium.org2009-10-301-3/+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
* Correcting dependency problem that causes setup.exe to get built before ↵robertshield@chromium.org2009-10-191-7/+12
| | | | | | | | | | chrome frame - this results in chrome frame not getting registered when setup is run. BUG=http://crbug.com/25074 TEST=When Chrome Frame is built, the resulting mini_installer registers Chrome Frame. Review URL: http://codereview.chromium.org/298001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29384 0039d316-1c4b-4281-b951-d872f2087c98
* Serialize Linux packaging.thestig@chromium.org2009-10-151-2/+3
| | | | | | | | BUG=none TEST=Google Chrome Linux builder should work again. Review URL: http://codereview.chromium.org/243019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29193 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the base_gfx project since it no longer has an external dependencies.brettw@chromium.org2009-10-141-0/+3
| | | | | | | | | | Replace it with base_i18n which encapsulates all ICU dependencies. BUG=none TEST=none Review URL: http://codereview.chromium.org/267048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29036 0039d316-1c4b-4281-b951-d872f2087c98
* include CHROMEOS files and defintions in TOOLKIT_VEIWS build.oshima@chromium.org2009-10-121-1/+1
| | | | | | | | | | | | | | | | | * changed gyp files so that all files compiled for chrome os will be also compiled when toolkit_views==1 * changed to define OS_CHROMEOS when toolkit_views==1 * changed TabOverbiewMessageListener to use BrowserView instead of BrowserWindowGtk when toolkit_views==1 I left one for CHROME_NOTIFY_FLOATING_TAB_OVER_TOPLEVEL b/c i couldn't figure out how to get gdkwindow from xid. Looks like I need to register it somewhere Note: Nicolas updated trybot and buildbot to include chromeos dependency, so this all should compile fine. BUG=none TEST=run views unit test and browser. Review URL: http://codereview.chromium.org/262027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28764 0039d316-1c4b-4281-b951-d872f2087c98
* Build 64-bit RPMs.thestig@chromium.org2009-10-091-1/+1
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/266024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28589 0039d316-1c4b-4281-b951-d872f2087c98
* Let version.py accept its template on the command linemark@chromium.org2009-10-081-1/+1
| | | | | | Review URL: http://codereview.chromium.org/266016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28398 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
* Reverting 27880 which was itself a revert of 27876.Original codereview at ↵robertshield@chromium.org2009-10-041-0/+3
| | | | | | | | http://codereview.chromium.org/235060/show.There was a small problem with a unittest EXPECT_TRUE condition being dependent on system state, which is now fixed. No other changes have been made from the original CL and now the trybots are up again, this looks to pass.TBR=tommi Review URL: http://codereview.chromium.org/251079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27970 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 27876.robertshield@chromium.org2009-10-021-3/+0
| | | | | | Review URL: http://codereview.chromium.org/256043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27880 0039d316-1c4b-4281-b951-d872f2087c98
* Improving Chrome Frame uninstall process:robertshield@chromium.org2009-10-021-0/+3
| | | | | | | | | | | | | 1) Don't kill chrome.exe when uninstalling. This leads to immediate breakage of any running Chrome Frame windows and is also annoying if the user also happens to be using Google Chrome or some variant thereof. 2) If files are in use at uninstall time, schedule them for deletion and prompt the user to reboot. 3) Remember to remove any pending scheduled deletes at install time. Review URL: http://codereview.chromium.org/235060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27876 0039d316-1c4b-4281-b951-d872f2087c98
* Cleaning up after the initial Chrome Frame commit.robertshield@chromium.org2009-09-281-12/+2
| | | | | | Review URL: http://codereview.chromium.org/242025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27367 0039d316-1c4b-4281-b951-d872f2087c98
* Reduce the number of unneeded dependencies.maruel@chromium.org2009-09-251-1/+1
| | | | | | | | | | 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
* Preliminary fixes to enable link dependent objects.maruel@chromium.org2009-09-241-2/+0
| | | | | | | | BUG=22926 TEST=still builds Review URL: http://codereview.chromium.org/231020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27112 0039d316-1c4b-4281-b951-d872f2087c98
* Update ffmpeg binaries directories to support variants based off the target ↵ajwong@chromium.org2009-09-181-8/+0
| | | | | | | | | | | architecture. BUG=20948 TEST=none Review URL: http://codereview.chromium.org/215016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26630 0039d316-1c4b-4281-b951-d872f2087c98
* Don't build the RPMs for ChromeOS.thestig@chromium.org2009-09-181-1/+1
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/210014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26550 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
* Adding reference to experimental browser distribution files.robertshield@chromium.org2009-09-111-5/+12
| | | | | | Review URL: http://codereview.chromium.org/192076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26036 0039d316-1c4b-4281-b951-d872f2087c98
* Fix installer_util_string's expected output file to match whatsgk@chromium.org2009-09-111-1/+5
| | | | | | | | | create_string_rc.py actually creates. BUG=none TEST=none Review URL: http://codereview.chromium.org/203031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25986 0039d316-1c4b-4281-b951-d872f2087c98
* Adding the option to drop in a new BrowserDistribution instance for ↵robertshield@chromium.org2009-09-111-0/+5
| | | | | | | | experimentation. Review URL: http://codereview.chromium.org/202049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25950 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup installer_util_strings even more.maruel@chromium.org2009-09-091-5/+3
| | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/196067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25775 0039d316-1c4b-4281-b951-d872f2087c98
* Replace icu38/icu38.gyp with icu/icu.gyp in gyp files replace all the ↵jshin@chromium.org2009-09-091-2/+2
| | | | | | | | | | | | | | | | | | 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
* Fix installer_util_strings project with incredibuild.maruel@chromium.org2009-09-091-21/+15
| | | | | | | | | | It was failing to generate $(OutDir)\obj\global_intermediate\installer_util_strings\installer_util_strings.* TEST=none BUG=none Review URL: http://codereview.chromium.org/196046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25694 0039d316-1c4b-4281-b951-d872f2087c98
* Rolling back 25652.bradnelson@chromium.org2009-09-081-1/+0
| | | | | | | | | | BUG=None TEST=None TBR=gregoryd Review URL: http://codereview.chromium.org/196045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25655 0039d316-1c4b-4281-b951-d872f2087c98
* Pulling in latest gyp.bradnelson@chromium.org2009-09-081-0/+1
| | | | | | | | | | | | | Adjusting installer_util_strings to attempt to avoid incredibuild mysterious failure. BUG=None TEST=None TBR=gregoryd Review URL: http://codereview.chromium.org/200046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25652 0039d316-1c4b-4281-b951-d872f2087c98
* Add beta and stable channel packages to Linux official builds.mmoss@chromium.org2009-09-011-34/+95
| | | | | | | | | | This follows the Mac model where all the installer binaries are generated at the same time. Review URL: http://codereview.chromium.org/181036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25078 0039d316-1c4b-4281-b951-d872f2087c98
* Parameterize the Google Update appid at build time instead of hard coding it ↵robertshield@chromium.org2009-09-011-0/+1
| | | | | | | | 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
* Update build to work with native 64-bit Linux packages.mmoss@chromium.org2009-08-251-53/+57
| | | | | | | | | | Also remove the no longer used GTK variable, since the GTK_PATH modification was a hack for 32-bit binaries on 64-bit distros. Review URL: http://codereview.chromium.org/173286 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24186 0039d316-1c4b-4281-b951-d872f2087c98
* Add a dependency from the setup project to support.gyp.robertshield@chromium.org2009-08-211-0/+1
| | | | | | Review URL: http://codereview.chromium.org/174003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23952 0039d316-1c4b-4281-b951-d872f2087c98
* Moving util methods outside of installer tests.anantha@chromium.org2009-08-201-2/+3
| | | | | | Review URL: http://codereview.chromium.org/149217 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23909 0039d316-1c4b-4281-b951-d872f2087c98
* Add more libnss files to lib32.thestig@chromium.org2009-08-181-0/+6
| | | | | | | | TEST=none BUG=19440 Review URL: http://codereview.chromium.org/172067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23618 0039d316-1c4b-4281-b951-d872f2087c98
* Add libnss3.so to the list of files we put in lib32.thestig@chromium.org2009-08-171-9/+10
| | | | | | | | TEST=none BUG=19440 Review URL: http://codereview.chromium.org/171069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23578 0039d316-1c4b-4281-b951-d872f2087c98
* Rebuild RPMs when spec file changes.mmoss@chromium.org2009-08-121-0/+1
| | | | | | | Review URL: http://codereview.chromium.org/165405 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23236 0039d316-1c4b-4281-b951-d872f2087c98
* Add unit tests for unpacking and patching methods.kuchhal@chromium.org2009-08-051-2/+3
| | | | | | | | | 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
* Add some unit tests for master preferences parsing code.kuchhal@chromium.org2009-08-051-0/+2
| | | | | | | | | BUG=12849 TEST=none Review URL: http://codereview.chromium.org/160560 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22493 0039d316-1c4b-4281-b951-d872f2087c98
* Add missing rpm.include file to build output.mmoss@chromium.org2009-07-311-1/+2
| | | | | | | Review URL: http://codereview.chromium.org/159747 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22219 0039d316-1c4b-4281-b951-d872f2087c98
* More complete 'inputs' for Linux packaging targets.mmoss@chromium.org2009-07-301-4/+19
| | | | | | | Review URL: http://codereview.chromium.org/159644 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22077 0039d316-1c4b-4281-b951-d872f2087c98
* Add Linux package building target.mmoss@chromium.org2009-07-301-121/+165
| | | | | | | | | Also rearrange installer targets with better grouping for easier reading. Review URL: http://codereview.chromium.org/159641 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22063 0039d316-1c4b-4281-b951-d872f2087c98
* Linux packaging updates.mdm@chromium.org2009-07-211-1/+1
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/155828 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21237 0039d316-1c4b-4281-b951-d872f2087c98