| OLD | NEW |
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 Import('env') | 5 Import('env') |
| 6 | 6 |
| 7 env = env.Clone() | 7 env = env.Clone() |
| 8 | 8 |
| 9 env.ApplySConscript([ | 9 env.ApplySConscript([ |
| 10 '$BREAKPAD_DIR/using_breakpad.scons', | 10 '$BREAKPAD_DIR/using_breakpad.scons', |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 'set_reg_value_work_item.cc', | 45 'set_reg_value_work_item.cc', |
| 46 'shell_util.cc', | 46 'shell_util.cc', |
| 47 'util_constants.cc', | 47 'util_constants.cc', |
| 48 'version.cc', | 48 'version.cc', |
| 49 'work_item.cc', | 49 'work_item.cc', |
| 50 'work_item_list.cc', | 50 'work_item_list.cc', |
| 51 ] | 51 ] |
| 52 | 52 |
| 53 # TODO(port): | 53 # TODO(port): |
| 54 if env.Bit('windows'): | 54 if env.Bit('windows'): |
| 55 env.ChromeStaticLibrary('util', input_files) | 55 env.ChromeLibrary('util', input_files) |
| 56 | 56 |
| 57 env.ChromeMSVSProject('$CHROME_DIR/installer/util/util.vcproj', | 57 env.ChromeMSVSProject('$CHROME_DIR/installer/util/util.vcproj', |
| 58 dependencies = [ | 58 dependencies = [ |
| 59 ('$CHROME_DIR/installer/util/prebuild/' + | 59 ('$CHROME_DIR/installer/util/prebuild/' + |
| 60 'util_prebuild.vcproj'), | 60 'util_prebuild.vcproj'), |
| 61 ], | 61 ], |
| 62 guid='{EFBB1436-A63F-4CD8-9E99-B89226E782EC}') | 62 guid='{EFBB1436-A63F-4CD8-9E99-B89226E782EC}') |
| 63 | 63 |
| 64 | 64 |
| 65 # TODO(port): | 65 # TODO(port): |
| 66 if env.Bit('windows'): | 66 if env.Bit('windows'): |
| 67 # create_string_rc.py imports FP.py from the tools/grit/grit/extern | 67 # create_string_rc.py imports FP.py from the tools/grit/grit/extern |
| 68 # directory, so add that to PYTHONPATH for this command execution. | 68 # directory, so add that to PYTHONPATH for this command execution. |
| 69 env_x = env.Clone() | 69 env_x = env.Clone() |
| 70 env_x.AppendENVPath('PYTHONPATH', | 70 env_x.AppendENVPath('PYTHONPATH', |
| 71 [env_x.Dir('$CHROME_SRC_DIR/tools/grit/grit/extern').abspath]) | 71 [env_x.Dir('$CHROME_SRC_DIR/tools/grit/grit/extern').abspath]) |
| 72 env_x.Command(['$CHROME_DIR/installer/util/installer_util_strings.rc', | 72 env_x.Command(['$CHROME_DIR/installer/util/installer_util_strings.rc', |
| 73 '$CHROME_DIR/installer/util/installer_util_strings.h'], | 73 '$CHROME_DIR/installer/util/installer_util_strings.h'], |
| 74 ['$CHROME_DIR/installer/util/prebuild/create_string_rc.py', | 74 ['$CHROME_DIR/installer/util/prebuild/create_string_rc.py', |
| 75 '$CHROME_DIR/app/generated_resources.grd'] + | 75 '$CHROME_DIR/app/generated_resources.grd'] + |
| 76 env.Glob('$CHROME_DIR/app/resources/*.xtb'), | 76 env.Glob('$CHROME_DIR/app/resources/*.xtb'), |
| 77 "$PYTHON ${SOURCES[0]} ${TARGET.dir}") | 77 "$PYTHON ${SOURCES[0]} ${TARGET.dir}") |
| OLD | NEW |