build with 2010 support (code changes still needed)

Thu, 14 Jul 2011 17:34:37 -0700

author
Tank_Master
date
Thu, 14 Jul 2011 17:34:37 -0700
changeset 1631
80adebc6e7b5
parent 1630
f4e0f5480551
child 1632
ebba83151ec4

build with 2010 support (code changes still needed)

indra/cmake/00-Common.cmake file | annotate | diff | revisions
indra/cmake/Boost.cmake file | annotate | diff | revisions
indra/cmake/CopyWinLibs.cmake file | annotate | diff | revisions
indra/cmake/JsonCpp.cmake file | annotate | diff | revisions
indra/develop.py file | annotate | diff | revisions
indra/llaudio/llaudiodecodemgr.h file | annotate | diff | revisions
indra/llcommon/llstring.cpp file | annotate | diff | revisions
indra/llcommon/llstring.h file | annotate | diff | revisions
indra/newview/CMakeLists.txt file | annotate | diff | revisions
indra/newview/viewer_manifest.py file | annotate | diff | revisions
install.xml file | annotate | diff | revisions
     1.1 --- a/indra/cmake/00-Common.cmake	Sat Jul 16 11:27:51 2011 -0700
     1.2 +++ b/indra/cmake/00-Common.cmake	Thu Jul 14 17:34:37 2011 -0700
     1.3 @@ -77,7 +77,7 @@
     1.4        /Oy-
     1.5        )
     1.6       
     1.7 -  if(MSVC80 OR MSVC90)
     1.8 +  if(MSVC80 OR MSVC90 OR MSVC10)
     1.9      set(CMAKE_CXX_FLAGS_RELEASE
    1.10        "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
    1.11        CACHE STRING "C++ compiler release options" FORCE)
    1.12 @@ -85,7 +85,7 @@
    1.13      add_definitions(
    1.14        /Zc:wchar_t-
    1.15        )
    1.16 -  endif (MSVC80 OR MSVC90)
    1.17 +  endif (MSVC80 OR MSVC90 OR MSVC10)
    1.18    
    1.19    # Are we using the crummy Visual Studio KDU build workaround?
    1.20    if (NOT VS_DISABLE_FATAL_WARNINGS)
     2.1 --- a/indra/cmake/Boost.cmake	Sat Jul 16 11:27:51 2011 -0700
     2.2 +++ b/indra/cmake/Boost.cmake	Thu Jul 14 17:34:37 2011 -0700
     2.3 @@ -38,6 +38,19 @@
     2.4        set(Boost_WAVE_LIBRARY 
     2.5            optimized libboost_wave-vc90-mt-${BOOST_VERSION}
     2.6            debug libboost_wave-vc90-mt-gd-${BOOST_VERSION})
     2.7 +    else (MSVC90)
     2.8 +      set(Boost_PROGRAM_OPTIONS_LIBRARY 
     2.9 +          optimized libboost_program_options-vc100-mt-${BOOST_VERSION}
    2.10 +          debug libboost_program_options-vc100-mt-gd-${BOOST_VERSION})
    2.11 +      set(Boost_REGEX_LIBRARY
    2.12 +          optimized libboost_regex-vc100-mt-${BOOST_VERSION}
    2.13 +          debug libboost_regex-vc100-mt-gd-${BOOST_VERSION})
    2.14 +      set(Boost_SIGNALS_LIBRARY 
    2.15 +          optimized libboost_signals-vc100-mt-${BOOST_VERSION}
    2.16 +          debug libboost_signals-vc100-mt-gd-${BOOST_VERSION})
    2.17 +      set(Boost_WAVE_LIBRARY 
    2.18 +          optimized libboost_wave-vc100-mt-${BOOST_VERSION}
    2.19 +          debug libboost_wave-vc100-mt-gd-${BOOST_VERSION})
    2.20      endif (MSVC80)
    2.21    elseif (LINUX)
    2.22    	set(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)  	
     3.1 --- a/indra/cmake/CopyWinLibs.cmake	Sat Jul 16 11:27:51 2011 -0700
     3.2 +++ b/indra/cmake/CopyWinLibs.cmake	Thu Jul 14 17:34:37 2011 -0700
     3.3 @@ -5,6 +5,20 @@
     3.4  # VisualStudio. 
     3.5  
     3.6  include(CMakeCopyIfDifferent)
     3.7 +# Provide compiler version awareness
     3.8 +   if (MSVC71)
     3.9 +        set(MSVC_DIR 7.1)
    3.10 +        set(MSVC_SUFFIX 71)
    3.11 +    elseif (MSVC80)
    3.12 +        set(MSVC_DIR 8.0)
    3.13 +        set(MSVC_SUFFIX 80)
    3.14 +    elseif (MSVC90)
    3.15 +        set(MSVC_DIR 9.0)
    3.16 +        set(MSVC_SUFFIX 90)
    3.17 +    elseif (MSVC10)
    3.18 +        set(MSVC_DIR 10.0)
    3.19 +        set(MSVC_SUFFIX 100)
    3.20 +    endif (MSVC71)
    3.21  
    3.22  set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
    3.23  set(vivox_files
    3.24 @@ -331,26 +345,26 @@
    3.25  
    3.26  # Copy MS C runtime dlls, required for packaging.
    3.27  # *TODO - Adapt this to support VC9
    3.28 -if (MSVC80)
    3.29 -    FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
    3.30 +    FIND_PATH(debug_msvc_redist_path msvcr${MSVC_SUFFIX}d.dll
    3.31          PATHS
    3.32 -         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
    3.33 +        ${MSVC_DEBUG_REDIST_PATH}
    3.34 +         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${MSCV_DIR}\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
    3.35          NO_DEFAULT_PATH
    3.36          NO_DEFAULT_PATH
    3.37          )
    3.38  
    3.39 -    if(EXISTS ${debug_msvc8_redist_path})
    3.40 -        set(debug_msvc8_files
    3.41 -            msvcr80d.dll
    3.42 -            msvcp80d.dll
    3.43 -            Microsoft.VC80.DebugCRT.manifest
    3.44 +    if(EXISTS ${debug_msvc_redist_path})
    3.45 +        set(debug_msvc${MSVC_SUFFIX}_files
    3.46 +            msvcr${MSVC_SUFFIX}d.dll
    3.47 +            msvcp${MSVC_SUFFIX}d.dll
    3.48 +            Microsoft.VC${MSVC_SUFFIX}.DebugCRT.manifest
    3.49              )
    3.50  
    3.51          copy_if_different(
    3.52 -            ${debug_msvc8_redist_path} 
    3.53 +            ${debug_msvc_redist_path} 
    3.54              "${CMAKE_CURRENT_BINARY_DIR}/Debug"
    3.55              out_targets 
    3.56 -            ${debug_msvc8_files}
    3.57 +            ${debug_msvc_files}
    3.58              )
    3.59          set(all_targets ${all_targets} ${out_targets})
    3.60  
    3.61 @@ -360,42 +374,43 @@
    3.62              COMMAND ${PYTHON_EXECUTABLE}
    3.63              ARGS
    3.64                ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
    3.65 -              ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
    3.66 +              ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC${MSVC_SUFFIX}.DebugCRT.manifest
    3.67                ${CMAKE_CURRENT_SOURCE_DIR}/SecondLifeDebug.exe.config
    3.68                ${debug_appconfig_file}
    3.69 -            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
    3.70 +            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC${MSVC_SUFFIX}.DebugCRT.manifest
    3.71              COMMENT "Creating debug app config file"
    3.72              )
    3.73  
    3.74 -    endif (EXISTS ${debug_msvc8_redist_path})
    3.75 +    endif (EXISTS ${debug_msvc_redist_path})
    3.76  
    3.77 -    FIND_PATH(release_msvc8_redist_path msvcr80.dll
    3.78 +    FIND_PATH(release_msvc_redist_path msvcr${MSVC_SUFFIX}.dll
    3.79          PATHS
    3.80 -         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
    3.81 +        ${MSVC_REDIST_PATH}
    3.82 +         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${MSVC_DIR}\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC${MSVC_SUFFIX}.CRT
    3.83          NO_DEFAULT_PATH
    3.84          NO_DEFAULT_PATH
    3.85          )
    3.86  
    3.87 -    if(EXISTS ${release_msvc8_redist_path})
    3.88 +    if(EXISTS ${release_msvc_redist_path})
    3.89          set(release_msvc8_files
    3.90 -            msvcr80.dll
    3.91 -            msvcp80.dll
    3.92 -            Microsoft.VC80.CRT.manifest
    3.93 +            msvcr${MSVC_SUFFIX}.dll
    3.94 +            msvcp${MSVC_SUFFIX}.dll
    3.95 +            Microsoft.VC${MSVC_SUFFIX}.CRT.manifest
    3.96              )
    3.97  
    3.98          copy_if_different(
    3.99 -            ${release_msvc8_redist_path} 
   3.100 +            ${release_msvc_redist_path} 
   3.101              "${CMAKE_CURRENT_BINARY_DIR}/Release"
   3.102              out_targets 
   3.103 -            ${release_msvc8_files}
   3.104 +            ${release_msvc_files}
   3.105              )
   3.106          set(all_targets ${all_targets} ${out_targets})
   3.107  
   3.108          copy_if_different(
   3.109 -            ${release_msvc8_redist_path} 
   3.110 +            ${release_msvc_redist_path} 
   3.111              "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
   3.112              out_targets 
   3.113 -            ${release_msvc8_files}
   3.114 +            ${release_msvc_files}
   3.115              )
   3.116          set(all_targets ${all_targets} ${out_targets})
   3.117  
   3.118 @@ -405,10 +420,10 @@
   3.119              COMMAND ${PYTHON_EXECUTABLE}
   3.120              ARGS
   3.121                ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
   3.122 -              ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
   3.123 +              ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC${MSVC_SUFFIX}.CRT.manifest
   3.124                ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
   3.125                ${release_appconfig_file}
   3.126 -            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
   3.127 +            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC${MSVC_SUFFIX}.CRT.manifest
   3.128              COMMENT "Creating release app config file"
   3.129              )
   3.130  
   3.131 @@ -418,15 +433,14 @@
   3.132              COMMAND ${PYTHON_EXECUTABLE}
   3.133              ARGS
   3.134                ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
   3.135 -              ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
   3.136 +              ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC${MSVC_SUFFIX}.CRT.manifest
   3.137                ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
   3.138                ${relwithdebinfo_appconfig_file}
   3.139 -            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
   3.140 +            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC${MSVC_SUFFIX}.CRT.manifest
   3.141              COMMENT "Creating relwithdebinfo app config file"
   3.142              )
   3.143            
   3.144 -    endif (EXISTS ${release_msvc8_redist_path})
   3.145 -endif (MSVC80)
   3.146 +    endif (EXISTS ${release_msvc_redist_path})
   3.147  
   3.148  add_custom_target(copy_win_libs ALL
   3.149    DEPENDS 
     4.1 --- a/indra/cmake/JsonCpp.cmake	Sat Jul 16 11:27:51 2011 -0700
     4.2 +++ b/indra/cmake/JsonCpp.cmake	Thu Jul 14 17:34:37 2011 -0700
     4.3 @@ -18,6 +18,10 @@
     4.4        set(JSONCPP_LIBRARIES 
     4.5          debug json_vc90d
     4.6          optimized json_vc90)
     4.7 +    elseif (MSVC10)
     4.8 +      set(JSONCPP_LIBRARIES 
     4.9 +        debug json_vc10d
    4.10 +        optimized json_vc10)
    4.11  	endif(MSVC80)
    4.12    elseif (DARWIN)
    4.13      set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt)
     5.1 --- a/indra/develop.py	Sat Jul 16 11:27:51 2011 -0700
     5.2 +++ b/indra/develop.py	Thu Jul 14 17:34:37 2011 -0700
     5.3 @@ -481,11 +481,16 @@
     5.4          'vc90' : {
     5.5              'gen' : r'Visual Studio 9 2008',
     5.6              'ver' : r'9.0'
     5.7 +            },
     5.8 +        'vc100' : {
     5.9 +            'gen' : r'Visual Studio 10',
    5.10 +            'ver' : r'10.0'
    5.11              }
    5.12          }
    5.13      gens['vs2003'] = gens['vc71']
    5.14      gens['vs2005'] = gens['vc80']
    5.15      gens['vs2008'] = gens['vc90']
    5.16 +    gens['vs2010'] = gens['vc100']
    5.17  
    5.18      search_path = r'C:\windows'
    5.19      exe_suffixes = ('.exe', '.bat', '.com')
    5.20 @@ -497,14 +502,14 @@
    5.21  
    5.22      def _get_generator(self):
    5.23          if self._generator is None:
    5.24 -            for version in 'vc80 vc90 vc71'.split():
    5.25 +            for version in 'vc80 vc90 vc100 vc71'.split():
    5.26                  if self.find_visual_studio(version):
    5.27                      self._generator = version
    5.28                      print 'Building with ', self.gens[version]['gen']
    5.29                      break
    5.30              else:
    5.31                      print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions'
    5.32 -                    for version in 'vc80 vc90 vc71'.split():
    5.33 +                    for version in 'vc80 vc90 vc100 vc71'.split():
    5.34                          if self.find_visual_studio_express(version):
    5.35                              self._generator = version
    5.36                              self.using_express = True
    5.37 @@ -598,7 +603,7 @@
    5.38      def get_build_cmd(self):
    5.39          if self.incredibuild:
    5.40              config = self.build_type
    5.41 -            if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]:
    5.42 +            if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0', r'10.0' ]:
    5.43                  config = '\"%s|Win32\"' % config
    5.44  
    5.45              return "buildconsole %s.sln /build %s" % (self.project_name, config)
    5.46 @@ -723,8 +728,8 @@
    5.47    -m32 | -m64           build architecture (32-bit or 64-bit)
    5.48    -N | --no-distcc      disable use of distcc
    5.49    -G | --generator=NAME generator name
    5.50 -                        Windows: VC71 or VS2003 (default), VC80 (VS2005) or 
    5.51 -                          VC90 (VS2008)
    5.52 +                        Windows: VC71 or VS2003, VC80 (VS2005) (default)  
    5.53 +                          VC90 (VS2008), or VC100 (VS2010)
    5.54                          Mac OS X: Xcode (default), Unix Makefiles
    5.55                          Linux: Unix Makefiles (default), KDevelop3
    5.56    -p | --project=NAME   set the root project name. (Doesn't effect makefiles)
     6.1 --- a/indra/llaudio/llaudiodecodemgr.h	Sat Jul 16 11:27:51 2011 -0700
     6.2 +++ b/indra/llaudio/llaudiodecodemgr.h	Thu Jul 14 17:34:37 2011 -0700
     6.3 @@ -39,6 +39,7 @@
     6.4  
     6.5  #include "llassettype.h"
     6.6  #include "llframetimer.h"
     6.7 +#include <iterator> 
     6.8  
     6.9  class LLVFS;
    6.10  class LLVorbisDecodeState;
     7.1 --- a/indra/llcommon/llstring.cpp	Sat Jul 16 11:27:51 2011 -0700
     7.2 +++ b/indra/llcommon/llstring.cpp	Thu Jul 14 17:34:37 2011 -0700
     7.3 @@ -161,10 +161,10 @@
     7.4  	return outchars - base;
     7.5  }	
     7.6  
     7.7 -S32 utf16chars_to_wchar(const U16* inchars, llwchar* outchar)
     7.8 +S32 utf16chars_to_wchar(const wchar_t* inchars, llwchar* outchar)
     7.9  {
    7.10 -	const U16* base = inchars;
    7.11 -	U16 cur_char = *inchars++;
    7.12 +	const wchar_t* base = inchars;
    7.13 +	wchar_t cur_char = *inchars++;
    7.14  	llwchar char32 = cur_char;
    7.15  	if ((cur_char >= 0xD800) && (cur_char <= 0xDFFF))
    7.16  	{
    7.17 @@ -223,7 +223,7 @@
    7.18  
    7.19  	S32 i = 0;
    7.20  	// craziness to make gcc happy (llutf16string.c_str() is tweaked on linux):
    7.21 -	const U16* chars16 = &(*(utf16str.begin()));
    7.22 +	const wchar_t* chars16 = &(*(utf16str.begin()));
    7.23  	while (i < len)
    7.24  	{
    7.25  		llwchar cur_char;
    7.26 @@ -244,18 +244,18 @@
    7.27  {
    7.28  	S32 surrogate_pairs = 0;
    7.29  	// ... craziness to make gcc happy (llutf16string.c_str() is tweaked on linux):
    7.30 -	const U16 *const utf16_chars = &(*(utf16str.begin()));
    7.31 +	const wchar_t *const utf16_chars = &(*(utf16str.begin()));
    7.32  	S32 i = 0;
    7.33  	while (i < utf16_len)
    7.34  	{
    7.35 -		const U16 c = utf16_chars[i++];
    7.36 +		const wchar_t c = utf16_chars[i++];
    7.37  		if (c >= 0xD800 && c <= 0xDBFF)		// See http://en.wikipedia.org/wiki/UTF-16
    7.38  		{   // Have first byte of a surrogate pair
    7.39  			if (i >= utf16_len)
    7.40  			{
    7.41  				break;
    7.42  			}
    7.43 -			const U16 d = utf16_chars[i];
    7.44 +			const wchar_t d = utf16_chars[i];
    7.45  			if (d >= 0xDC00 && d <= 0xDFFF)
    7.46  			{   // Have valid second byte of a surrogate pair
    7.47  				surrogate_pairs++;
     8.1 --- a/indra/llcommon/llstring.h	Sat Jul 16 11:27:51 2011 -0700
     8.2 +++ b/indra/llcommon/llstring.h	Thu Jul 14 17:34:37 2011 -0700
     8.3 @@ -378,7 +378,7 @@
     8.4  //
     8.5  // We should never use UTF16 except when communicating with Win32!
     8.6  //
     8.7 -typedef std::basic_string<U16> llutf16string;
     8.8 +typedef std::basic_string<wchar_t> llutf16string;
     8.9  
    8.10  LL_COMMON_API LLWString utf16str_to_wstring(const llutf16string &utf16str, S32 len);
    8.11  LL_COMMON_API LLWString utf16str_to_wstring(const llutf16string &utf16str);
     9.1 --- a/indra/newview/CMakeLists.txt	Sat Jul 16 11:27:51 2011 -0700
     9.2 +++ b/indra/newview/CMakeLists.txt	Thu Jul 14 17:34:37 2011 -0700
     9.3 @@ -1371,10 +1371,13 @@
     9.4  
     9.5  if (WINDOWS)
     9.6      if(MSVC71)
     9.7 -        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES")
     9.8 +        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES /LARGEADDRESSAWARE")
     9.9      else(MSVC71)
    9.10 -        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map")
    9.11 +        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /LARGEADDRESSAWARE")
    9.12      endif(MSVC71)
    9.13 +    if (MSVC10) 
    9.14 +        set(release_flags "/MAPRelease/${VIEWER_BINARY_NAME}.map /LARGEADDRESSAWARE") 
    9.15 +    endif(MSVC10) 
    9.16      
    9.17      set_target_properties(${VIEWER_BINARY_NAME}
    9.18          PROPERTIES
    9.19 @@ -1384,19 +1387,19 @@
    9.20          )
    9.21  
    9.22      # sets the 'working directory' for debugging from visual studio.
    9.23 -    if (NOT UNATTENDED)
    9.24 -        add_custom_command(
    9.25 -            TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
    9.26 -            COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
    9.27 -            ARGS
    9.28 -              --solution 
    9.29 -              ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
    9.30 -              --workingdir
    9.31 -              ${VIEWER_BINARY_NAME}
    9.32 -              ${CMAKE_CURRENT_SOURCE_DIR}
    9.33 -            COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
    9.34 -            )
    9.35 -    endif (NOT UNATTENDED)
    9.36 +    #if (NOT UNATTENDED)
    9.37 +    #    add_custom_command(
    9.38 +    #        TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
    9.39 +    #        COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
    9.40 +    #        ARGS
    9.41 +    #          --solution 
    9.42 +    #          ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
    9.43 +    #          --workingdir
    9.44 +    #          ${VIEWER_BINARY_NAME}
    9.45 +    #          ${CMAKE_CURRENT_SOURCE_DIR}
    9.46 +    #        COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
    9.47 +    #        )
    9.48 +    #endif (NOT UNATTENDED)
    9.49  
    9.50      add_custom_command(
    9.51          TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
    10.1 --- a/indra/newview/viewer_manifest.py	Sat Jul 16 11:27:51 2011 -0700
    10.2 +++ b/indra/newview/viewer_manifest.py	Thu Jul 14 17:34:37 2011 -0700
    10.3 @@ -279,13 +279,13 @@
    10.4                  # These need to be installed as a SxS assembly, currently a 'private' assembly.
    10.5                  # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
    10.6                  if self.args['configuration'].lower() == 'debug':
    10.7 -                    self.path("msvcr80d.dll")
    10.8 -                    self.path("msvcp80d.dll")
    10.9 -                    self.path("Microsoft.VC80.DebugCRT.manifest")
   10.10 +                    self.path("msvcr100d.dll")
   10.11 +                    self.path("msvcp100d.dll")
   10.12 +                    self.path("Microsoft.VC100.DebugCRT.manifest")
   10.13                  else:
   10.14 -                    self.path("msvcr80.dll")
   10.15 -                    self.path("msvcp80.dll")
   10.16 -                    self.path("Microsoft.VC80.CRT.manifest")
   10.17 +                    self.path("msvcr100.dll")
   10.18 +                    self.path("msvcp100.dll")
   10.19 +                    self.path("Microsoft.VC100.CRT.manifest")
   10.20              except RuntimeError:
   10.21                  print "WARNING: not copying VC runtimes to staging area, this will fail if you make an installer from this staging"
   10.22  
    11.1 --- a/install.xml	Sat Jul 16 11:27:51 2011 -0700
    11.2 +++ b/install.xml	Thu Jul 14 17:34:37 2011 -0700
    11.3 @@ -224,9 +224,9 @@
    11.4  					<key>windows</key>
    11.5  					<map>
    11.6  						<key>md5sum</key>
    11.7 -						<string>a02619c1e30a3db02d3883bf1ad7a1e6</string>
    11.8 +						<string>f4c8d035de4b09e7a3401d22c10e0ca3</string>
    11.9  						<key>url</key>
   11.10 -						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.8-windows-20090911.tar.bz2</uri>
   11.11 +						<uri>https://github.com/downloads/NickyPerian/imprudence/apr_suite-1.4.2-windows-20110217Imp.tar.bz2</uri>
   11.12  					</map>
   11.13  				</map>
   11.14  			</map>
   11.15 @@ -339,9 +339,9 @@
   11.16  					<key>windows</key>
   11.17  					<map>
   11.18  						<key>md5sum</key>
   11.19 -						<string>3d4bd78f30f118c6e35f8d367ec25fc2</string>
   11.20 +						<string>17f89b854959b4d728be832d9c8184e4</string>
   11.21  						<key>url</key>
   11.22 -						<uri>http://downloads.phoenixviewer.com/boost-1.43.0-windows-20100902.tar.bz2</uri>
   11.23 +						<uri>https://github.com/downloads/NickyPerian/imprudence/boost_1_45_VC100_libs_inc_patch4073.tar.bz2</uri>
   11.24  					</map>
   11.25  				</map>
   11.26  			</map>
   11.27 @@ -535,9 +535,9 @@
   11.28  					<key>windows</key>
   11.29  					<map>
   11.30  						<key>md5sum</key>
   11.31 -						<string>fcbb695ff203775fad96d184bf5f34fc</string>
   11.32 +						<string>2d21dd5bb019f58a96b72acf6ee42ae2</string>
   11.33  						<key>url</key>
   11.34 -						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freeglut-2.4.0-windows-20090608.tar.bz2</uri>
   11.35 +						<uri>https://github.com/downloads/NickyPerian/imprudence/freeglut-2.6.0-windows-20110214Imp.tar.bz2</uri>
   11.36  					</map>
   11.37  				</map>
   11.38  			</map>
   11.39 @@ -628,9 +628,9 @@
   11.40  					<key>windows</key>
   11.41  					<map>
   11.42  						<key>md5sum</key>
   11.43 -						<string>5b8631fe510d4ebaeb965c673937e1e7</string>
   11.44 +						<string>e026920d08611c57ba625735f3c1989e</string>
   11.45  						<key>url</key>
   11.46 -						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.3.6-windows-freeglut-20090608.tar.bz2</uri>
   11.47 +						<uri>https://github.com/downloads/NickyPerian/imprudence/glui-2.36-windows-20110214Imp.tar.bz2</uri>
   11.48  					</map>
   11.49  				</map>
   11.50  			</map>
   11.51 @@ -811,9 +811,9 @@
   11.52  					<key>windows</key>
   11.53  					<map>
   11.54  						<key>md5sum</key>
   11.55 -						<string>8a6390824f5ad880d164cffafc5f3eeb</string>
   11.56 +						<string>3ba7af1b2c04791cc39b4c23b853a488</string>
   11.57  						<key>url</key>
   11.58 -						<uri>http://downloads.phoenixviewer.com/json-windows-20100902.tar.bz2</uri>
   11.59 +						<uri>https://github.com/downloads/NickyPerian/imprudence/jsonlib_VC100_libs_inc.tar.bz2</uri>
   11.60  					</map>
   11.61  				</map>
   11.62  			</map>
   11.63 @@ -961,9 +961,9 @@
   11.64  					<key>windows</key>
   11.65  					<map>
   11.66  						<key>md5sum</key>
   11.67 -						<string>7cc9626ff4ac035f8605c996d18ea6a9</string>
   11.68 +						<string>df1a432001934f537c4f3385dd3436da</string>
   11.69  						<key>url</key>
   11.70 -						<uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.7.1-20110302.tar.bz2</uri>
   11.71 +						<uri>https://github.com/downloads/NickyPerian/imprudence/llqtwebkit-windows-qt4.7.1-20110117.tar.bz2</uri>
   11.72  					</map>
   11.73  				</map>
   11.74  			</map>
   11.75 @@ -1089,9 +1089,9 @@
   11.76  					<key>linux64</key>
   11.77  					<map>
   11.78  						<key>md5sum</key>
   11.79 -            <string>dded849d4d46fb5d94f088c86407ec98</string>
   11.80 -            <key>url</key>
   11.81 -            <uri>http://phoenixviewer.com/app/oggvorbislib/ogg-vorbis-linux64-1.2.2-1.3.2-20110514.tar.bz2</uri>
   11.82 +						<string>dded849d4d46fb5d94f088c86407ec98</string>
   11.83 +						<key>url</key>
   11.84 +						<uri>http://phoenixviewer.com/app/oggvorbislib/ogg-vorbis-linux64-1.2.2-1.3.2-20110514.tar.bz2</uri>
   11.85  					</map>
   11.86  					<key>windows</key>
   11.87  					<map>

mercurial