Merge pull request #54 from ckormanyos/update_vs2022_workspace_and_ci

Update vs2022 workspace and ci
ckormanyos · Feb 25, 2023 · f565aca · f565aca
2 parents f17a815 + 88e4b11
commit f565aca
Show file tree

Hide file tree

Showing 11 changed files with 761 additions and 42 deletions.
diff --git a/.github/workflows/mandelbrot.yml b/.github/workflows/mandelbrot.yml
diff --git a/.github/workflows/mandelbrot_sonar.yml b/.github/workflows/mandelbrot_sonar.yml
@@ -23,11 +23,44 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          fetch-depth: 0
-      - name: install-boost
+          fetch-depth: '0'
+      - name: clone-submods-bootstrap-headers-boost-develop
         run: |
-          sudo apt-get update --quiet
-          sudo apt-get install --no-install-recommends --quiet --yes libboost-dev
+          git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
+          cd ../boost-root
+          git submodule update --init tools
+          git submodule update --init libs/array
+          git submodule update --init libs/assert
+          git submodule update --init libs/concept_check
+          git submodule update --init libs/config
+          git submodule update --init libs/container
+          git submodule update --init libs/container_hash
+          git submodule update --init libs/core
+          git submodule update --init libs/describe
+          git submodule update --init libs/detail
+          git submodule update --init libs/filesystem
+          git submodule update --init libs/functional
+          git submodule update --init libs/gil
+          git submodule update --init libs/integer
+          git submodule update --init libs/io
+          git submodule update --init libs/iterator
+          git submodule update --init libs/lexical_cast
+          git submodule update --init libs/move
+          git submodule update --init libs/mp11
+          git submodule update --init libs/mpl
+          git submodule update --init libs/multiprecision
+          git submodule update --init libs/numeric/conversion
+          git submodule update --init libs/preprocessor
+          git submodule update --init libs/range
+          git submodule update --init libs/smart_ptr
+          git submodule update --init libs/static_assert
+          git submodule update --init libs/system
+          git submodule update --init libs/throw_exception
+          git submodule update --init libs/type_traits
+          git submodule update --init libs/utility
+          git submodule update --init libs/variant2
+          ./bootstrap.sh
+          ./b2 headers
       - name: prepare-environment
         run: |
           echo "query GCC version"
@@ -38,9 +71,10 @@ jobs:
           cd ..
           mkdir -p images/tmp
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 11
+          distribution: 'zulu'
       - name: Download and set up sonar-scanner
         env:
           SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip
@@ -58,7 +92,7 @@ jobs:
           echo "$HOME/.sonar/build-wrapper-linux-x86" >> $GITHUB_PATH
       - name: Run build-wrapper
         run: |
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} g++ -c -finline-functions -march=native -mtune=native -O3 -Wall -Wextra -std=c++2a -I. -Ijpeg/jpeg-6b-2022 -pthread test/test_mandelbrot.cpp -o test_mandelbrot.o && g++ test_mandelbrot.o -lpthread -ljpeg-6b -Ljpeg/jpeg-6b-2022/obj -o test_mandelbrot.exe
+          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} g++ -c -finline-functions -march=native -mtune=native -O3 -Wall -Wextra -std=c++2a -I. -Ijpeg/jpeg-6b-2022 -I../boost-root -pthread test/test_mandelbrot.cpp -o test_mandelbrot.o && g++ test_mandelbrot.o -lpthread -ljpeg-6b -Ljpeg/jpeg-6b-2022/obj -o test_mandelbrot.exe
       - name: Run sonar-scanner
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,5 @@
 .vs/
 x64/
 mandelbrot.vcxproj.user
+mandelbrot_vs2022.vcxproj.user
+images/tmp/
diff --git a/jpeg/jpeg_vs2022.vcxproj b/jpeg/jpeg_vs2022.vcxproj
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <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>
+  <ItemGroup>
+    <ClCompile Include="jpeg-6b-2022\jcapimin.c" />
+    <ClCompile Include="jpeg-6b-2022\jcapistd.c" />
+    <ClCompile Include="jpeg-6b-2022\jccoefct.c" />
+    <ClCompile Include="jpeg-6b-2022\jccolor.c" />
+    <ClCompile Include="jpeg-6b-2022\jcdctmgr.c" />
+    <ClCompile Include="jpeg-6b-2022\jchuff.c" />
+    <ClCompile Include="jpeg-6b-2022\jcinit.c" />
+    <ClCompile Include="jpeg-6b-2022\jcmainct.c" />
+    <ClCompile Include="jpeg-6b-2022\jcmarker.c" />
+    <ClCompile Include="jpeg-6b-2022\jcmaster.c" />
+    <ClCompile Include="jpeg-6b-2022\jcomapi.c" />
+    <ClCompile Include="jpeg-6b-2022\jcparam.c" />
+    <ClCompile Include="jpeg-6b-2022\jcphuff.c" />
+    <ClCompile Include="jpeg-6b-2022\jcprepct.c" />
+    <ClCompile Include="jpeg-6b-2022\jcsample.c" />
+    <ClCompile Include="jpeg-6b-2022\jctrans.c" />
+    <ClCompile Include="jpeg-6b-2022\jdapimin.c" />
+    <ClCompile Include="jpeg-6b-2022\jdatadst.c" />
+    <ClCompile Include="jpeg-6b-2022\jdcoefct.c" />
+    <ClCompile Include="jpeg-6b-2022\jdcolor.c" />
+    <ClCompile Include="jpeg-6b-2022\jddctmgr.c" />
+    <ClCompile Include="jpeg-6b-2022\jdhuff.c" />
+    <ClCompile Include="jpeg-6b-2022\jdinput.c" />
+    <ClCompile Include="jpeg-6b-2022\jdmainct.c" />
+    <ClCompile Include="jpeg-6b-2022\jdmarker.c" />
+    <ClCompile Include="jpeg-6b-2022\jdmerge.c" />
+    <ClCompile Include="jpeg-6b-2022\jdpostct.c" />
+    <ClCompile Include="jpeg-6b-2022\jdsample.c" />
+    <ClCompile Include="jpeg-6b-2022\jerror.c" />
+    <ClCompile Include="jpeg-6b-2022\jfdctflt.c" />
+    <ClCompile Include="jpeg-6b-2022\jfdctfst.c" />
+    <ClCompile Include="jpeg-6b-2022\jfdctint.c" />
+    <ClCompile Include="jpeg-6b-2022\jidctflt.c" />
+    <ClCompile Include="jpeg-6b-2022\jidctfst.c" />
+    <ClCompile Include="jpeg-6b-2022\jidctint.c" />
+    <ClCompile Include="jpeg-6b-2022\jidctred.c" />
+    <ClCompile Include="jpeg-6b-2022\jmemansi.c" />
+    <ClCompile Include="jpeg-6b-2022\jmemmgr.c" />
+    <ClCompile Include="jpeg-6b-2022\jquant1.c" />
+    <ClCompile Include="jpeg-6b-2022\jquant2.c" />
+    <ClCompile Include="jpeg-6b-2022\jutils.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="jpeg-6b-2022\jchuff.h" />
+    <ClInclude Include="jpeg-6b-2022\jconfig.h" />
+    <ClInclude Include="jpeg-6b-2022\jdct.h" />
+    <ClInclude Include="jpeg-6b-2022\jdhuff.h" />
+    <ClInclude Include="jpeg-6b-2022\jerror.h" />
+    <ClInclude Include="jpeg-6b-2022\jinclude.h" />
+    <ClInclude Include="jpeg-6b-2022\jmemsys.h" />
+    <ClInclude Include="jpeg-6b-2022\jmorecfg.h" />
+    <ClInclude Include="jpeg-6b-2022\jpegint.h" />
+    <ClInclude Include="jpeg-6b-2022\jpeglib.h" />
+    <ClInclude Include="jpeg-6b-2022\jversion.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Makefile">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{357a1110-b0ba-4c68-a331-4afa6037f6f3}</ProjectGuid>
+    <RootNamespace>jpeg</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>jpeg_vs2022</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)jpeg\$(Platform)\$(Configuration)\</OutDir>
+    <IncludePath>$(IncludePath)</IncludePath>
+    <ExternalIncludePath>$(IncludePath)</ExternalIncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)jpeg\$(Platform)\$(Configuration)\</OutDir>
+    <IncludePath>$(IncludePath)</IncludePath>
+    <ExternalIncludePath>$(IncludePath)</ExternalIncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile />
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>
+      </SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile />
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>
+      </SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/mandelbrot.vcxproj b/mandelbrot.vcxproj
@@ -43,11 +43,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)jpeg\jpeg-6b-2022;$(SolutionDir);C:\boost\boost_1_80_0;$(SolutionDir)mpir\x64;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)jpeg\jpeg-6b-2022;$(SolutionDir);C:\boost\boost_1_81_0;$(SolutionDir)mpir\x64;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)jpeg\jpeg-6b-2022;$(SolutionDir);C:\boost\boost_1_80_0;$(SolutionDir)mpir\x64;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)jpeg\jpeg-6b-2022;$(SolutionDir);C:\boost\boost_1_81_0;$(SolutionDir)mpir\x64;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>

diff --git a/mandelbrot/mandelbrot.h b/mandelbrot/mandelbrot.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-//      Copyright Christopher Kormanyos 2015 - 2022.
+//      Copyright Christopher Kormanyos 2015 - 2023.
 // Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)

diff --git a/mandelbrot/mandelbrot_color.h b/mandelbrot/mandelbrot_color.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-//      Copyright Christopher Kormanyos 2015 - 2022.
+//      Copyright Christopher Kormanyos 2015 - 2023.
 // Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)

diff --git a/mandelbrot_vs2022.sln b/mandelbrot_vs2022.sln
@@ -0,0 +1,58 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33213.308
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{CABF0657-7175-47D3-B614-47D9BED63273}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{054377E5-7DA0-4101-8BA3-1BE0C0DE51B0}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\mandelbrot.yml = .github\workflows\mandelbrot.yml
+		.github\workflows\mandelbrot_codecov.yml = .github\workflows\mandelbrot_codecov.yml
+		.github\workflows\mandelbrot_sonar.yml = .github\workflows\mandelbrot_sonar.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_doc", "_doc", "{951EE097-D8B7-4AD4-9F03-9E514A58C8D0}"
+	ProjectSection(SolutionItems) = preProject
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".tidy", ".tidy", "{D6D14B8C-1202-4F80-A348-979DADDD6A7A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "make", "make", "{D47BAF5F-ABFE-4A40-871C-6C6BB472B62D}"
+	ProjectSection(SolutionItems) = preProject
+		.tidy\make\make_tidy_01_generic.gmk = .tidy\make\make_tidy_01_generic.gmk
+		.tidy\make\make_tidy_02_files.gmk = .tidy\make\make_tidy_02_files.gmk
+		.tidy\make\make_tidy_03_flags.gmk = .tidy\make\make_tidy_03_flags.gmk
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mandelbrot_vs2022", "mandelbrot_vs2022.vcxproj", "{F6A4D5AD-89B2-419A-9AEF-87391A4E6D1B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg_vs2022", "jpeg\jpeg_vs2022.vcxproj", "{357A1110-B0BA-4C68-A331-4AFA6037F6F3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F6A4D5AD-89B2-419A-9AEF-87391A4E6D1B}.Debug|x64.ActiveCfg = Debug|x64
+		{F6A4D5AD-89B2-419A-9AEF-87391A4E6D1B}.Debug|x64.Build.0 = Debug|x64
+		{F6A4D5AD-89B2-419A-9AEF-87391A4E6D1B}.Release|x64.ActiveCfg = Release|x64
+		{F6A4D5AD-89B2-419A-9AEF-87391A4E6D1B}.Release|x64.Build.0 = Release|x64
+		{357A1110-B0BA-4C68-A331-4AFA6037F6F3}.Debug|x64.ActiveCfg = Debug|x64
+		{357A1110-B0BA-4C68-A331-4AFA6037F6F3}.Debug|x64.Build.0 = Debug|x64
+		{357A1110-B0BA-4C68-A331-4AFA6037F6F3}.Release|x64.ActiveCfg = Release|x64
+		{357A1110-B0BA-4C68-A331-4AFA6037F6F3}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{054377E5-7DA0-4101-8BA3-1BE0C0DE51B0} = {CABF0657-7175-47D3-B614-47D9BED63273}
+		{D47BAF5F-ABFE-4A40-871C-6C6BB472B62D} = {D6D14B8C-1202-4F80-A348-979DADDD6A7A}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {47676891-0CD9-4A1F-9BB8-6055B8AACABD}
+	EndGlobalSection
+EndGlobal