summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--autobuild.xml72
-rw-r--r--indra/cmake/JsonCpp.cmake6
-rw-r--r--indra/cmake/PNG.cmake4
-rw-r--r--indra/cmake/XmlRpcEpi.cmake5
-rw-r--r--indra/llmessage/tests/llhost_test.cpp3
-rw-r--r--indra/newview/CMakeLists.txt10
-rw-r--r--indra/newview/lltranslate.cpp2
-rw-r--r--indra/newview/viewer_manifest.py39
-rw-r--r--indra/tools/vstool/VSTool.csproj5
-rwxr-xr-xindra/tools/vstool/VSTool.exebin24576 -> 24576 bytes
-rw-r--r--indra/tools/vstool/VSTool.sln4
-rw-r--r--indra/tools/vstool/main.cs10
12 files changed, 79 insertions, 81 deletions
diff --git a/autobuild.xml b/autobuild.xml
index 379b3253f8..81eb6943d2 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -426,9 +426,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>b9fa0ef683657090ae66663863ebba74</string>
+ <string>d9a9a6ad86895353bcd63374a4c1a91d</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/merov_fmod-autobuild/rev/219050/arch/CYGWIN/installer/fmod-3.75-windows-20110113.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmod-private/rev/221852/arch/CYGWIN/installer/fmod-3.75-windows-20110222.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -522,9 +522,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>f7bd61490e6290b1981538b744919afd</string>
+ <string>271349827b939406162ce42e42cd18e0</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-windows-20101001a.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/221707/arch/CYGWIN/installer/freetype-2.4.4-windows-20110218.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -704,9 +704,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>320972cefe728e668b0dc6356eeda58f</string>
+ <string>627c51136e14e64c5d39933f3abd3bdf</string>
<key>url</key>
- <string>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/google_breakpad-0.0.0-rev599-windows-20110128.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/220211/arch/CYGWIN/installer/google_breakpad-0.0.0-rev599-windows-20110218.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -718,7 +718,7 @@
<key>license</key>
<string>bsd</string>
<key>license_file</key>
- <string>LICENSES/googlemock.txt</string>
+ <string>LICENSES/gmock.txt</string>
<key>name</key>
<string>googlemock</string>
<key>platforms</key>
@@ -752,9 +752,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ec7f12a339ad8c5628db8f8f8fbfe77f</string>
+ <string>212701468920519f3989677cea9ca4f1</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/googlemock-1.1.0-windows-20101001a.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-mock/rev/222036/arch/CYGWIN/installer/gmock-1.5.0-windows-20110224.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -860,9 +860,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>4a4d88f6ba42fa0acd47881f2d7ed7a7</string>
+ <string>a202ec58cef9097c94acfa958ed6da8d</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-windows-20101001b.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jpeglib/rev/221594/arch/CYGWIN/installer/jpeglib-8c-windows-20110217.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -884,9 +884,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>de8b96120c274e052abb4f692861be46</string>
+ <string>22c2ab6ef046c0c1f6cf674297f3e8ef</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220079/arch/Darwin/installer/jsoncpp-0.5.0-darwin-20110131.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/221698/arch/Darwin/installer/jsoncpp-0.5.0-darwin-20110218.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -896,9 +896,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>db7826354e60fb4ae14bf40258c088af</string>
+ <string>20546118096e4828d9f29913ec7d954a</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220079/arch/Linux/installer/jsoncpp-0.5.0-linux-20110131.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/221698/arch/Linux/installer/jsoncpp-0.5.0-linux-20110219.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -908,9 +908,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>afff2018e6a887c281b072eecdd9343e</string>
+ <string>0959e349c4f7c0b33539269502486737</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220579/arch/CYGWIN/installer/jsoncpp-0.5.0-windows-20110208.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/221698/arch/CYGWIN/installer/jsoncpp-0.5.0-windows-20110218.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -956,9 +956,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>0c7b5596c27f511d4957abe35f7f8dee</string>
+ <string>6cd9f36465ef73a3df34bf2b3bba2ced</string>
<key>url</key>
- <string>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-6.4.1-windows-20110113.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-kdu-private/rev/221672/arch/CYGWIN/installer/kdu-6.4.1-windows-20110218.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1004,9 +1004,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>dd0e68bde099def37c6a7527673aa672</string>
+ <string>735a955e6442733e2342ab12c1087488</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-windows-20101001a.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/221747/arch/CYGWIN/installer/libpng-1.5.1-windows-20110221.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1131,18 +1131,6 @@
<key>name</key>
<string>linux</string>
</map>
- <key>windows</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>178a79f9af90b16f0a62430f9fe88f28</string>
- <key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-windows-20101001a.tar.bz2</string>
- </map>
- <key>name</key>
- <string>windows</string>
- </map>
</map>
</map>
<key>ndofdev</key>
@@ -1150,7 +1138,7 @@
<key>license</key>
<string>linden</string>
<key>license_file</key>
- <string>LICENSES/ndofdev.txt</string>
+ <string>LICENSES/libndofdev.txt</string>
<key>name</key>
<string>ndofdev</string>
<key>platforms</key>
@@ -1184,9 +1172,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>9d4f6c042c27fdab81e00238af7e55f0</string>
+ <string>3a4bec9562ed6ac53e85abcb1afc5fc0</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-windows-20101001a.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libndofdev/rev/221922/arch/CYGWIN/installer/libndofdev-0.1-windows-20110223.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1198,7 +1186,7 @@
<key>license</key>
<string>ogg-vorbis</string>
<key>license_file</key>
- <string>LICENSES/ogg.txt</string>
+ <string>LICENSES/ogg-vorbis.txt</string>
<key>name</key>
<string>ogg-vorbis</string>
<key>platforms</key>
@@ -1232,9 +1220,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>61f4987290b90416fdba2cd4c4b2ecf3</string>
+ <string>c8fccf7eeb25fd45cb7e04399c0b83ee</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.1.3-1.2.0-windows-20101001a.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ogvorbis/rev/221801/arch/CYGWIN/installer/ogg_vorbis-1.1.3-1.2.0-windows-20110222.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1490,7 +1478,7 @@
<key>license</key>
<string>xmlrpc-epi</string>
<key>license_file</key>
- <string>LICENSES/xmlrpc.txt</string>
+ <string>LICENSES/xmlrpc-epi.txt</string>
<key>name</key>
<string>xmlrpc-epi</string>
<key>platforms</key>
@@ -1524,9 +1512,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ea06e2f1c1ed59a2d2b6cdb6f459d1c0</string>
+ <string>5181d1a8f2516928ac064d72acf164a4</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-windows-20101001a.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-xmlrpc-epi/rev/222021/arch/CYGWIN/installer/xmlrpc_epi-0.54.1-windows-20110224.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 96488360a4..66c1739ff4 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -14,9 +14,9 @@ else (STANDALONE)
debug json_vc100debug_libmt.lib
optimized json_vc100_libmt)
elseif (DARWIN)
- set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a)
+ set(JSONCPP_LIBRARIES libjson_darwin_libmt.a)
elseif (LINUX)
- set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt)
+ set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt)
endif (WINDOWS)
- set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json)
+ set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
endif (STANDALONE)
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index f6522d9e2f..33fc3e5bac 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -8,6 +8,6 @@ if (STANDALONE)
include(FindPNG)
else (STANDALONE)
use_prebuilt_binary(libpng)
- set(PNG_LIBRARIES png12)
- set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12)
+ set(PNG_LIBRARIES libpng15)
+ set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
endif (STANDALONE)
diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake
index 107d1926ba..5bd4848245 100644
--- a/indra/cmake/XmlRpcEpi.cmake
+++ b/indra/cmake/XmlRpcEpi.cmake
@@ -9,7 +9,10 @@ if (STANDALONE)
else (STANDALONE)
use_prebuilt_binary(xmlrpc-epi)
if (WINDOWS)
- set(XMLRPCEPI_LIBRARIES xmlrpcepi)
+ set(XMLRPCEPI_LIBRARIES
+ debug xmlrpc-epid
+ optimized xmlrpc-epi
+ )
else (WINDOWS)
set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
endif (WINDOWS)
diff --git a/indra/llmessage/tests/llhost_test.cpp b/indra/llmessage/tests/llhost_test.cpp
index b20bceae1d..eadf83c428 100644
--- a/indra/llmessage/tests/llhost_test.cpp
+++ b/indra/llmessage/tests/llhost_test.cpp
@@ -151,8 +151,9 @@ namespace tut
template<> template<>
void host_object::test<9>()
{
+ skip("this test is flaky, but we should figure out why...");
// skip("setHostByName(\"google.com\"); getHostName() -> (e.g.) \"yx-in-f100.1e100.net\"");
- std::string hostStr = "linux.org";
+ std::string hostStr = "lindenlab.com";
LLHost host;
host.setHostByName(hostStr);
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index abba6f134d..1f07af0608 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -10,6 +10,7 @@ include(DirectX)
include(OpenSSL)
include(DragDrop)
include(ELFIO)
+include(EXPAT)
include(FMOD)
include(OPENAL)
include(FindOpenGL)
@@ -1433,19 +1434,13 @@ set(PACKAGE ON CACHE BOOL
"Add a package target that builds an installer package.")
if (WINDOWS)
- if(MSVC71)
- set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES")
- else(MSVC71)
- set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map")
- endif(MSVC71)
-
set_target_properties(${VIEWER_BINARY_NAME}
PROPERTIES
# *TODO -reenable this once we get server usage sorted out
#LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:\"__tcmalloc\""
LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS"
LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO"
- LINK_FLAGS_RELEASE ${release_flags}
+ LINK_FLAGS_RELEASE ""
)
if(USE_PRECOMPILED_HEADERS)
set_target_properties(
@@ -1687,6 +1682,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${SMARTHEAP_LIBRARY}
${UI_LIBRARIES}
${WINDOWS_LIBRARIES}
+ ${EXPAT_LIBRARIES}
${XMLRPCEPI_LIBRARIES}
${ELFIO_LIBRARIES}
${OPENSSL_LIBRARIES}
diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index 2de7db38ed..767e1cd12b 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -33,7 +33,7 @@
#include "llversioninfo.h"
#include "llviewercontrol.h"
-#include "reader.h"
+#include "json/reader.h"
// These two are concatenated with the language specifiers to form a complete Google Translate URL
const char* LLTranslate::m_GoogleURL = "http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=";
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 9f54d848a3..3e09b9daa0 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -176,9 +176,6 @@ class WindowsManifest(ViewerManifest):
return ''.join(self.channel().split()) + '.exe'
def test_msvcrt_and_copy_action(self, src, dst):
- # Skip this test as of VS2010
- return
-
# This is used to test a dll manifest.
# It is used as a temporary override during the construct method
from test_win32_manifest import test_assembly_binding
@@ -198,9 +195,6 @@ class WindowsManifest(ViewerManifest):
print "Doesn't exist:", src
def test_for_no_msvcrt_manifest_and_copy_action(self, src, dst):
- # Skip this test as of VS2010
- return
-
# This is used to test that no manifest for the msvcrt exists.
# It is used as a temporary override during the construct method
from test_win32_manifest import test_assembly_binding
@@ -227,22 +221,25 @@ class WindowsManifest(ViewerManifest):
else:
print "Doesn't exist:", src
- def enable_crt_manifest_check(self):
- if self.is_packaging_viewer():
- WindowsManifest.copy_action = WindowsManifest.test_msvcrt_and_copy_action
+ ### DISABLED MANIFEST CHECKING for vs2010. we may need to reenable this
+ # shortly. If this hasn't been reenabled by the 2.9 viewer release then it
+ # should be deleted -brad
+ #def enable_crt_manifest_check(self):
+ # if self.is_packaging_viewer():
+ # WindowsManifest.copy_action = WindowsManifest.test_msvcrt_and_copy_action
- def enable_no_crt_manifest_check(self):
- if self.is_packaging_viewer():
- WindowsManifest.copy_action = WindowsManifest.test_for_no_msvcrt_manifest_and_copy_action
+ #def enable_no_crt_manifest_check(self):
+ # if self.is_packaging_viewer():
+ # WindowsManifest.copy_action = WindowsManifest.test_for_no_msvcrt_manifest_and_copy_action
- def disable_manifest_check(self):
- if self.is_packaging_viewer():
- del WindowsManifest.copy_action
+ #def disable_manifest_check(self):
+ # if self.is_packaging_viewer():
+ # del WindowsManifest.copy_action
def construct(self):
super(WindowsManifest, self).construct()
- self.enable_crt_manifest_check()
+ #self.enable_crt_manifest_check()
if self.is_packaging_viewer():
# Find secondlife-bin.exe in the 'configuration' dir, then rename it to the result of final_exe.
@@ -253,7 +250,7 @@ class WindowsManifest(ViewerManifest):
'llplugin', 'slplugin', self.args['configuration'], "slplugin.exe"),
"slplugin.exe")
- self.disable_manifest_check()
+ #self.disable_manifest_check()
self.path(src="../viewer_components/updater/scripts/windows/update_install.bat", dst="update_install.bat")
@@ -261,7 +258,7 @@ class WindowsManifest(ViewerManifest):
if self.prefix(src=os.path.join(os.pardir, 'sharedlibs', self.args['configuration']),
dst=""):
- self.enable_crt_manifest_check()
+ #self.enable_crt_manifest_check()
# Get llcommon and deps. If missing assume static linkage and continue.
try:
@@ -273,7 +270,7 @@ class WindowsManifest(ViewerManifest):
print err.message
print "Skipping llcommon.dll (assuming llcommon was linked statically)"
- self.disable_manifest_check()
+ #self.disable_manifest_check()
# Get fmod dll, continue if missing
try:
@@ -328,7 +325,7 @@ class WindowsManifest(ViewerManifest):
self.path("featuretable.txt")
self.path("featuretable_xp.txt")
- self.enable_no_crt_manifest_check()
+ #self.enable_no_crt_manifest_check()
# Media plugins - QuickTime
if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"):
@@ -409,7 +406,7 @@ class WindowsManifest(ViewerManifest):
self.end_prefix()
- self.disable_manifest_check()
+ #self.disable_manifest_check()
# pull in the crash logger and updater from other projects
# tag:"crash-logger" here as a cue to the exporter
diff --git a/indra/tools/vstool/VSTool.csproj b/indra/tools/vstool/VSTool.csproj
index 24f1031f81..7f431e85c7 100644
--- a/indra/tools/vstool/VSTool.csproj
+++ b/indra/tools/vstool/VSTool.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
@@ -25,6 +26,8 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <OldToolsVersion>2.0</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>.\</OutputPath>
diff --git a/indra/tools/vstool/VSTool.exe b/indra/tools/vstool/VSTool.exe
index 6d1497d5e5..8be428614e 100755
--- a/indra/tools/vstool/VSTool.exe
+++ b/indra/tools/vstool/VSTool.exe
Binary files differ
diff --git a/indra/tools/vstool/VSTool.sln b/indra/tools/vstool/VSTool.sln
index 8859671802..21e3d75971 100644
--- a/indra/tools/vstool/VSTool.sln
+++ b/indra/tools/vstool/VSTool.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VSTool", "VSTool.csproj", "{96943E2D-1373-4617-A117-D0F997A94919}"
EndProject
Global
diff --git a/indra/tools/vstool/main.cs b/indra/tools/vstool/main.cs
index cc268d59d9..cc73261e30 100644
--- a/indra/tools/vstool/main.cs
+++ b/indra/tools/vstool/main.cs
@@ -550,6 +550,11 @@ namespace VSTool
case "10.00":
version = "VC90";
break;
+
+ case "11.00":
+ version = "VC100";
+ break;
+
default:
throw new ApplicationException("Unknown .sln version: " + format);
}
@@ -585,6 +590,11 @@ namespace VSTool
case "VC90":
progid = "VisualStudio.DTE.9.0";
break;
+
+ case "VC100":
+ progid = "VisualStudio.DTE.10.0";
+ break;
+
default:
throw new ApplicationException("Can't handle VS version: " + version);
}