Update Ruby 3.2 Windows build for Ruby DLL rename. (#220)

* Update Ruby 3.2 Windows build for Ruby DLL rename. * Remove Ruby 3.1 C extension config and build. * Remove headers and libs for Ruby 3.1. * Remove unused Ruby 2.0 framework.
SketchUp · Jan 9, 2024 · 7e7a3c5 · 7e7a3c5
1 parent 72521ab
commit 7e7a3c5
Show file tree

Hide file tree

Showing 208 changed files with 1 addition and 41,163 deletions.
diff --git a/ruby-c-extension/sketchup-taskbarlist/TaskbarProgress/Ruby 3.1 (x64).props b/ruby-c-extension/sketchup-taskbarlist/TaskbarProgress/Ruby 3.1 (x64).props
diff --git a/ruby-c-extension/sketchup-taskbarlist/TaskbarProgress/Ruby 3.2 (x64).props b/ruby-c-extension/sketchup-taskbarlist/TaskbarProgress/Ruby 3.2 (x64).props
@@ -9,7 +9,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(SolutionDir)ThirdParty\lib\win\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>x64-msvcrt-ruby320.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>x64-ucrt-ruby320.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />

diff --git a/ruby-c-extension/sketchup-taskbarlist/TaskbarProgress/TaskbarProgress.vcxproj b/ruby-c-extension/sketchup-taskbarlist/TaskbarProgress/TaskbarProgress.vcxproj
@@ -21,10 +21,6 @@
       <Configuration>Debug 2.7</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug 3.1|x64">
-      <Configuration>Debug 3.1</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug 3.2|x64">
       <Configuration>Debug 3.2</Configuration>
       <Platform>x64</Platform>
@@ -49,10 +45,6 @@
       <Configuration>Release 2.7</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release 3.1|x64">
-      <Configuration>Release 3.1</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release 3.2|x64">
       <Configuration>Release 3.2</Configuration>
       <Platform>x64</Platform>
@@ -96,12 +88,6 @@
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 3.1|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 3.2|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -138,12 +124,6 @@
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 3.1|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 3.2|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -178,11 +158,6 @@
     <Import Project="RubyExtension.props" />
     <Import Project="Ruby 3.1 (x64).props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 3.1|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="RubyExtension.props" />
-    <Import Project="Ruby 3.1 (x64).props" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 3.2|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="RubyExtension.props" />
@@ -213,11 +188,6 @@
     <Import Project="RubyExtension.props" />
     <Import Project="Ruby 2.7 (x64).props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 3.1|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="RubyExtension.props" />
-    <Import Project="Ruby 3.1 (x64).props" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 3.2|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="RubyExtension.props" />
@@ -239,9 +209,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 2.7|x64'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 3.1|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 3.2|x64'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
@@ -260,9 +227,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.7|x64'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 3.1|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 3.2|x64'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
@@ -291,11 +255,6 @@
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerCommandArguments>-RubyStartup "$(SolutionDir)/Ruby/debug.rb"</LocalDebuggerCommandArguments>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 3.1|x64'">
-    <LocalDebuggerCommand>$(ProgramFiles)\SketchUp\SketchUp 2014\SketchUp.exe</LocalDebuggerCommand>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>-RubyStartup "$(SolutionDir)/Ruby/debug.rb"</LocalDebuggerCommandArguments>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 3.2|x64'">
     <LocalDebuggerCommand>$(ProgramFiles)\SketchUp\SketchUp 2014\SketchUp.exe</LocalDebuggerCommand>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
@@ -329,11 +288,6 @@
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerCommand>$(ProgramFiles)\SketchUp\SketchUp 2014\SketchUp.exe</LocalDebuggerCommand>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 3.1|x64'">
-    <LocalDebuggerCommandArguments>-RubyStartup "$(SolutionDir)/Ruby/release.rb"</LocalDebuggerCommandArguments>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommand>$(ProgramFiles)\SketchUp\SketchUp 2014\SketchUp.exe</LocalDebuggerCommand>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 3.2|x64'">
     <LocalDebuggerCommandArguments>-RubyStartup "$(SolutionDir)/Ruby/release.rb"</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
@@ -429,24 +383,6 @@
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 3.1|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Midl>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 3.2|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -585,30 +521,6 @@
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 3.1|x64'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Midl>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 3.2|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>

diff --git a/ruby-c-extension/sketchup-taskbarlist/TestUp.sln b/ruby-c-extension/sketchup-taskbarlist/TestUp.sln
@@ -15,8 +15,6 @@ Global
 		Debug 2.5|x64 = Debug 2.5|x64
 		Debug 2.7|Win32 = Debug 2.7|Win32
 		Debug 2.7|x64 = Debug 2.7|x64
-		Debug 3.1|Win32 = Debug 3.1|Win32
-		Debug 3.1|x64 = Debug 3.1|x64
 		Debug 3.2|Win32 = Debug 3.2|Win32
 		Debug 3.2|x64 = Debug 3.2|x64
 		Release 2.0|Win32 = Release 2.0|Win32
@@ -27,8 +25,6 @@ Global
 		Release 2.5|x64 = Release 2.5|x64
 		Release 2.7|Win32 = Release 2.7|Win32
 		Release 2.7|x64 = Release 2.7|x64
-		Release 3.1|Win32 = Release 3.1|Win32
-		Release 3.1|x64 = Release 3.1|x64
 		Release 3.2|Win32 = Release 3.2|Win32
 		Release 3.2|x64 = Release 3.2|x64
 	EndGlobalSection
@@ -46,9 +42,6 @@ Global
 		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Debug 2.7|Win32.ActiveCfg = Debug 2.7|x64
 		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Debug 2.7|x64.ActiveCfg = Debug 2.7|x64
 		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Debug 2.7|x64.Build.0 = Debug 2.7|x64
-		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Debug 3.1|Win32.ActiveCfg = Debug 3.1|x64
-		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Debug 3.1|x64.ActiveCfg = Debug 3.1|x64
-		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Debug 3.1|x64.Build.0 = Debug 3.1|x64
 		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Debug 3.2|Win32.ActiveCfg = Debug 3.2|x64
 		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Debug 3.2|x64.ActiveCfg = Debug 3.2|x64
 		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Debug 3.2|x64.Build.0 = Debug 3.2|x64
@@ -65,9 +58,6 @@ Global
 		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Release 2.7|Win32.ActiveCfg = Release 2.7|x64
 		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Release 2.7|x64.ActiveCfg = Release 2.7|x64
 		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Release 2.7|x64.Build.0 = Release 2.7|x64
-		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Release 3.1|Win32.ActiveCfg = Release 3.1|x64
-		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Release 3.1|x64.ActiveCfg = Release 3.1|x64
-		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Release 3.1|x64.Build.0 = Release 3.1|x64
 		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Release 3.2|Win32.ActiveCfg = Release 3.2|x64
 		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Release 3.2|x64.ActiveCfg = Release 3.2|x64
 		{1456285A-3D25-4B13-BF30-DBAEDEB87C22}.Release 3.2|x64.Build.0 = Release 3.2|x64

diff --git a/ruby-c-extension/sketchup-taskbarlist/ThirdParty/include/ruby310/win32_x64/ruby.h b/ruby-c-extension/sketchup-taskbarlist/ThirdParty/include/ruby310/win32_x64/ruby.h