Don't require sdk patch when compiling with vs2012

The 2012 compiler can handle the "enum class" so don't force patching if compiling with 2012. Cast a limited selection logging of enum class types to avoid needing to add overloads to base/logging for those types (they don't decay to int). R=robertshield@chromium.org TEST=ninja -C out\Debug metro_driver with 2010/2012 and see if check_sdk_patch is generated/not. Review URL: https://chromiumcodereview.appspot.com/12676005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190073 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Mar 23, 2013 · d11ff2a · d11ff2a
1 parent e7a1173
commit d11ff2a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/win8/metro_driver/file_picker.cc b/win8/metro_driver/file_picker.cc
@@ -228,7 +228,7 @@ HRESULT OpenFilePickerSession::SinglePickerDone(SingleFileAsyncOp* async,
       LOG(ERROR) << "NULL IStorageItem";
     }
   } else {
-    LOG(ERROR) << "Unexpected async status " << status;
+    LOG(ERROR) << "Unexpected async status " << static_cast<int>(status);
   }
 
   event_.Signal();
@@ -260,7 +260,7 @@ HRESULT OpenFilePickerSession::MultiPickerDone(MultiFileAsyncOp* async,
       LOG(ERROR) << "NULL StorageFileVectorCollection";
     }
   } else {
-    LOG(ERROR) << "Unexpected async status " << status;
+    LOG(ERROR) << "Unexpected async status " << static_cast<int>(status);
   }
 
   event_.Signal();
@@ -597,7 +597,7 @@ HRESULT SaveFilePickerSession::FilePickerDone(SaveFileAsyncOp* async,
       LOG(ERROR) << "NULL IStorageItem";
     }
   } else {
-    LOG(ERROR) << "Unexpected async status " << status;
+    LOG(ERROR) << "Unexpected async status " << static_cast<int>(status);
   }
 
   event_.Signal();

diff --git a/win8/metro_driver/secondary_tile.cc b/win8/metro_driver/secondary_tile.cc
@@ -77,7 +77,8 @@ HRESULT TileRequestCompleter::Respond(winfoundtn::IAsyncOperation<bool>* async,
         break;
     }
   } else {
-    LOG(ERROR) << __FUNCTION__ << " Unexpected async status " << status;
+    LOG(ERROR) << __FUNCTION__ << " Unexpected async status "
+               << static_cast<int>(status);
     pin_state = type_ == PIN ?
         base::win::METRO_PIN_RESULT_ERROR :
         base::win::METRO_UNPIN_RESULT_ERROR;

diff --git a/win8/win8.gyp b/win8/win8.gyp
@@ -16,23 +16,27 @@
         'check_sdk_script': 'util/check_sdk_patch.py',
         'output_path': '<(INTERMEDIATE_DIR)/check_sdk_patch',
       },
-      'actions': [
-        {
-          'action_name': 'check_sdk_patch_action',
-          'inputs': [
-            '<(check_sdk_script)',
+      'conditions': [
+        ['MSVS_VERSION=="2010" or MSVS_VERSION=="2010e"', {
+          'actions': [
+            {
+              'action_name': 'check_sdk_patch_action',
+              'inputs': [
+                '<(check_sdk_script)',
+              ],
+              'outputs': [
+                # This keeps the ninja build happy and provides a slightly
+                # helpful error message if the sdk is missing.
+                '<(output_path)'
+              ],
+              'action': ['python',
+                        '<(check_sdk_script)',
+                        '<(windows_sdk_path)',
+                        '<(output_path)',
+                        ],
+            },
           ],
-          'outputs': [
-            # This keeps the ninja build happy and provides a slightly helpful
-            # error messge if the sdk is missing.
-            '<(output_path)'
-          ],
-          'action': ['python',
-                     '<(check_sdk_script)',
-                     '<(windows_sdk_path)',
-                     '<(output_path)',
-                     ],
-        },
+        }],
       ],
     },
     {