Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/glog
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8ab71db21d38^
Choose a base ref
...
head repository: mockingbirdnest/glog
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e05da2e86684
Choose a head ref
  • 6 commits
  • 18 files changed
  • 1 contributor

Commits on Jun 6, 2021

  1. Copy the full SHA
    8ab71db View commit details
  2. Project script file.

    pleroy committed Jun 6, 2021
    Copy the full SHA
    7a2a860 View commit details
  3. Chromium files.

    pleroy committed Jun 6, 2021
    Copy the full SHA
    491fac7 View commit details
  4. Copy the full SHA
    a76c274 View commit details
  5. No C++17 in glog.

    pleroy committed Jun 6, 2021
    Copy the full SHA
    a378892 View commit details
  6. cdecl and a relative path.

    pleroy committed Jun 6, 2021
    Copy the full SHA
    e05da2e View commit details
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -76,8 +76,4 @@ packages/debian-*
CMakeCache.txt
CMakeFiles/
*.cmake
config.h
*.sln
*.vcxproj
*.filters
bazel-*
95 changes: 95 additions & 0 deletions build_projects_helper.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
# This script helps creating project files for glog. The argument is the path of glog/.
# It produces two pairs of *.vcxproj, *.vcxproj.filters files: one for the project itself, one for its tests.

$dir = resolve-path $args[0]

$filtersheaders = " <ItemGroup>`r`n"
$vcxprojheaders = " <ItemGroup>`r`n"
Get-ChildItem "$dir\src\windows\glog\*" -Recurse -Include *.h | `
Foreach-Object {
$msvcrelativepath = $_.FullName -replace ".*src\\", "..\..\src\"
$filtersheaders +=
" <ClInclude Include=`"$msvcrelativepath`">`r`n" +
" <Filter>Header Files</Filter>`r`n" +
" </ClInclude>`r`n"
$vcxprojheaders +=
" <ClInclude Include=`"$msvcrelativepath`" />`r`n"
}
$filtersheaders += " </ItemGroup>`r`n"
$vcxprojheaders += " </ItemGroup>`r`n"

$filterssources = " <ItemGroup>`r`n"
$vcxprojsources = " <ItemGroup>`r`n"
Get-ChildItem "$dir\src\*" -Recurse -Include *.h | `
Foreach-Object {
If ( $_.FullName -notmatch ".*windows\\glog") {
$msvcrelativepath = $_.FullName -replace ".*src\\", "..\..\src\"
$filterssources +=
" <ClInclude Include=`"$msvcrelativepath`">`r`n" +
" <Filter>Source Files</Filter>`r`n" +
" </ClInclude>`r`n"
$vcxprojsources +=
" <ClInclude Include=`"$msvcrelativepath`" />`r`n"
}
}
Get-ChildItem "$dir\src\*" -Recurse -Include *.cc -Exclude *test*.cc | `
Foreach-Object {
$msvcrelativepath = $_.FullName -replace ".*src\\", "..\..\src\"
$filterssources +=
" <ClCompile Include=`"$msvcrelativepath`">`r`n" +
" <Filter>Source Files</Filter>`r`n" +
" </ClCompile>`r`n"
$vcxprojsources +=
" <ClCompile Include=`"$msvcrelativepath`" />`r`n"
}
$filterssources += " </ItemGroup>`r`n"
$vcxprojsources += " </ItemGroup>`r`n"

$filterstests = " <ItemGroup>`r`n"
$vcxprojtests = " <ItemGroup>`r`n"
Get-ChildItem "$dir\src\*" -Recurse -Include *test*.h | `
Foreach-Object {
$msvcrelativepath = $_.FullName -replace ".*src\\", "..\..\src\"
$filterstests +=
" <ClInclude Include=`"$msvcrelativepath`">`r`n" +
" <Filter>Source Files</Filter>`r`n" +
" </ClInclude>`r`n"
$vcxprojtests +=
" <ClInclude Include=`"$msvcrelativepath`" />`r`n"
}
Get-ChildItem "$dir\src\*" -Recurse -Include *test*.cc | `
Foreach-Object {
$msvcrelativepath = $_.FullName -replace ".*src\\", "..\..\src\"
$filterstests +=
" <ClCompile Include=`"$msvcrelativepath`">`r`n" +
" <Filter>Source Files</Filter>`r`n" +
" </ClCompile>`r`n"
$vcxprojtests +=
" <ClCompile Include=`"$msvcrelativepath`" />`r`n"
}
$filterstests += " </ItemGroup>`r`n"
$vcxprojtests += " </ItemGroup>`r`n"

$dirfilterspath = [string]::format("{0}\glog_vcxproj_filters.txt", $dir)
[system.io.file]::writealltext(
$dirfilterspath,
$filtersheaders + $filterssources,
[system.text.encoding]::utf8)

$testsfilterspath = [string]::format("{0}\tests_vcxproj_filters.txt", $dir)
[system.io.file]::writealltext(
$testsfilterspath,
$filterstests,
[system.text.encoding]::utf8)

$dirvcxprojpath = [string]::format("{0}\glog_vcxproj.txt", $dir)
[system.io.file]::writealltext(
$dirvcxprojpath,
$vcxprojheaders + $vcxprojsources,
[system.text.encoding]::utf8)

$testsvcxprojpath = [string]::format("{0}\tests_vcxproj.txt", $dir)
[system.io.file]::writealltext(
$testsvcxprojpath,
$vcxprojtests,
[system.text.encoding]::utf8)
36 changes: 36 additions & 0 deletions msvc/chromium_vcxproj.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<ItemGroup>
<ClCompile Include="..\..\..\chromium\base\debug\stack_trace.cc" />
<ClCompile Include="..\..\..\chromium\base\debug\stack_trace_win.cc" />
<ClCompile Include="..\..\..\chromium\base\files\file_path.cc" />
<ClCompile Include="..\..\..\chromium\base\files\file_path_constants.cc" />
<ClCompile Include="..\..\..\chromium\base\memory\singleton.cc" />
<ClCompile Include="..\..\..\chromium\base\process\launch_win.cc" />
<ClCompile Include="..\..\..\chromium\base\strings\string_piece.cc" />
<ClCompile Include="..\..\..\chromium\base\strings\string_util.cc" />
<ClCompile Include="..\..\..\chromium\base\strings\string_util_constants.cc" />
<ClCompile Include="..\..\..\chromium\base\synchronization\lock.cc" />
<ClCompile Include="..\..\..\chromium\base\synchronization\lock_impl_win.cc" />
<ClCompile Include="..\..\..\chromium\base\threading\platform_thread_win.cc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\chromium\base\atomicops.h" />
<ClInclude Include="..\..\..\chromium\base\base_export.h" />
<ClInclude Include="..\..\..\chromium\base\basictypes.h" />
<ClInclude Include="..\..\..\chromium\base\compiler_specific.h" />
<ClInclude Include="..\..\..\chromium\base\debug\stack_trace.h" />
<ClInclude Include="..\..\..\chromium\base\files\file_path.h" />
<ClInclude Include="..\..\..\chromium\base\macros.h" />
<ClInclude Include="..\..\..\chromium\base\memory\aligned_memory.h" />
<ClInclude Include="..\..\..\chromium\base\memory\singleton.h" />
<ClInclude Include="..\..\..\chromium\base\port.h" />
<ClInclude Include="..\..\..\chromium\base\process\launch.h" />
<ClInclude Include="..\..\..\chromium\base\strings\string16.h" />
<ClInclude Include="..\..\..\chromium\base\strings\string_piece.h" />
<ClInclude Include="..\..\..\chromium\base\strings\string_util.h" />
<ClInclude Include="..\..\..\chromium\base\strings\string_util_win.h" />
<ClInclude Include="..\..\..\chromium\base\synchronization\lock.h" />
<ClInclude Include="..\..\..\chromium\base\synchronization\lock_impl.h" />
<ClInclude Include="..\..\..\chromium\base\third_party\dynamic_annotations\dynamic_annotations.h" />
<ClInclude Include="..\..\..\chromium\base\threading\platform_thread.h" />
<ClInclude Include="..\..\..\chromium\build\build_config.h" />
</ItemGroup>
100 changes: 100 additions & 0 deletions msvc/chromium_vcxproj_filters.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<ItemGroup>
<ClCompile Include="..\..\..\chromium\base\debug\stack_trace.cc">
<Filter>Chromium Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\chromium\base\debug\stack_trace_win.cc">
<Filter>Chromium Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\chromium\base\process\launch_win.cc">
<Filter>Chromium Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\chromium\base\files\file_path.cc">
<Filter>Chromium Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\chromium\base\strings\string_util.cc">
<Filter>Chromium Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\chromium\base\synchronization\lock.cc">
<Filter>Chromium Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\chromium\base\files\file_path_constants.cc">
<Filter>Chromium Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\chromium\base\memory\singleton.cc">
<Filter>Chromium Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\chromium\base\synchronization\lock_impl_win.cc">
<Filter>Chromium Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\chromium\base\strings\string_util_constants.cc">
<Filter>Chromium Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\chromium\base\threading\platform_thread_win.cc">
<Filter>Chromium Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\chromium\base\strings\string_piece.cc">
<Filter>Chromium Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\chromium\base\debug\stack_trace.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\base_export.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\build\build_config.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\basictypes.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\memory\singleton.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\files\file_path.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\process\launch.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\macros.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\port.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\strings\string_util.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\synchronization\lock.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\synchronization\lock_impl.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\strings\string_piece.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\atomicops.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\memory\aligned_memory.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\third_party\dynamic_annotations\dynamic_annotations.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\threading\platform_thread.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\compiler_specific.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\strings\string16.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\chromium\base\strings\string_util_win.h">
<Filter>Chromium Header Files</Filter>
</ClInclude>
</ItemGroup>
118 changes: 118 additions & 0 deletions msvc/glog.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<!--Define project configurations. Nothing interesting can happen here.-->
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>

<!--Microsoft C++ stuff.-->
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

<!--Definitions.-->
<PropertyGroup>
<!--Predicates.-->
<PrincipiaCompilerClangLLVM>false</PrincipiaCompilerClangLLVM>
<PrincipiaCompilerClangLLVM Condition="$(Configuration)==Release_LLVM">true</PrincipiaCompilerClangLLVM>
<PrincipiaOptimize>false</PrincipiaOptimize>
<PrincipiaOptimize Condition="$(Configuration.StartsWith('Release'))">true</PrincipiaOptimize>
<PrincipiaMainProject>false</PrincipiaMainProject>
<PrincipiaMainProject Condition="$(ProjectName) == tests_static or
$(ProjectName) == tests">true</PrincipiaMainProject>
<PrincipiaStatic>false</PrincipiaStatic>
<PrincipiaStatic Condition="$(ProjectName) == glog_static or
$(ProjectName) == tests_static">true</PrincipiaStatic>
<!--Dependency paths.-->
<PrincipiaDependencyConfiguration>Debug</PrincipiaDependencyConfiguration>
<PrincipiaDependencyConfiguration Condition="$(PrincipiaOptimize)">Release</PrincipiaDependencyConfiguration>
</PropertyGroup>

<!--Compiler.-->
<PropertyGroup>
<PlatformToolset>v142</PlatformToolset>
<OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
<IntDir>$(Configuration)\$(Platform)\</IntDir>
</PropertyGroup>

<!--Target.-->
<PropertyGroup>
<ConfigurationType>DynamicLibrary</ConfigurationType>
<ConfigurationType Condition="$(PrincipiaStatic)">StaticLibrary</ConfigurationType>
<ConfigurationType Condition="$(PrincipiaMainProject)">Application</ConfigurationType>
</PropertyGroup>
<ItemDefinitionGroup Condition="$(ConfigurationType)==Application">
<Link>
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>

<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

<!--Common options.-->
<PropertyGroup>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<CallingConvention>vectorcall</CallingConvention>
<LanguageStandard>stdcpp14</LanguageStandard>
<WarningLevel>Level3</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)..\src\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4018;4068;4101;4180;4244;4267;4723;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
</Link>
</ItemDefinitionGroup>
<!--Debug options.-->
<PropertyGroup Condition="!$(PrincipiaOptimize)">
<UseDebugLibraries>true</UseDebugLibraries>
</PropertyGroup>
<ItemDefinitionGroup Condition="!$(PrincipiaOptimize)">
<ClCompile>
<Optimization>Disabled</Optimization>
</ClCompile>
<Link></Link>
</ItemDefinitionGroup>
<!--Release options.-->
<PropertyGroup Condition="$(PrincipiaOptimize)">
<UseDebugLibraries>false</UseDebugLibraries>
</PropertyGroup>
<ItemDefinitionGroup Condition="$(PrincipiaOptimize)">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>

<!--Import our property sheets.-->
<ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)include_chromium.props"/>
<Import Project="$(SolutionDir)portability_macros.props"/>
<Import Condition="$(PrincipiaStatic)" Project="$(SolutionDir)static_linking.props"/>
</ImportGroup>

<!--This import must be at the end.-->
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
Loading