Merge pull request #140 from ckormanyos/discovery_ci

Fix #124 via build MandelbrotDiscovery in CI
ckormanyos · Aug 26, 2024 · fe932fd · fe932fd
2 parents 923961a + 1388269
commit fe932fd
Show file tree

Hide file tree

Showing 6 changed files with 116 additions and 224 deletions.
diff --git a/.github/workflows/mandelbrot_discovery.yml b/.github/workflows/mandelbrot_discovery.yml
@@ -0,0 +1,64 @@
+# ------------------------------------------------------------------------------
+#  Copyright Christopher Kormanyos 2022 - 2024.
+#  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)
+# ------------------------------------------------------------------------------
+
+name: mandelbrot_discovery
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+jobs:
+  msvc-release-x64-discovery:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: '0'
+      - name: clone-submods-bootstrap-headers-boost-develop
+        run: |
+          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/functional
+          git submodule update --init libs/gil
+          git submodule update --init libs/integer
+          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/static_assert
+          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.bat
+          ./b2 headers
+      - uses: actions/checkout@v4
+      - uses: ilammy/msvc-dev-cmd@v1
+        with:
+          toolset: 14.4
+      - name: msvc-release-x64-discovery
+        shell: cmd
+        working-directory: ./MandelbrotDiscovery
+        run: |
+          set INCLUDE=%cd%\..;%cd%;%cd%\..\png\zlib\zlib-1.3.1.1-2024;%cd%\..\png\libpng\libpng-1.6.44.git-2024;%cd%\..\jpeg\jpeg-6b-2022;%cd%\..\..\boost-root;%INCLUDE%
+          MSBuild -m MandelbrotDiscovery.sln -p:useenv=true -p:Configuration=Release -p:Platform=x64 /t:Rebuild
+          dir %cd%\x64\Release\MandelbrotDiscovery.exe
diff --git a/MandelbrotDiscovery/MandelbrotDiscovery.sln b/MandelbrotDiscovery/MandelbrotDiscovery.sln
@@ -1,9 +1,29 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.34601.136
+# Visual Studio Version 17
+VisualStudioVersion = 17.11.35219.272
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MandelbrotDiscovery", "MandelbrotDiscovery.vcxproj", "{7A64B037-0443-48AD-BF63-D92EA62E0591}"
+	ProjectSection(ProjectDependencies) = postProject
+		{357A1110-B0BA-4C68-A331-4AFA6037F6F3} = {357A1110-B0BA-4C68-A331-4AFA6037F6F3}
+		{ADA3C1BC-FE9C-4BA9-9325-F435F3C73A5C} = {ADA3C1BC-FE9C-4BA9-9325-F435F3C73A5C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg_vs2022", "..\jpeg\jpeg_vs2022.vcxproj", "{357A1110-B0BA-4C68-A331-4AFA6037F6F3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_vs2022", "..\png\libpng\libpng_vs2022.vcxproj", "{ADA3C1BC-FE9C-4BA9-9325-F435F3C73A5C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{465B1E91-F370-4D6D-BB38-F6F8E9F39563} = {465B1E91-F370-4D6D-BB38-F6F8E9F39563}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib_vs2022", "..\png\zlib\zlib_vs2022.vcxproj", "{465B1E91-F370-4D6D-BB38-F6F8E9F39563}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{2DB91CE9-55AC-4066-A2B8-AEB7CB55E570}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{65CFC663-6DE8-4BA6-96E3-049A34021455}"
+	ProjectSection(SolutionItems) = preProject
+		..\.github\workflows\mandelbrot_discovery.yml = ..\.github\workflows\mandelbrot_discovery.yml
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,10 +35,25 @@ Global
 		{7A64B037-0443-48AD-BF63-D92EA62E0591}.Debug|x64.Build.0 = Debug|x64
 		{7A64B037-0443-48AD-BF63-D92EA62E0591}.Release|x64.ActiveCfg = Release|x64
 		{7A64B037-0443-48AD-BF63-D92EA62E0591}.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
+		{ADA3C1BC-FE9C-4BA9-9325-F435F3C73A5C}.Debug|x64.ActiveCfg = Debug|x64
+		{ADA3C1BC-FE9C-4BA9-9325-F435F3C73A5C}.Debug|x64.Build.0 = Debug|x64
+		{ADA3C1BC-FE9C-4BA9-9325-F435F3C73A5C}.Release|x64.ActiveCfg = Release|x64
+		{ADA3C1BC-FE9C-4BA9-9325-F435F3C73A5C}.Release|x64.Build.0 = Release|x64
+		{465B1E91-F370-4D6D-BB38-F6F8E9F39563}.Debug|x64.ActiveCfg = Debug|x64
+		{465B1E91-F370-4D6D-BB38-F6F8E9F39563}.Debug|x64.Build.0 = Debug|x64
+		{465B1E91-F370-4D6D-BB38-F6F8E9F39563}.Release|x64.ActiveCfg = Release|x64
+		{465B1E91-F370-4D6D-BB38-F6F8E9F39563}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{65CFC663-6DE8-4BA6-96E3-049A34021455} = {2DB91CE9-55AC-4066-A2B8-AEB7CB55E570}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {32820086-194F-42C3-BAC7-7DA4FD224738}
 	EndGlobalSection

diff --git a/MandelbrotDiscovery/MandelbrotDiscovery.vcxproj b/MandelbrotDiscovery/MandelbrotDiscovery.vcxproj
@@ -21,13 +21,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
@@ -45,11 +45,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\jpeg\jpeg-6b-2022;C:\boost\boost_1_84_0\;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\png\zlib\zlib-1.3.1.1-2024;$(SolutionDir)..\png\libpng\libpng-1.6.44.git-2024;$(SolutionDir)..\jpeg\jpeg-6b-2022;$(SolutionDir)..;$(SolutionDir);C:\boost\boost_1_85_0;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\jpeg\jpeg-6b-2022;C:\boost\boost_1_84_0\;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\png\zlib\zlib-1.3.1.1-2024;$(SolutionDir)..\png\libpng\libpng-1.6.44.git-2024;$(SolutionDir)..\jpeg\jpeg-6b-2022;$(SolutionDir)..;$(SolutionDir);C:\boost\boost_1_85_0;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -59,10 +59,13 @@
       <ConformanceMode>true</ConformanceMode>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
       <LanguageStandard>stdcpp20</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(SolutionDir)jpeg\$(Platform)\$(Configuration)\jpeg_vs2022.lib;$(SolutionDir)png\libpng\$(Platform)\$(Configuration)\libpng_vs2022.lib;$(SolutionDir)png\zlib\$(Platform)\$(Configuration)\zlib_vs2022.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/NODEFAULTLIB:LIBCMTD %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -75,73 +78,24 @@
       <ConformanceMode>true</ConformanceMode>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
       <LanguageStandard>stdcpp20</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(SolutionDir)jpeg\$(Platform)\$(Configuration)\jpeg_vs2022.lib;$(SolutionDir)png\libpng\$(Platform)\$(Configuration)\libpng_vs2022.lib;$(SolutionDir)png\zlib\$(Platform)\$(Configuration)\zlib_vs2022.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/NODEFAULTLIB:LIBCMT %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\jpeg\jpeg-6b-2022\jchuff.h" />
-    <ClInclude Include="..\jpeg\jpeg-6b-2022\jconfig.h" />
-    <ClInclude Include="..\jpeg\jpeg-6b-2022\jdct.h" />
-    <ClInclude Include="..\jpeg\jpeg-6b-2022\jdhuff.h" />
-    <ClInclude Include="..\jpeg\jpeg-6b-2022\jerror.h" />
-    <ClInclude Include="..\jpeg\jpeg-6b-2022\jinclude.h" />
-    <ClInclude Include="..\jpeg\jpeg-6b-2022\jmemsys.h" />
-    <ClInclude Include="..\jpeg\jpeg-6b-2022\jmorecfg.h" />
-    <ClInclude Include="..\jpeg\jpeg-6b-2022\jpegint.h" />
-    <ClInclude Include="..\jpeg\jpeg-6b-2022\jpeglib.h" />
-    <ClInclude Include="..\jpeg\jpeg-6b-2022\jversion.h" />
     <ClInclude Include="geometry.h" />
     <ClInclude Include="mandelbrot_discovery.h" />
     <ClInclude Include="text.h" />
     <ClInclude Include="utility.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jcapimin.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jcapistd.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jccoefct.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jccolor.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jcdctmgr.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jchuff.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jcinit.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jcmainct.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jcmarker.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jcmaster.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jcomapi.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jcparam.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jcphuff.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jcprepct.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jcsample.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jctrans.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jdapimin.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jdatadst.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jdcoefct.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jdcolor.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jddctmgr.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jdhuff.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jdinput.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jdmainct.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jdmarker.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jdmerge.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jdpostct.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jdsample.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jerror.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jfdctflt.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jfdctfst.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jfdctint.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jidctflt.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jidctfst.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jidctint.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jidctred.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jmemansi.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jmemmgr.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jquant1.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jquant2.c" />
-    <ClCompile Include="..\jpeg\jpeg-6b-2022\jutils.c" />
     <ClCompile Include="mandelbrot_discovery.cpp" />
   </ItemGroup>
   <ItemGroup>