Recreated the ClangFormat VSPackage with VS 2010.

The generated package is now compatible with VS 2010 - 2013.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@194480 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/clang-format-vs/ClangFormat.sln b/tools/clang-format-vs/ClangFormat.sln
index d6b211fe506f2c46bd09970a3cc580bd11cdb74c..8f89ab0ce8bf45bf3fa0823e1087047afab90ea8 100644 (file)
--- a/tools/clang-format-vs/ClangFormat.sln
+++ b/tools/clang-format-vs/ClangFormat.sln
@@ -1,6 +1,6 @@
 \r
-Microsoft Visual Studio Solution File, Format Version 12.00\r
-# Visual Studio 2012\r
+Microsoft Visual Studio Solution File, Format Version 11.00\r
+# Visual Studio 2010\r
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClangFormat", "ClangFormat\ClangFormat.csproj", "{7FD1783E-2D31-4D05-BF23-6EBE1B42B608}"\r
 EndProject\r
 Global\r

diff --git a/tools/clang-format-vs/ClangFormat/ClangFormat.csproj b/tools/clang-format-vs/ClangFormat/ClangFormat.csproj
index 51e138216d67dd91ca23309cb6ec24f3755e7c4c..cb344a3117f6079959830396be41963860eab6aa 100644 (file)
--- a/tools/clang-format-vs/ClangFormat/ClangFormat.csproj
+++ b/tools/clang-format-vs/ClangFormat/ClangFormat.csproj
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">\r
-  <PropertyGroup>\r
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>\r
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>\r
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <DelaySign>false</DelaySign>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />\r
   <PropertyGroup>\r
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
@@ -21,7 +12,7 @@
     <AssemblyName>ClangFormat</AssemblyName>\r
     <SignAssembly>true</SignAssembly>\r
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
@@ -31,8 +22,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
-    <CodeAnalysisIgnoreGeneratedCode>false</CodeAnalysisIgnoreGeneratedCode>\r
-    <RunCodeAnalysis>false</RunCodeAnalysis>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
     <DebugType>pdbonly</DebugType>\r
@@ -45,24 +34,24 @@
   </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="Microsoft.CSharp" />\r
-    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
-    <Reference Include="Microsoft.VisualStudio.Editor, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
+    <Reference Include="Microsoft.VisualStudio.Editor, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
     <Reference Include="Microsoft.VisualStudio.OLE.Interop" />\r
     <Reference Include="Microsoft.VisualStudio.Shell.Interop" />\r
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0" />\r
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" />\r
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0" />\r
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0">\r
-      <EmbedInteropTypes>true</EmbedInteropTypes>\r
+    <Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
+    <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />\r
+    <Reference Include="Microsoft.VisualStudio.Shell.10.0">\r
+      <Private>false</Private>\r
     </Reference>\r
-    <Reference Include="Microsoft.VisualStudio.Text.Data, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
-    <Reference Include="Microsoft.VisualStudio.Text.Logic, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
-    <Reference Include="Microsoft.VisualStudio.Text.UI, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
-    <Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
+    <Reference Include="Microsoft.VisualStudio.Text.Data, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
+    <Reference Include="Microsoft.VisualStudio.Text.Logic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
+    <Reference Include="Microsoft.VisualStudio.Text.UI, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
+    <Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />\r
-    <Reference Include="Microsoft.VisualStudio.Shell.11.0" />\r
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />\r
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0" />\r
     <Reference Include="System" />\r
     <Reference Include="System.Core" />\r
     <Reference Include="System.Data" />\r
@@ -165,7 +154,7 @@
     </VSCTCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <None Include="Resources\Images.png" />\r
+    <None Include="Resources\Images_32bit.bmp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Content Include="Resources\Package.ico" />\r
@@ -174,7 +163,7 @@
     <UseCodebase>true</UseCodebase>\r
   </PropertyGroup>\r
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />\r
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />\r
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" />\r
   <PropertyGroup>\r
     <PreBuildEvent>if not exist $(ProjectDir)Key.snk (\r
   "$(FrameworkSDKDir)Bin\NETFX 4.0 Tools\sn.exe" -k $(ProjectDir)Key.snk\r

diff --git a/tools/clang-format-vs/ClangFormat/ClangFormat.vsct b/tools/clang-format-vs/ClangFormat/ClangFormat.vsct
index 9037ecde2493a800a092b117bb2aee4850356d82..507c7c9e43dba1239a3882f5f7fa6a5da70946c1 100644 (file)
--- a/tools/clang-format-vs/ClangFormat/ClangFormat.vsct
+++ b/tools/clang-format-vs/ClangFormat/ClangFormat.vsct
@@ -80,7 +80,7 @@
             bitmap strip containing the bitmaps and then there are the numeric ids of the elements used \r
             inside a button definition. An important aspect of this declaration is that the element id \r
             must be the actual index (1-based) of the bitmap inside the bitmap strip. -->\r
-      <Bitmap guid="guidImages" href="Resources\Images.png" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows"/>\r
+      <Bitmap guid="guidImages" href="Resources\Images_32bit.bmp" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows"/>\r
       \r
     </Bitmaps>\r
  \r
@@ -112,7 +112,6 @@
       <IDSymbol name="bmpPicSearch" value="3" />\r
       <IDSymbol name="bmpPicX" value="4" />\r
       <IDSymbol name="bmpPicArrows" value="5" />\r
-      <IDSymbol name="bmpPicStrikethrough" value="6" />\r
     </GuidSymbol>\r
   </Symbols>\r
 \r

diff --git a/tools/clang-format-vs/ClangFormat/Resources/Images.png b/tools/clang-format-vs/ClangFormat/Resources/Images.png
deleted file mode 100644 (file)
index 51fe0d1..0000000
Binary files a/tools/clang-format-vs/ClangFormat/Resources/Images.png and /dev/null differ

diff --git a/tools/clang-format-vs/ClangFormat/Resources/Images_32bit.bmp b/tools/clang-format-vs/ClangFormat/Resources/Images_32bit.bmp
new file mode 100644 (file)
index 0000000..2fa7ab0
Binary files /dev/null and b/tools/clang-format-vs/ClangFormat/Resources/Images_32bit.bmp differ

diff --git a/tools/clang-format-vs/ClangFormat/Resources/Package.ico b/tools/clang-format-vs/ClangFormat/Resources/Package.ico
index 449296f495af26f2b41bb1626a28de7432145472..ea3b23fe8d4b3a45be89f9286e617624007290be 100644 (file)
Binary files a/tools/clang-format-vs/ClangFormat/Resources/Package.ico and b/tools/clang-format-vs/ClangFormat/Resources/Package.ico differ

diff --git a/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest b/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest
index 274c028ed2194a3b16d46b37ba70e6ff7167bf88..39d30f0f15e992497c72e11b7dd44733e056bdb2 100644 (file)
--- a/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest
+++ b/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest
@@ -1,18 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">\r
-  <Metadata>\r
-    <Identity Id="c5286038-25d3-4f65-83a8-51fa2df4a146" Version="1.0" Language="en-US" Publisher="LLVM" />\r
-    <DisplayName>ClangFormat</DisplayName>\r
-    <Description>Formats code by calling the clang-format executable.</Description>\r
-  </Metadata>\r
-  <Installation InstalledByMsi="false">\r
-    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="11.0" />\r
-  </Installation>\r
-  <Dependencies>\r
-    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />\r
-    <Dependency Id="Microsoft.VisualStudio.MPF.11.0" DisplayName="Visual Studio MPF 11.0" d:Source="Installed" Version="11.0" />\r
-  </Dependencies>\r
-  <Assets>\r
-    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />\r
-  </Assets>\r
-</PackageManifest>\r
+<Vsix Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">\r
+  <Identifier Id="20dbc914-1c7a-4992-b236-ef58b37850eb">\r
+    <Name>ClangFormat</Name>\r
+    <Author>LLVM</Author>\r
+    <Version>1.0</Version>\r
+    <Description xml:space="preserve">Information about my package</Description>\r
+    <Locale>1033</Locale>\r
+    <InstalledByMsi>false</InstalledByMsi>\r
+    <SupportedProducts>\r
+      <VisualStudio Version="10.0">\r
+        <Edition>Pro</Edition>\r
+      </VisualStudio>\r
+      <VisualStudio Version="11.0">\r
+        <Edition>Pro</Edition>\r
+      </VisualStudio>\r
+      <VisualStudio Version="12.0">\r
+        <Edition>Pro</Edition>\r
+      </VisualStudio>\r
+    </SupportedProducts>\r
+    <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" />\r
+  </Identifier>\r
+  <References>\r
+        <Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0">\r
+            <Name>Visual Studio MPF</Name>\r
+        </Reference>\r
+  </References>\r
+  <Content>\r
+    <VsPackage>|%CurrentProject%;PkgdefProjectOutputGroup|</VsPackage>\r
+  </Content>\r
+</Vsix>\r