Skip to content

Commit 676163b

Browse files
janwilmansjanwilmans
committed
remove libsnappy sources from repo and switched to nuget package
1 parent bdd6ec9 commit 676163b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+24
-90112
lines changed

‎DebugView++.sln

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DebugView++", "DebugView++\
1212
EndProject
1313
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DbgMsgSrc", "DbgMsgSrc\DbgMsgSrc.vcxproj", "{722E0592-E026-4D51-87EC-6ACA85B385F4}"
1414
EndProject
15-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsnappy", "libsnappy\libsnappy.vcxproj", "{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}"
16-
EndProject
1715
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "DebugView++Setup", "DebugView++Setup\DebugView++Setup.wixproj", "{6E52889E-06C1-45DC-AF99-ACCCAFB863FF}"
1816
ProjectSection(ProjectDependencies) = postProject
1917
{C824932A-2819-4148-B54F-214D65015C54} = {C824932A-2819-4148-B54F-214D65015C54}
@@ -30,7 +28,6 @@ EndProject
3028
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DebugView++Lib", "DebugView++Lib\DebugView++Lib.vcxproj", "{5E5B7C33-8076-4E21-ADF3-D56C8C28822A}"
3129
ProjectSection(ProjectDependencies) = postProject
3230
{69756714-C1EB-47AF-B852-FF253D8DDDA8} = {69756714-C1EB-47AF-B852-FF253D8DDDA8}
33-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A} = {B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}
3431
{218AB179-4C19-4264-BD55-DF89A9F321CA} = {218AB179-4C19-4264-BD55-DF89A9F321CA}
3532
EndProjectSection
3633
EndProject
@@ -42,9 +39,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DebugViewConsole", "DebugVi
4239
EndProjectSection
4340
EndProject
4441
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IndexedStorageLib", "IndexedStorageLib\IndexedStorageLib.vcxproj", "{69756714-C1EB-47AF-B852-FF253D8DDDA8}"
45-
ProjectSection(ProjectDependencies) = postProject
46-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A} = {B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}
47-
EndProjectSection
4842
EndProject
4943
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DebugView++Test", "DebugView++Test\DebugView++Test.vcxproj", "{49BDA8E7-213A-44E2-BEDB-C599E07B8DA7}"
5044
ProjectSection(ProjectDependencies) = postProject
@@ -109,24 +103,6 @@ Global
109103
{722E0592-E026-4D51-87EC-6ACA85B385F4}.Release|x64.Build.0 = Release|x64
110104
{722E0592-E026-4D51-87EC-6ACA85B385F4}.Release|x86.ActiveCfg = Release|Win32
111105
{722E0592-E026-4D51-87EC-6ACA85B385F4}.Release|x86.Build.0 = Release|Win32
112-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Debug|Any CPU.ActiveCfg = Debug|Win32
113-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
114-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
115-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Debug|Win32.ActiveCfg = Debug|Win32
116-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Debug|Win32.Build.0 = Debug|Win32
117-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Debug|x64.ActiveCfg = Debug|x64
118-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Debug|x64.Build.0 = Debug|x64
119-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Debug|x86.ActiveCfg = Debug|Win32
120-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Debug|x86.Build.0 = Debug|Win32
121-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Release|Any CPU.ActiveCfg = Release|Win32
122-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
123-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Release|Mixed Platforms.Build.0 = Release|Win32
124-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Release|Win32.ActiveCfg = Release|Win32
125-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Release|Win32.Build.0 = Release|Win32
126-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Release|x64.ActiveCfg = Release|x64
127-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Release|x64.Build.0 = Release|x64
128-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Release|x86.ActiveCfg = Release|Win32
129-
{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}.Release|x86.Build.0 = Release|Win32
130106
{6E52889E-06C1-45DC-AF99-ACCCAFB863FF}.Debug|Any CPU.ActiveCfg = Debug|x86
131107
{6E52889E-06C1-45DC-AF99-ACCCAFB863FF}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
132108
{6E52889E-06C1-45DC-AF99-ACCCAFB863FF}.Debug|Mixed Platforms.Build.0 = Debug|x86

‎IndexedStorageLib/IndexedStorage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "stdafx.h"
99
#include <vector>
1010
#include "IndexedStorageLib/IndexedStorage.h"
11-
#include "../libsnappy/libsnappy.h"
11+
#include "snappy.h"
1212

1313
namespace fusion {
1414
namespace indexedstorage {

‎IndexedStorageLib/IndexedStorageLib.vcxproj

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\Snappy.1.1.1.7\build\native\snappy.targets" Condition="Exists('..\packages\Snappy.1.1.1.7\build\native\snappy.targets')" />
34
<ItemGroup Label="ProjectConfigurations">
45
<ProjectConfiguration Include="Debug|Win32">
56
<Configuration>Debug</Configuration>
@@ -86,7 +87,7 @@
8687
<Optimization>Disabled</Optimization>
8788
<PreprocessorDefinitions>WIN32;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8889
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
89-
<AdditionalIncludeDirectories>../include</AdditionalIncludeDirectories>
90+
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9091
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
9192
<MultiProcessorCompilation>true</MultiProcessorCompilation>
9293
<LanguageStandard>stdcpp17</LanguageStandard>
@@ -103,7 +104,7 @@
103104
<Optimization>Disabled</Optimization>
104105
<PreprocessorDefinitions>WIN32;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105106
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
106-
<AdditionalIncludeDirectories>../include</AdditionalIncludeDirectories>
107+
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
107108
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
108109
<MultiProcessorCompilation>true</MultiProcessorCompilation>
109110
<ConformanceMode>true</ConformanceMode>
@@ -123,7 +124,7 @@
123124
<IntrinsicFunctions>true</IntrinsicFunctions>
124125
<PreprocessorDefinitions>WIN32;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125126
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
126-
<AdditionalIncludeDirectories>../include</AdditionalIncludeDirectories>
127+
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127128
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
128129
<MultiProcessorCompilation>true</MultiProcessorCompilation>
129130
<LanguageStandard>stdcpp17</LanguageStandard>
@@ -144,7 +145,7 @@
144145
<IntrinsicFunctions>true</IntrinsicFunctions>
145146
<PreprocessorDefinitions>WIN32;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
146147
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
147-
<AdditionalIncludeDirectories>../include</AdditionalIncludeDirectories>
148+
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
148149
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
149150
<MultiProcessorCompilation>true</MultiProcessorCompilation>
150151
<ConformanceMode>true</ConformanceMode>
@@ -172,12 +173,14 @@
172173
</ClCompile>
173174
</ItemGroup>
174175
<ItemGroup>
175-
<ProjectReference Include="..\libsnappy\libsnappy.vcxproj">
176-
<Project>{b1aee15f-4caf-4aca-b5dc-756ec3afa77a}</Project>
177-
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
178-
</ProjectReference>
176+
<None Include="packages.config" />
179177
</ItemGroup>
180178
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
181-
<ImportGroup Label="ExtensionTargets">
182-
</ImportGroup>
179+
<ImportGroup Label="ExtensionTargets" />
180+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
181+
<PropertyGroup>
182+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
183+
</PropertyGroup>
184+
<Error Condition="!Exists('..\packages\Snappy.1.1.1.7\build\native\snappy.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Snappy.1.1.1.7\build\native\Snappy.props'))" />
185+
</Target>
183186
</Project>

‎IndexedStorageLib/IndexedStorageLib.vcxproj.filters

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,11 @@
2828
<ClCompile Include="IndexedStorage.cpp">
2929
<Filter>Source Files</Filter>
3030
</ClCompile>
31+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\snappy-single-file.cpp">
32+
<Filter>Source Files</Filter>
33+
</ClCompile>
34+
</ItemGroup>
35+
<ItemGroup>
36+
<None Include="packages.config" />
3137
</ItemGroup>
3238
</Project>

‎IndexedStorageLib/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Snappy" version="1.1.1.7" targetFramework="native" />
4+
</packages>

‎Libraries/snappy/AUTHORS

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Libraries/snappy/COPYING

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)