<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Nov 12, 2013 at 8:30 AM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">
<div class="im">On Tue, Nov 12, 2013 at 5:54 AM, Manuel Klimek <span dir="ltr"><<a href="mailto:klimek@google.com" target="_blank">klimek@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: klimek<br>
Date: Tue Nov 12 07:54:22 2013<br>
New Revision: 194477<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=194477&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=194477&view=rev</a><br>
Log: (empty)<br></blockquote><div><br></div></div><div>Missing commit message?</div></div></div></div></blockquote><div><br></div><div>Ah, reverted in <span style="font-family:monospace">194478 - np.</span></div><div> </div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">
<div><div class="h5"><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<br>
Modified:<br>
cfe/trunk/tools/clang-format-vs/ClangFormat.sln<br>
cfe/trunk/tools/clang-format-vs/ClangFormat/ClangFormat.csproj<br>
cfe/trunk/tools/clang-format-vs/ClangFormat/ClangFormat.vsct<br>
cfe/trunk/tools/clang-format-vs/ClangFormat/Resources/Package.ico<br>
cfe/trunk/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest<br>
<br>
Modified: cfe/trunk/tools/clang-format-vs/ClangFormat.sln<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format-vs/ClangFormat.sln?rev=194477&r1=194476&r2=194477&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format-vs/ClangFormat.sln?rev=194477&r1=194476&r2=194477&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/clang-format-vs/ClangFormat.sln (original)<br>
+++ cfe/trunk/tools/clang-format-vs/ClangFormat.sln Tue Nov 12 07:54:22 2013<br>
@@ -1,7 +1,7 @@<br>
<br>
-Microsoft Visual Studio Solution File, Format Version 12.00<br>
-# Visual Studio 2012<br>
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClangFormat", "ClangFormat\ClangFormat.csproj", "{7FD1783E-2D31-4D05-BF23-6EBE1B42B608}"<br>
+Microsoft Visual Studio Solution File, Format Version 11.00<br>
+# Visual Studio 2010<br>
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClangFormat", "ClangFormat\ClangFormat.csproj", "{70E9F7C8-C51D-436C-A16E-135A9DBE1266}"<br>
EndProject<br>
Global<br>
GlobalSection(SolutionConfigurationPlatforms) = preSolution<br>
@@ -9,10 +9,10 @@ Global<br>
Release|Any CPU = Release|Any CPU<br>
EndGlobalSection<br>
GlobalSection(ProjectConfigurationPlatforms) = postSolution<br>
- {7FD1783E-2D31-4D05-BF23-6EBE1B42B608}.Debug|Any CPU.ActiveCfg = Debug|Any CPU<br>
- {7FD1783E-2D31-4D05-BF23-6EBE1B42B608}.Debug|Any CPU.Build.0 = Debug|Any CPU<br>
- {7FD1783E-2D31-4D05-BF23-6EBE1B42B608}.Release|Any CPU.ActiveCfg = Release|Any CPU<br>
- {7FD1783E-2D31-4D05-BF23-6EBE1B42B608}.Release|Any CPU.Build.0 = Release|Any CPU<br>
+ {70E9F7C8-C51D-436C-A16E-135A9DBE1266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU<br>
+ {70E9F7C8-C51D-436C-A16E-135A9DBE1266}.Debug|Any CPU.Build.0 = Debug|Any CPU<br>
+ {70E9F7C8-C51D-436C-A16E-135A9DBE1266}.Release|Any CPU.ActiveCfg = Release|Any CPU<br>
+ {70E9F7C8-C51D-436C-A16E-135A9DBE1266}.Release|Any CPU.Build.0 = Release|Any CPU<br>
EndGlobalSection<br>
GlobalSection(SolutionProperties) = preSolution<br>
HideSolutionNode = FALSE<br>
<br>
Modified: cfe/trunk/tools/clang-format-vs/ClangFormat/ClangFormat.csproj<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format-vs/ClangFormat/ClangFormat.csproj?rev=194477&r1=194476&r2=194477&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format-vs/ClangFormat/ClangFormat.csproj?rev=194477&r1=194476&r2=194477&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/clang-format-vs/ClangFormat/ClangFormat.csproj (original)<br>
+++ cfe/trunk/tools/clang-format-vs/ClangFormat/ClangFormat.csproj Tue Nov 12 07:54:22 2013<br>
@@ -1,27 +1,18 @@<br>
<?xml version="1.0" encoding="utf-8"?><br>
<Project DefaultTargets="Build" xmlns="<a href="http://schemas.microsoft.com/developer/msbuild/2003" target="_blank">http://schemas.microsoft.com/developer/msbuild/2003</a>" ToolsVersion="4.0"><br>
<PropertyGroup><br>
- <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion><br>
- <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion><br>
- <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath><br>
- </PropertyGroup><br>
- <PropertyGroup><br>
- <DelaySign>false</DelaySign><br>
- </PropertyGroup><br>
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /><br>
- <PropertyGroup><br>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration><br>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform><br>
<SchemaVersion>2.0</SchemaVersion><br>
- <ProjectGuid>{7FD1783E-2D31-4D05-BF23-6EBE1B42B608}</ProjectGuid><br>
+ <ProjectGuid>{70e9f7c8-c51d-436c-a16e-135a9dbe1266}</ProjectGuid><br>
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids><br>
<OutputType>Library</OutputType><br>
<AppDesignerFolder>Properties</AppDesignerFolder><br>
- <RootNamespace>LLVM.ClangFormat</RootNamespace><br>
+ <RootNamespace>Company.ClangFormat</RootNamespace><br>
<AssemblyName>ClangFormat</AssemblyName><br>
- <SignAssembly>true</SignAssembly><br>
+ <SignAssembly>True</SignAssembly><br>
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile><br>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion><br>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion><br>
</PropertyGroup><br>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "><br>
<DebugSymbols>true</DebugSymbols><br>
@@ -31,8 +22,6 @@<br>
<DefineConstants>DEBUG;TRACE</DefineConstants><br>
<ErrorReport>prompt</ErrorReport><br>
<WarningLevel>4</WarningLevel><br>
- <CodeAnalysisIgnoreGeneratedCode>false</CodeAnalysisIgnoreGeneratedCode><br>
- <RunCodeAnalysis>false</RunCodeAnalysis><br>
</PropertyGroup><br>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "><br>
<DebugType>pdbonly</DebugType><br>
@@ -45,24 +34,16 @@<br>
</PropertyGroup><br>
<ItemGroup><br>
<Reference Include="Microsoft.CSharp" /><br>
- <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /><br>
- <Reference Include="Microsoft.VisualStudio.Editor, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /><br>
<Reference Include="Microsoft.VisualStudio.OLE.Interop" /><br>
<Reference Include="Microsoft.VisualStudio.Shell.Interop" /><br>
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0" /><br>
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" /><br>
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0" /><br>
- <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0"><br>
- <EmbedInteropTypes>true</EmbedInteropTypes><br>
- </Reference><br>
- <Reference Include="Microsoft.VisualStudio.Text.Data, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /><br>
- <Reference Include="Microsoft.VisualStudio.Text.Logic, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /><br>
- <Reference Include="Microsoft.VisualStudio.Text.UI, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /><br>
- <Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /><br>
<Reference Include="Microsoft.VisualStudio.TextManager.Interop" /><br>
- <Reference Include="Microsoft.VisualStudio.Shell.11.0" /><br>
+ <Reference Include="Microsoft.VisualStudio.Shell.10.0"><br>
+ <Private>false</Private><br>
+ </Reference><br>
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" /><br>
- <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0" /><br>
<Reference Include="System" /><br>
<Reference Include="System.Core" /><br>
<Reference Include="System.Data" /><br>
@@ -70,7 +51,6 @@<br>
<Reference Include="System.Drawing" /><br>
<Reference Include="System.Windows.Forms" /><br>
<Reference Include="System.Xml" /><br>
- <Reference Include="System.Xml.Linq" /><br>
</ItemGroup><br>
<ItemGroup><br>
<COMReference Include="EnvDTE"><br>
@@ -136,10 +116,9 @@<br>
<DependentUpon>Resources.resx</DependentUpon><br>
</Compile><br>
<Compile Include="GlobalSuppressions.cs" /><br>
- <Compile Include="ClangFormatPackage.cs"><br>
- <SubType>Component</SubType><br>
- </Compile><br>
+ <Compile Include="ClangFormatPackage.cs" /><br>
<Compile Include="Properties\AssemblyInfo.cs" /><br>
+<br>
<Compile Include="PkgCmdID.cs" /><br>
</ItemGroup><br>
<ItemGroup><br>
@@ -154,19 +133,22 @@<br>
</EmbeddedResource><br>
</ItemGroup><br>
<ItemGroup><br>
- <None Include="Key.snk" /><br>
<None Include="source.extension.vsixmanifest"><br>
<SubType>Designer</SubType><br>
</None><br>
</ItemGroup><br>
<ItemGroup><br>
+ <None Include="Key.snk" /><br>
+ </ItemGroup><br>
+ <ItemGroup><br>
<VSCTCompile Include="ClangFormat.vsct"><br>
<ResourceName>Menus.ctmenu</ResourceName><br>
</VSCTCompile><br>
</ItemGroup><br>
<ItemGroup><br>
- <None Include="Resources\Images.png" /><br>
+ <None Include="Resources\Images_32bit.bmp" /><br>
</ItemGroup><br>
+<br>
<ItemGroup><br>
<Content Include="Resources\Package.ico" /><br>
</ItemGroup><br>
@@ -174,12 +156,7 @@<br>
<UseCodebase>true</UseCodebase><br>
</PropertyGroup><br>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /><br>
- <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" /><br>
- <PropertyGroup><br>
- <PreBuildEvent>if not exist $(ProjectDir)Key.snk (<br>
- "$(FrameworkSDKDir)Bin\NETFX 4.0 Tools\sn.exe" -k $(ProjectDir)Key.snk<br>
-)</PreBuildEvent><br>
- </PropertyGroup><br>
+ <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" /><br>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.<br>
Other similar extension points exist, see Microsoft.Common.targets.<br>
<Target Name="BeforeBuild"><br>
@@ -187,4 +164,4 @@<br>
<Target Name="AfterBuild"><br>
</Target><br>
--><br>
-</Project><br>
\ No newline at end of file<br>
+</Project><br>
<br>
Modified: cfe/trunk/tools/clang-format-vs/ClangFormat/ClangFormat.vsct<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format-vs/ClangFormat/ClangFormat.vsct?rev=194477&r1=194476&r2=194477&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format-vs/ClangFormat/ClangFormat.vsct?rev=194477&r1=194476&r2=194477&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/clang-format-vs/ClangFormat/ClangFormat.vsct (original)<br>
+++ cfe/trunk/tools/clang-format-vs/ClangFormat/ClangFormat.vsct Tue Nov 12 07:54:22 2013<br>
@@ -20,6 +20,9 @@<br>
<!--This header contains the command ids for the menus provided by the shell. --><br>
<Extern href="vsshlids.h"/><br>
<br>
+ <!--Definition of some VSCT specific constants. In this sample we use it for the IDs inside the guidOfficeIcon group. --><br>
+ <Extern href="msobtnid.h"/><br>
+<br>
<br>
<br>
<br>
@@ -59,7 +62,7 @@<br>
You can add more than one CommandFlag node e.g.:<br>
<CommandFlag>DefaultInvisible</CommandFlag><br>
<CommandFlag>DynamicVisibility</CommandFlag><br>
- If you do not want an image next to your command, remove the Icon node /> --><br>
+ If you do not want an image next to your command, remove the Icon node or set it to <Icon guid="guidOfficeIcon" id="msotcidNoIcon" /> --><br>
<br>
<Button guid="guidClangFormatCmdSet" id="cmdidClangFormat" priority="0x0100" type="Button"><br>
<Parent guid="guidClangFormatCmdSet" id="MyMenuGroup" /><br>
@@ -80,8 +83,8 @@<br>
bitmap strip containing the bitmaps and then there are the numeric ids of the elements used<br>
inside a button definition. An important aspect of this declaration is that the element id<br>
must be the actual index (1-based) of the bitmap inside the bitmap strip. --><br>
- <Bitmap guid="guidImages" href="Resources\Images.png" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows"/><br>
-<br>
+ <Bitmap guid="guidImages" href="Resources\Images_32bit.bmp" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows"/><br>
+<br>
</Bitmaps><br>
<br>
</Commands><br>
@@ -112,7 +115,6 @@<br>
<IDSymbol name="bmpPicSearch" value="3" /><br>
<IDSymbol name="bmpPicX" value="4" /><br>
<IDSymbol name="bmpPicArrows" value="5" /><br>
- <IDSymbol name="bmpPicStrikethrough" value="6" /><br>
</GuidSymbol><br>
</Symbols><br>
<br>
<br>
Modified: cfe/trunk/tools/clang-format-vs/ClangFormat/Resources/Package.ico<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format-vs/ClangFormat/Resources/Package.ico?rev=194477&r1=194476&r2=194477&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format-vs/ClangFormat/Resources/Package.ico?rev=194477&r1=194476&r2=194477&view=diff</a><br>
==============================================================================<br>
Binary files - no diff available.<br>
<br>
Modified: cfe/trunk/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest?rev=194477&r1=194476&r2=194477&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest?rev=194477&r1=194476&r2=194477&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest (original)<br>
+++ cfe/trunk/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest Tue Nov 12 07:54:22 2013<br>
@@ -1,18 +1,25 @@<br>
<?xml version="1.0" encoding="utf-8"?><br>
-<PackageManifest Version="2.0.0" xmlns="<a href="http://schemas.microsoft.com/developer/vsx-schema/2011" target="_blank">http://schemas.microsoft.com/developer/vsx-schema/2011</a>" xmlns:d="<a href="http://schemas.microsoft.com/developer/vsx-schema-design/2011" target="_blank">http://schemas.microsoft.com/developer/vsx-schema-design/2011</a>"><br>
- <Metadata><br>
- <Identity Id="c5286038-25d3-4f65-83a8-51fa2df4a146" Version="1.0" Language="en-US" Publisher="LLVM" /><br>
- <DisplayName>ClangFormat</DisplayName><br>
- <Description>Formats code by calling the clang-format executable.</Description><br>
- </Metadata><br>
- <Installation InstalledByMsi="false"><br>
- <InstallationTarget Id="<a href="http://Microsoft.VisualStudio.Pro" target="_blank">Microsoft.VisualStudio.Pro</a>" Version="11.0" /><br>
- </Installation><br>
- <Dependencies><br>
- <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" /><br>
- <Dependency Id="Microsoft.VisualStudio.MPF.11.0" DisplayName="Visual Studio MPF 11.0" d:Source="Installed" Version="11.0" /><br>
- </Dependencies><br>
- <Assets><br>
- <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" /><br>
- </Assets><br>
-</PackageManifest><br>
+<Vsix Version="1.0.0" xmlns="<a href="http://schemas.microsoft.com/developer/vsx-schema/2010" target="_blank">http://schemas.microsoft.com/developer/vsx-schema/2010</a>"><br>
+ <Identifier Id="20dbc914-1c7a-4992-b236-ef58b37850eb"><br>
+ <Name>ClangFormat</Name><br>
+ <Author>LLVM</Author><br>
+ <Version>1.0</Version><br>
+ <Description xml:space="preserve">Information about my package</Description><br>
+ <Locale>1033</Locale><br>
+ <InstalledByMsi>false</InstalledByMsi><br>
+ <SupportedProducts><br>
+ <VisualStudio Version="10.0"><br>
+ <Edition>Pro</Edition><br>
+ </VisualStudio><br>
+ </SupportedProducts><br>
+ <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" /><br>
+ </Identifier><br>
+ <References><br>
+ <Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0"><br>
+ <Name>Visual Studio MPF</Name><br>
+ </Reference><br>
+ </References><br>
+ <Content><br>
+ <VsPackage>|%CurrentProject%;PkgdefProjectOutputGroup|</VsPackage><br>
+ </Content><br>
+</Vsix><br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div></div></div><br></div></div>
</blockquote></div><br></div></div>