[VSAddin] Don't require both 2010 and 2012 to be installed.

visual_studio/NativeClientVSAddIn/InstallerResources/install.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Copies necessary add-in files into place to install the add-in.
 
 This script will copy the necessary files for the Visual Studio add-in
 to where Visual Studio can find them. It assumes the current directory
 contains the necessary files to copy.
@@ skipping 98 matching lines @@
 
   print "\nInstalling Add-in: %s" % vsuser_path
   # Copy the necessary files into place.
   for file_name in ADDIN_FILES:
     shutil.copy(os.path.join(SCRIPT_DIR, vs_version, file_name), addin_dir)
 
   print "Add-in installed."
 
 
 def InstallMSBuildPlatforms(platform_root):
   if not os.path.exists(platform_root):

[binji, 2014/02/03 21:46:41]

This is superfluous now, right?

[Sam Clegg, 2014/02/03 22:44:54]

Yes, but still probably a good sanity check.

     raise InstallError("Could not find path: %s" % platform_root)
 
   if not os.access(platform_root, os.W_OK):
     # Admin is needed to write to the default platform directory.
     if ctypes.windll.shell32.IsUserAnAdmin() != 1:
       raise InstallError("Not running as administrator. The install script "
                          "needs write access to protected Visual Studio "
                          "directories.")
     raise InstallError("install script needs write access to: %s"
                        % platform_root)
@@ skipping 29 matching lines @@
   print "%s platform installed." % NACL64_PLATFORM
 
   shutil.copytree(os.path.join(SCRIPT_DIR, NACLARM_PLATFORM), nacl_dir_arm)
   print "%s platform installed." % NACLARM_PLATFORM
 
   shutil.copytree(os.path.join(SCRIPT_DIR, PNACL_PLATFORM), pnacl_dir)
   print "PNaCl platform installed."
 
 
 def InstallMSBuild():
-
   # Ask user before installing PPAPI template.
   if options.install_ppapi is None:
     ppapi_answer = Ask("Set up configuration to enable Pepper development "
           "with Visual Studio?\n"
           "((Yes)) - I want to create and copy relevant files into a "
           "Pepper subdirectory\n"
           "((No)) - I am not interested or will set up the configuration later")
     if ppapi_answer:
       options.install_ppapi = True
       print "Confirmed installer will include PPAPI platform."
     else:
       options.install_ppapi = False
       print "Will not install PPAPI platform during installation."
 
   if not os.path.exists(options.msbuild_path):
     raise InstallError("Could not find MS Build directory: %s" % (
         options.msbuild_path))
 
   root_2010 = os.path.join(options.msbuild_path,
                            'Microsoft.Cpp', 'v4.0', 'Platforms')
-  InstallMSBuildPlatforms(root_2010)
-
   root_2012 = os.path.join(options.msbuild_path,
                            'Microsoft.Cpp', 'v4.0', 'V110', 'Platforms')
-  InstallMSBuildPlatforms(root_2012)
+
+  if not os.path.exists(root_2012) and not os.path.exists(root_2010):
+    raise InstallError("MSBuild paths for Visual Studio 2010 and "
+                       "2012 are missing.\n"
+                       "Please install one or both before installing this "
+                       "AddIn.\n"
+                       "(%s)\n"
+                       "(%s)\n" % (root_2010, root_2012))
+
+  if os.path.exists(root_2010):
+    InstallMSBuildPlatforms(root_2010)
+
+  if os.path.exists(root_2012):
+    InstallMSBuildPlatforms(root_2012)
 
   if options.install_ppapi:
     pepper_dir = os.path.join(root_2010, PEPPER_PLATFORM)
     pepper_dir2 = os.path.join(root_2012, PEPPER_PLATFORM)
     UninstallDirectory(pepper_dir)
     UninstallDirectory(pepper_dir2)
     create_ppapi_platform.CreatePPAPI(options.msbuild_path)
     print "PPAPI platform installed."
 
 
@@ skipping 122 matching lines @@
       print e
       print("The install script failed to write to the files mentioned above")
       if ctypes.windll.shell32.IsUserAnAdmin() != 1:
         print("Please try running as administrator.")
       else:
         print("Please check for any running programs that might "
               "have them locked.")
     else:
       raise
   sys.exit(rtn)