diff options
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/mini_installer/mini_installer.scons | 24 | ||||
| -rw-r--r-- | chrome/installer/setup/setup.scons | 21 |
2 files changed, 30 insertions, 15 deletions
diff --git a/chrome/installer/mini_installer/mini_installer.scons b/chrome/installer/mini_installer/mini_installer.scons index a6b5dc4..f9d0dd2 100644 --- a/chrome/installer/mini_installer/mini_installer.scons +++ b/chrome/installer/mini_installer/mini_installer.scons @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Import('env', 'env_res') +Import('env') env = env.Clone() @@ -17,11 +17,11 @@ env.ApplySConscript([ # obviously windows-specific things if env['PLATFORM'] == 'win32': - env_res = env_res.Clone() + env_res = env.Clone() env_res.Append( CPPPATH = [ - "$TARGET_ROOT", + "$DESTINATION_ROOT", ".", "$CHROME_SRC_DIR", ], @@ -92,15 +92,23 @@ env.ChromeProgram('mini_installer', input_files) env.AppendENVPath('PATH', r'C:\WINDOWS\system32') -packed = env.Command('$TARGET_ROOT/packed_files.txt', +packed = env.Command('$DESTINATION_ROOT/packed_files.txt', ['$CHROME_DIR/tools/build/win/create_installer_archive.py', '$CHROME_DIR/installer/mini_installer/chrome.release'], ('$PYTHON ${SOURCES[0]}' ' --output_dir=${TARGET.dir}' ' --input_file=${SOURCES[1]}')) -env.Depends(packed, '$TARGET_ROOT/setup.exe') +env.Depends(packed, '$DESTINATION_ROOT/setup.exe') +# mini_installer.rc depends on the generated packed_files.txt +# TODO(sgk): implicit dependency should be picked up automatically +env.Depends(resources, packed) -env.ChromeVersionRC('mini_installer_exe_version.rc', - 'mini_installer_exe_version.rc.version', - PWD=Dir('.')) + +exe_version_rc = env.ChromeVersionRC('mini_installer_exe_version.rc', + 'mini_installer_exe_version.rc.version', + PWD=Dir('.')) + +if env['PLATFORM'] == 'win32': + # TODO(sgk): implicit dependency should be picked up automatically + env_res.Depends(resources, exe_version_rc) diff --git a/chrome/installer/setup/setup.scons b/chrome/installer/setup/setup.scons index 5ea69e5..1a73359 100644 --- a/chrome/installer/setup/setup.scons +++ b/chrome/installer/setup/setup.scons @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Import('env', 'env_res') +Import('env') env = env.Clone() @@ -14,13 +14,13 @@ env.ApplySConscript([ ]) if env['PLATFORM'] == 'win32': - env_res = env_res.Clone() + env_res = env.Clone() env_res.Append( CPPPATH = [ - "$TARGET_ROOT", ".", "$CHROME_SRC_DIR", + "$CHROME_DIR/installer/util", ], RCFLAGS = [ ["/l", "0x409"], @@ -29,11 +29,14 @@ if env['PLATFORM'] == 'win32': resources = env_res.RES('setup.rc') + # TODO(sgk): implicit dependency should be picked up automatically + env_res.Depends(resources, + '$CHROME_DIR/installer/util/installer_util_strings.rc') + env.Prepend( CPPPATH = [ '../util', - '$TARGET_ROOT', '.', '$CHROME_SRC_DIR', ], @@ -80,6 +83,10 @@ input_files = [ env.ChromeProgram('setup', resources + input_files) -env.ChromeVersionRC('setup_exe_version.rc', - 'setup_exe_version.rc.version', - PWD = env.Dir('.')) +exe_version_rc = env.ChromeVersionRC('setup_exe_version.rc', + 'setup_exe_version.rc.version', + PWD = env.Dir('.')) + +if env['PLATFORM'] == 'win32': + # TODO(sgk): implicit dependency should be picked up automatically + env_res.Depends(resources, exe_version_rc) |