summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_exe.gypi
diff options
context:
space:
mode:
authorgab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 20:15:11 +0000
committergab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 20:15:11 +0000
commit08eccdd88478af40d6550c8f1e51c351bb7123e9 (patch)
treeff8fa815223a411205675d1404c2fffb0a9b790b /chrome/chrome_exe.gypi
parent92afc45a43336c468720a3143e7f2adfa882fa78 (diff)
downloadchromium_src-08eccdd88478af40d6550c8f1e51c351bb7123e9.zip
chromium_src-08eccdd88478af40d6550c8f1e51c351bb7123e9.tar.gz
chromium_src-08eccdd88478af40d6550c8f1e51c351bb7123e9.tar.bz2
Make setup.exe compatible with the component build.
The problem with the current component build is that chrome.exe and setup.exe only know to look for DLLs like base.dll in the current directory (except chrome.dll for which they're hardcoded to know where to look). On an install those DLLs are in the version directory so chrome.exe and setup.exe fail to run not finding required DLLs... To fix this we generate config files (to point in the version directory) and manifests (to list all the DLL dependencies explicitly) to be installed beside the exes. Each DLL also has a manifest in the version directory to give it an "assemblyIdentity" (i.e. a unique name which is referred to as a dependency by each exe's manifest). These manifests are called "assembly manifest" and do NOT interfere with the private manifest possibly embedded in each DLL (details here http://msdn.microsoft.com/en-us/library/windows/desktop/aa374219(v=vs.85).aspx) <dependency> tags then need to be added to chrome.exe.manifest and setup.exe.manifest for each DLL in the version directory it will use (to be safe we make add an entry for all DLLs as there is no downside to referring an unused DLL). In this step, we augment the manifests generated by the build instead of creating new one to make sure any property passed on by the build is kept and that we are only *adding* new functionality without hindering current behavior. NOTE: This CL doesn't make mini_installer.exe compatible with the component build yet (as mini_installer runs setup.exe right after extracting it and without any other DLLs/manifests beside it). However it is now possible to use setup.exe (which takes the exact same parameters as mini_installer.exe) from the build output directory with a component build :)!!! BUG=127233 TEST=Turn on component build with gyp config "component=shared_libary" and make sure we can install chrome with the generated setup.exe. Make sure we can run the installed Chrome. Make sure we can uninstall the installed Chrome (i.e. that setup.exe in <version_dir>/Installer is able to find its DLLs). Review URL: https://chromiumcodereview.appspot.com/10399041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
-rw-r--r--chrome/chrome_exe.gypi7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 1bb2b17..f64af02 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -44,6 +44,13 @@
'INFOPLIST_FILE': 'app/app-Info.plist',
},
'conditions': [
+ ['component == "shared_library"', {
+ 'msvs_settings': {
+ 'VCManifestTool': {
+ 'EmbedManifest': 'false',
+ },
+ },
+ }],
['order_profiling!=0 and (chromeos==1 or OS=="linux")', {
'dependencies' : [
'../tools/cygprofile/cygprofile.gyp:cygprofile',