| OLD | NEW |
| 1 # Copyright 2009, Google Inc. | 1 # Copyright 2009, Google Inc. |
| 2 # All rights reserved. | 2 # All rights reserved. |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 v8_env['ENV']['VSCOMNTOOLS'] = env.subst('$VC80_DIR/Common7/Tools') | 86 v8_env['ENV']['VSCOMNTOOLS'] = env.subst('$VC80_DIR/Common7/Tools') |
| 87 | 87 |
| 88 # SCons crashes if USERPROFILE isn't defined, and it's not defined | 88 # SCons crashes if USERPROFILE isn't defined, and it's not defined |
| 89 # on Vista for some reason, so this is to make the Vista build work. | 89 # on Vista for some reason, so this is to make the Vista build work. |
| 90 try: | 90 try: |
| 91 v8_env['ENV']['USERPROFILE'] = os.environ['USERPROFILE'] | 91 v8_env['ENV']['USERPROFILE'] = os.environ['USERPROFILE'] |
| 92 except KeyError: | 92 except KeyError: |
| 93 v8_env['ENV']['USERPROFILE'] = "" | 93 v8_env['ENV']['USERPROFILE'] = "" |
| 94 | 94 |
| 95 include_path = ";".join( | 95 include_path = ";".join( |
| 96 [v8_env.subst("$INCLUDE"), | 96 [v8_env.subst("$PLATFORM_SDK_VISTA_6_0_DIR/Include"), |
| 97 v8_env.subst("$PLATFORM_SDK_VISTA_6_0_DIR/Include")]) | 97 v8_env.subst("$INCLUDE")]) |
| 98 | 98 |
| 99 try: | 99 try: |
| 100 v8_env['ENV']['INCLUDE'] += ";" + include_path | 100 v8_env['ENV']['INCLUDE'] = include_path + ";" + v8_env['ENV']['INCLUDE'] |
| 101 except KeyError: | 101 except KeyError: |
| 102 v8_env['ENV']['INCLUDE'] = include_path | 102 v8_env['ENV']['INCLUDE'] = include_path |
| 103 | 103 |
| 104 lib_path = ";".join( | 104 lib_path = ";".join( |
| 105 [v8_env.subst("$LIB"), | 105 [v8_env.subst("$PLATFORM_SDK_VISTA_6_0_DIR/Lib"), |
| 106 v8_env.subst("$PLATFORM_SDK_VISTA_6_0_DIR/Lib")]) | 106 v8_env.subst("$LIB")]) |
| 107 | 107 |
| 108 try: | 108 try: |
| 109 v8_env['ENV']['LIB'] += ";" + lib_path | 109 v8_env['ENV']['LIB'] = lib_path + ";" + v8_env['ENV']['LIB'] |
| 110 except KeyError: | 110 except KeyError: |
| 111 v8_env['ENV']['LIB'] = lib_path | 111 v8_env['ENV']['LIB'] = lib_path |
| 112 | 112 |
| 113 v8_no_snapshot = v8_env.Command( | 113 v8_no_snapshot = v8_env.Command( |
| 114 v8_scons_targets_no_snapshot, | 114 v8_scons_targets_no_snapshot, |
| 115 [], | 115 [], |
| 116 ['$V8_SCONS_COM msvcltcg=off snapshot=off sample=shell']) | 116 ['$V8_SCONS_COM msvcltcg=off snapshot=off sample=shell']) |
| 117 | 117 |
| 118 v8_snapshot = v8_env.Command( | 118 v8_snapshot = v8_env.Command( |
| 119 v8_scons_targets_snapshot, | 119 v8_scons_targets_snapshot, |
| 120 [], | 120 [], |
| 121 ['$V8_SCONS_COM msvcltcg=off snapshot=on']) | 121 ['$V8_SCONS_COM msvcltcg=off snapshot=on']) |
| 122 | 122 |
| 123 v8_env.AlwaysBuild(v8_no_snapshot) | 123 v8_env.AlwaysBuild(v8_no_snapshot) |
| 124 v8_env.AlwaysBuild(v8_snapshot) | 124 v8_env.AlwaysBuild(v8_snapshot) |
| 125 | 125 |
| 126 # Tell our SCons invocation to *not* delete v8.lib and the other targets | 126 # Tell our SCons invocation to *not* delete v8.lib and the other targets |
| 127 # before building them, so the subsidiary v8 SCons call doesn't always | 127 # before building them, so the subsidiary v8 SCons call doesn't always |
| 128 # rebuild them (thereby causing us to always rebuild their dependents). | 128 # rebuild them (thereby causing us to always rebuild their dependents). |
| 129 v8_env.Precious(v8_no_snapshot) | 129 v8_env.Precious(v8_no_snapshot) |
| 130 v8_env.Precious(v8_snapshot) | 130 v8_env.Precious(v8_snapshot) |
| 131 | 131 |
| 132 v8_env.Install('$LIB_DIR', v8_lib) | 132 v8_env.Install('$LIB_DIR', v8_lib) |
| OLD | NEW |