| OLD | NEW |
| 1 # Copyright (c) 2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 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 # Notes: | 5 # Notes: |
| 6 # This is the main Gears SConscript file. From here, we include sub-scripts | 6 # This is the main Gears SConscript file. From here, we include sub-scripts |
| 7 # that handle building various targets (third party libs, common exes, the | 7 # that handle building various targets (third party libs, common exes, the |
| 8 # browser plugins themselves, and installers). Some sub-scripts return a | 8 # browser plugins themselves, and installers). Some sub-scripts return a |
| 9 # dictionary of variables to be appended to the environment, so other | 9 # dictionary of variables to be appended to the environment, so other |
| 10 # sub-scripts can use them. | 10 # sub-scripts can use them. |
| (...skipping 896 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 907 '-mthumb', | 907 '-mthumb', |
| 908 '-fomit-frame-pointer', | 908 '-fomit-frame-pointer', |
| 909 ], | 909 ], |
| 910 ) | 910 ) |
| 911 | 911 |
| 912 # Custom builder to work around a scons and/or hammer bug. ComponentLibrary | 912 # Custom builder to work around a scons and/or hammer bug. ComponentLibrary |
| 913 # tries to install the library to COMPONENT_LIBRARY_DIR, but since we overrode | 913 # tries to install the library to COMPONENT_LIBRARY_DIR, but since we overrode |
| 914 # that value, scons gets confused. I'm not sure who is at fault here. | 914 # that value, scons gets confused. I'm not sure who is at fault here. |
| 915 # See http://code.google.com/p/chromium/issues/detail?id=4177. | 915 # See http://code.google.com/p/chromium/issues/detail?id=4177. |
| 916 def GearsStaticLibrary(env, *args, **kw): | 916 def GearsStaticLibrary(env, *args, **kw): |
| 917 lib = env.ChromeStaticLibrary(*args, **kw) | 917 lib = env.ChromeLibrary(*args, **kw) |
| 918 env.Install('$COMPONENT_LIBRARY_DIR', lib[0]) | 918 env.Install('$COMPONENT_LIBRARY_DIR', lib[0]) |
| 919 return lib | 919 return lib |
| 920 env.AddMethod(GearsStaticLibrary) | 920 env.AddMethod(GearsStaticLibrary) |
| 921 | 921 |
| 922 # Load all the components | 922 # Load all the components |
| 923 | 923 |
| 924 sconscripts = [ | 924 sconscripts = [ |
| 925 'SConscript.googleurl', | 925 'SConscript.googleurl', |
| 926 'SConscript.libjpeg', | 926 'SConscript.libjpeg', |
| 927 'SConscript.libpng', | 927 'SConscript.libpng', |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 969 env.Append(**browser_outputs) | 969 env.Append(**browser_outputs) |
| 970 | 970 |
| 971 # Note: even though the installers write to $INSTALLER_OUTDIR, they need to | 971 # Note: even though the installers write to $INSTALLER_OUTDIR, they need to |
| 972 # read files from other dirs, so we give them a variant_dir at the toplevel. | 972 # read files from other dirs, so we give them a variant_dir at the toplevel. |
| 973 env.SConscript('SConscript.installers', | 973 env.SConscript('SConscript.installers', |
| 974 exports=['env'], | 974 exports=['env'], |
| 975 variant_dir='$BASE_OUTDIR', | 975 variant_dir='$BASE_OUTDIR', |
| 976 duplicate=0) | 976 duplicate=0) |
| 977 | 977 |
| 978 env.Alias('gears-installers', 'gears') | 978 env.Alias('gears-installers', 'gears') |
| OLD | NEW |