-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://codereview.secondlife.com/r/305/#review703
-----------------------------------------------------------
Ship it!
This change looks good.
It should be investigated whether other places need changing too. (Either to
VC100, or to not hardcode the compiler name at all ... ideally we'd only set it
at a single place.) If this change builds fine on TeamCity, that investigation
should IMHO not block integration of this change, though, so ship it!
Here's a little search I did. Files where multiple compiler versions occur are
probably fine, but those where only VC80 gets mentioned should be looked at
more closely:
$> ack -a --ignore-case "vc[[:digit:]][[:digit:]]+"
scripts/automated_build_scripts/opensrc-build.sh
110: echo build-vc80
178: cmake_generator="vc80"
autobuild.xml
2034: <string>build-vc100</string>
build.sh
30: echo build-vc100
.hgignore
16:build-vc80/
17:build-vc100/
indra/llcommon/llerror.cpp
1191: // VC80 was optimizing the error away.
indra/llcommon/tests/llallocator_heap_profile_test.cpp
109:"00400000-02681000 r-xp 00000000 00:00 0
c:\\proj\\tcmalloc-eval-9\\indra\\build-vc80\\newview\\RelWithDebInfo\\secondlife-bin.exe\n"
129:"00400000-004d5000 r-xp 00000000 00:00 0
c:\\code\\linden\\tcmalloc\\indra\\build-vc80\\llcommon\\RelWithDebInfo\\llallocator_test.exe\n"
140:"10000000-10041000 r-xp 00000000 00:00 0
c:\\code\\linden\\tcmalloc\\indra\\build-vc80\\llcommon\\RelWithDebInfo\\libtcmalloc_minimal.dll\n"
141:"7c420000-7c4a7000 r-xp 00000000 00:00 0
C:\\WINDOWS\\WinSxS\\x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.1433_x-ww_5cf844d2\\MSVCP80.dll\n"
142:"78130000-781cb000 r-xp 00000000 00:00 0
C:\\WINDOWS\\WinSxS\\x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.1433_x-ww_5cf844d2\\MSVCR80.dll\n";
indra/cmake/Copy3rdPartyLibs.cmake
67:if (MSVC80)
71:
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
80: Microsoft.VC80.DebugCRT.manifest
96:
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
105: Microsoft.VC80.CRT.manifest
126: FIND_PATH(debug_msvc10_redist_path msvcr100d.dll
129:
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC100.DebugCRT
135: if(EXISTS ${debug_msvc10_redist_path})
136: set(debug_msvc10_files
142: ${debug_msvc10_redist_path}
145: ${debug_msvc10_files}
151: FIND_PATH(release_msvc10_redist_path msvcr100.dll
154:
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC100.CRT
160: if(EXISTS ${release_msvc10_redist_path})
161: set(release_msvc10_files
167: ${release_msvc10_redist_path}
170: ${release_msvc10_files}
175: ${release_msvc10_redist_path}
178: ${release_msvc10_files}
183:endif (MSVC80)
indra/cmake/Boost.cmake
21: if(MSVC80)
23: optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
24: debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
26: optimized libboost_regex-vc80-mt-${BOOST_VERSION}
27: debug libboost_regex-vc80-mt-gd-${BOOST_VERSION})
29: optimized libboost_signals-vc80-mt-${BOOST_VERSION}
30: debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
32: optimized libboost_system-vc80-mt-${BOOST_VERSION}
33: debug libboost_system-vc80-mt-gd-${BOOST_VERSION})
35: optimized libboost_filesystem-vc80-mt-${BOOST_VERSION}
36: debug libboost_filesystem-vc80-mt-gd-${BOOST_VERSION})
37: else(MSVC80)
40: optimized libboost_program_options-vc100-mt-${BOOST_VERSION}
41: debug libboost_program_options-vc100-mt-gd-${BOOST_VERSION})
43: optimized libboost_regex-vc100-mt-${BOOST_VERSION}
44: debug libboost_regex-vc100-mt-gd-${BOOST_VERSION})
46: optimized libboost_system-vc100-mt-${BOOST_VERSION}
47: debug libboost_system-vc100-mt-gd-${BOOST_VERSION})
49: optimized libboost_filesystem-vc100-mt-${BOOST_VERSION}
50: debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION})
51: endif (MSVC80)
indra/cmake/JsonCpp.cmake
14: debug json_vc100debug_libmt.lib
15: optimized json_vc100_libmt)
indra/newview/build_win32_appConfig.py
55: src_manifest_name = dst_dir + '/Microsoft.VC80.DebugCRT.manifest'
58: src_manifest_name = dst_dir + '/Microsoft.VC80.CRT.manifest'
indra/newview/llworldmipmap.cpp
188: //imageurl =
"file://C:\\Develop\\mapserver-distribute-3\\indra\\build-vc80\\mapserver\\relwithdebinfo\\regions\\00995\\01001\\region-995-1001-prims.jpg";
indra/newview/viewer_manifest.py
198: test_assembly_binding(src, "Microsoft.VC80.DebugCRT",
"8.0.50727.4053")
200: test_assembly_binding(src, "Microsoft.VC80.CRT",
"8.0.50727.4053")
219: test_assembly_binding(src,
"Microsoft.VC80.DebugCRT", "")
221: test_assembly_binding(src, "Microsoft.VC80.CRT", "")
Binary file indra/newview/app_settings/static_data.db2 matches
indra/newview/app_settings/CA.pem
537:fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt
2921:hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
indra/win_updater/updater.cpp
32:// which generates warnings on VC2005.
indra/fix-incredibuild.py
21: delete_file_types("build-vc80/newview/Release", build_types)
22: delete_file_types("build-vc80/newview/secondlife-bin.dir/Release/",
24: delete_file_types("build-vc80/newview/RelWithDebInfo", build_types)
25:
delete_file_types("build-vc80/newview/secondlife-bin.dir/RelWithDebInfo/",
27: delete_file_types("build-vc80/newview/Debug", build_types)
28: delete_file_types("build-vc80/newview/secondlife-bin.dir/Debug/",
32: delete_file_types("build-vc80/test/RelWithDebInfo", build_types)
33: delete_file_types("build-vc80/test/test.dir/RelWithDebInfo/",
indra/tools/vstool/main.cs
539: version = "VC70";
543: version = "VC71";
547: version = "VC80";
551: version = "VC90";
555: version = "VC100";
578: case "VC70":
582: case "VC71":
586: case "VC80":
590: case "VC90":
594: case "VC100":
- Boroondas
On May 16, 2011, 3:50 p.m., Ima Mechanique wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://codereview.secondlife.com/r/305/
> -----------------------------------------------------------
>
> (Updated May 16, 2011, 3:50 p.m.)
>
>
> Review request for Viewer.
>
>
> Summary
> -------
>
> Autobuild defaults to VC 2005 if the environment variable AUTOBUILD_VSVER is
> unset. Now that LL have moved to VC 2010 completely, shouldn't this become
> the default version?
>
>
> Diffs
> -----
>
> autobuild/autobuild_tool_source_environment.py 2a560b1d8f95
>
> Diff: http://codereview.secondlife.com/r/305/diff
>
>
> Testing
> -------
>
>
> Thanks,
>
> Ima
>
>
_______________________________________________
Policies and (un)subscribe information available here:
http://wiki.secondlife.com/wiki/OpenSource-Dev
Please read the policies before posting to keep unmoderated posting privileges
