| commit | 59d17189aa41fd5df2c00189110ba48e1ca140e1 | [log] [tgz] |
|---|---|---|
| author | sbc@chromium.org <sbc@chromium.org@050acbb0-2703-11df-ab0a-9f3f633ae91d> | Tue Jul 30 21:52:04 2013 |
| committer | sbc@chromium.org <sbc@chromium.org@050acbb0-2703-11df-ab0a-9f3f633ae91d> | Tue Jul 30 21:52:04 2013 |
| tree | 406a432fe0e34353e3981e67c4d14eec541715ad | |
| parent | 34d2fcde4733ead71ec2f02043fd626a37e1c8de [diff] |
[VS Addin] Don't fail installation if win32 platform is missing. It seems that it is possible to install VS with only x86 and not win32 platforms. In this case we can't install the PPAPI platform (as it is a clone of win32) but we should probably not fail the installation completely. Also, handle errors from create_ppapi_platform more gracefully. R=binji@chromium.org Review URL: https://codereview.chromium.org/19990004 git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1564 050acbb0-2703-11df-ab0a-9f3f633ae91d
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/create_ppapi_platform.py b/visual_studio/NativeClientVSAddIn/InstallerResources/create_ppapi_platform.py index 093dfb8..5264133 100644 --- a/visual_studio/NativeClientVSAddIn/InstallerResources/create_ppapi_platform.py +++ b/visual_studio/NativeClientVSAddIn/InstallerResources/create_ppapi_platform.py
@@ -178,7 +178,9 @@ patch_dir = os.path.join(SCRIPT_DIR, 'PPAPI_Patch') if not os.path.exists(win32_dir): - raise Error('Win32 MSBuild directory not found: %s' % win32_dir) + print 'Win32 MSBuild directory not found: %s' % win32_dir + print 'Skipping PPAPI platform install.' + return print "Cloning Win32 platform from: %s" % win32_dir
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/install.py b/visual_studio/NativeClientVSAddIn/InstallerResources/install.py index 649e823..e67c426 100644 --- a/visual_studio/NativeClientVSAddIn/InstallerResources/install.py +++ b/visual_studio/NativeClientVSAddIn/InstallerResources/install.py
@@ -316,7 +316,7 @@ rtn = 1 try: rtn = main() - except InstallError as e: + except (create_ppapi_platform.Error, InstallError) as e: print print e except shutil.Error as e: