Skip to content

Commit 1a48c9d

Browse files
anthony-adskanthony-adsk
committed
Took python 3.7 and python 3.8 out of build/install
These versions have reached end of life, so they should no longer be supported.
1 parent 0a9bbbc commit 1a48c9d

253 files changed

Lines changed: 3 additions & 37636 deletions

File tree

Some content is hidden

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

‎FlexSimPy.sln‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,26 @@ Global
1414
Deb_3_10|x64 = Deb_3_10|x64
1515
Rel_3_10|x64 = Rel_3_10|x64
1616
Rel_3_11|x64 = Rel_3_11|x64
17-
Rel_3_7|x64 = Rel_3_7|x64
18-
Rel_3_8|x64 = Rel_3_8|x64
1917
Rel_3_9|x64 = Rel_3_9|x64
2018
EndGlobalSection
2119
GlobalSection(ProjectConfigurationPlatforms) = postSolution
22-
{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Deb_3_10|x64.ActiveCfg = Rel_3_9|x64
20+
{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Deb_3_10|x64.ActiveCfg = Deb_3_10|x64
2321
{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_10|x64.ActiveCfg = Rel_3_10|x64
2422
{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_10|x64.Build.0 = Rel_3_10|x64
2523
{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_11|x64.ActiveCfg = Rel_3_11|x64
2624
{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_11|x64.Build.0 = Rel_3_11|x64
27-
{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_7|x64.ActiveCfg = Rel_3_7|x64
28-
{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_7|x64.Build.0 = Rel_3_7|x64
29-
{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_8|x64.ActiveCfg = Rel_3_8|x64
30-
{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_8|x64.Build.0 = Rel_3_8|x64
3125
{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_9|x64.ActiveCfg = Rel_3_9|x64
3226
{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_9|x64.Build.0 = Rel_3_9|x64
33-
{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Deb_3_10|x64.ActiveCfg = Rel_3_9|x64
27+
{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Deb_3_10|x64.ActiveCfg = Deb_3_10|x64
3428
{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_10|x64.ActiveCfg = Rel_3_10|x64
3529
{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_10|x64.Build.0 = Rel_3_10|x64
3630
{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_11|x64.ActiveCfg = Rel_3_11|x64
3731
{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_11|x64.Build.0 = Rel_3_11|x64
38-
{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_7|x64.ActiveCfg = Rel_3_7|x64
39-
{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_7|x64.Build.0 = Rel_3_7|x64
40-
{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_8|x64.ActiveCfg = Rel_3_8|x64
41-
{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_8|x64.Build.0 = Rel_3_8|x64
4232
{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_9|x64.ActiveCfg = Rel_3_9|x64
4333
{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_9|x64.Build.0 = Rel_3_9|x64
4434
{C6A7BD76-61A9-4078-87D6-DFD568848EF8}.Deb_3_10|x64.ActiveCfg = Debug|Any CPU
4535
{C6A7BD76-61A9-4078-87D6-DFD568848EF8}.Rel_3_10|x64.ActiveCfg = Release|Any CPU
4636
{C6A7BD76-61A9-4078-87D6-DFD568848EF8}.Rel_3_11|x64.ActiveCfg = Rel_3_11|Any CPU
47-
{C6A7BD76-61A9-4078-87D6-DFD568848EF8}.Rel_3_7|x64.ActiveCfg = Release|Any CPU
48-
{C6A7BD76-61A9-4078-87D6-DFD568848EF8}.Rel_3_8|x64.ActiveCfg = Release|Any CPU
4937
{C6A7BD76-61A9-4078-87D6-DFD568848EF8}.Rel_3_9|x64.ActiveCfg = Release|Any CPU
5038
EndGlobalSection
5139
GlobalSection(SolutionProperties) = preSolution

‎PyConnector/PyConnector.vcxproj‎

Lines changed: 0 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@
1313
<Configuration>Rel_3_10</Configuration>
1414
<Platform>x64</Platform>
1515
</ProjectConfiguration>
16-
<ProjectConfiguration Include="Rel_3_7|x64">
17-
<Configuration>Rel_3_7</Configuration>
18-
<Platform>x64</Platform>
19-
</ProjectConfiguration>
20-
<ProjectConfiguration Include="Rel_3_8|x64">
21-
<Configuration>Rel_3_8</Configuration>
22-
<Platform>x64</Platform>
23-
</ProjectConfiguration>
2416
<ProjectConfiguration Include="Rel_3_9|x64">
2517
<Configuration>Rel_3_9</Configuration>
2618
<Platform>x64</Platform>
@@ -68,24 +60,6 @@
6860
<OutDir>$(ProjectDir)..\out\</OutDir>
6961
<PlatformToolset>v143</PlatformToolset>
7062
</PropertyGroup>
71-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_8|x64'" Label="Configuration">
72-
<ConfigurationType>DynamicLibrary</ConfigurationType>
73-
<UseDebugLibraries>false</UseDebugLibraries>
74-
<WholeProgramOptimization>true</WholeProgramOptimization>
75-
<CharacterSet>MultiByte</CharacterSet>
76-
<LinkIncremental>false</LinkIncremental>
77-
<OutDir>$(ProjectDir)..\out\</OutDir>
78-
<PlatformToolset>v143</PlatformToolset>
79-
</PropertyGroup>
80-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_7|x64'" Label="Configuration">
81-
<ConfigurationType>DynamicLibrary</ConfigurationType>
82-
<UseDebugLibraries>false</UseDebugLibraries>
83-
<WholeProgramOptimization>true</WholeProgramOptimization>
84-
<CharacterSet>MultiByte</CharacterSet>
85-
<LinkIncremental>false</LinkIncremental>
86-
<OutDir>$(ProjectDir)..\out\</OutDir>
87-
<PlatformToolset>v143</PlatformToolset>
88-
</PropertyGroup>
8963
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
9064
<ImportGroup Label="ExtensionSettings">
9165
</ImportGroup>
@@ -105,14 +79,6 @@
10579
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
10680
<Import Project="..\Python3.9.props" />
10781
</ImportGroup>
108-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_8|x64'" Label="PropertySheets">
109-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
110-
<Import Project="..\Python3.8.props" />
111-
</ImportGroup>
112-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_7|x64'" Label="PropertySheets">
113-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
114-
<Import Project="..\Python3.7.props" />
115-
</ImportGroup>
11682
<PropertyGroup Label="UserMacros" />
11783
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_11|x64'">
11884
<LibraryPath>$(ProjectDir)..\python\$(PYTHON_VERSION)\lib;$(LibraryPath)</LibraryPath>
@@ -131,18 +97,6 @@
13197
<CustomBuildAfterTargets>
13298
</CustomBuildAfterTargets>
13399
</PropertyGroup>
134-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_7|x64'">
135-
<LibraryPath>$(ProjectDir)..\python\$(PYTHON_VERSION)\lib;$(LibraryPath)</LibraryPath>
136-
<TargetName>$(ProjectName)$(DLL_SUFFIX)</TargetName>
137-
<CustomBuildAfterTargets>
138-
</CustomBuildAfterTargets>
139-
</PropertyGroup>
140-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_8|x64'">
141-
<LibraryPath>$(ProjectDir)..\python\$(PYTHON_VERSION)\lib;$(LibraryPath)</LibraryPath>
142-
<TargetName>$(ProjectName)$(DLL_SUFFIX)</TargetName>
143-
<CustomBuildAfterTargets>
144-
</CustomBuildAfterTargets>
145-
</PropertyGroup>
146100
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_9|x64'">
147101
<LibraryPath>$(ProjectDir)..\python\$(PYTHON_VERSION)\lib;$(LibraryPath)</LibraryPath>
148102
<TargetName>$(ProjectName)$(DLL_SUFFIX)</TargetName>
@@ -341,102 +295,6 @@
341295
<Message>Copy the latest headers from the flexsim build</Message>
342296
</PreBuildEvent>
343297
</ItemDefinitionGroup>
344-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_8|x64'">
345-
<ClCompile>
346-
<WarningLevel>Level2</WarningLevel>
347-
<PrecompiledHeader>
348-
</PrecompiledHeader>
349-
<Optimization>MaxSpeed</Optimization>
350-
<FunctionLevelLinking>true</FunctionLevelLinking>
351-
<IntrinsicFunctions>true</IntrinsicFunctions>
352-
<PreprocessorDefinitions>WIN32;COMPILING_FLEXSIM_CONTENT;NOMINMAX;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
353-
<AdditionalIncludeDirectories>$(ProjectDir)..\FlexSimPy;$(ProjectDir)..\flexsimcontent;$(ProjectDir)..\python\$(PYTHON_VERSION)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
354-
<DisableSpecificWarnings>4005;4190;%(DisableSpecificWarnings)</DisableSpecificWarnings>
355-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
356-
<LanguageStandard>stdcpp20</LanguageStandard>
357-
<LanguageStandard_C>stdc17</LanguageStandard_C>
358-
</ClCompile>
359-
<Link>
360-
<SubSystem>Windows</SubSystem>
361-
<GenerateDebugInformation>true</GenerateDebugInformation>
362-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
363-
<OptimizeReferences>true</OptimizeReferences>
364-
<AdditionalDependencies>..\flexsimcontent\flexsimcontent.lib;..\flexsimcontent\flexsim.lib;%(AdditionalDependencies)</AdditionalDependencies>
365-
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
366-
</Link>
367-
<BuildLog>
368-
<Path>$(Platform)\$(Configuration)\$(MSBuildProjectName).log</Path>
369-
</BuildLog>
370-
<CustomBuildStep>
371-
<Command>
372-
</Command>
373-
<Outputs>
374-
</Outputs>
375-
<TreatOutputAsContent>true</TreatOutputAsContent>
376-
<Message>
377-
</Message>
378-
</CustomBuildStep>
379-
<PostBuildEvent>
380-
<Command>copytoflexsim.bat "$(OutDir)$(TargetName)$(TargetExt)" "$(ProjectDir)..\..\..\program\python\"</Command>
381-
</PostBuildEvent>
382-
<PostBuildEvent>
383-
<Message>Copying to FlexSim Directory</Message>
384-
</PostBuildEvent>
385-
<PreBuildEvent>
386-
<Command>copyheaders.bat</Command>
387-
</PreBuildEvent>
388-
<PreBuildEvent>
389-
<Message>Copy the latest headers from the flexsim build</Message>
390-
</PreBuildEvent>
391-
</ItemDefinitionGroup>
392-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_7|x64'">
393-
<ClCompile>
394-
<WarningLevel>Level2</WarningLevel>
395-
<PrecompiledHeader>
396-
</PrecompiledHeader>
397-
<Optimization>MaxSpeed</Optimization>
398-
<FunctionLevelLinking>true</FunctionLevelLinking>
399-
<IntrinsicFunctions>true</IntrinsicFunctions>
400-
<PreprocessorDefinitions>WIN32;COMPILING_FLEXSIM_CONTENT;NOMINMAX;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
401-
<AdditionalIncludeDirectories>$(ProjectDir)..\FlexSimPy;$(ProjectDir)..\flexsimcontent;$(ProjectDir)..\python\$(PYTHON_VERSION)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
402-
<DisableSpecificWarnings>4005;4190;%(DisableSpecificWarnings)</DisableSpecificWarnings>
403-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
404-
<LanguageStandard>stdcpp20</LanguageStandard>
405-
<LanguageStandard_C>stdc17</LanguageStandard_C>
406-
</ClCompile>
407-
<Link>
408-
<SubSystem>Windows</SubSystem>
409-
<GenerateDebugInformation>true</GenerateDebugInformation>
410-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
411-
<OptimizeReferences>true</OptimizeReferences>
412-
<AdditionalDependencies>..\flexsimcontent\flexsimcontent.lib;..\flexsimcontent\flexsim.lib;%(AdditionalDependencies)</AdditionalDependencies>
413-
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
414-
</Link>
415-
<BuildLog>
416-
<Path>$(Platform)\$(Configuration)\$(MSBuildProjectName).log</Path>
417-
</BuildLog>
418-
<CustomBuildStep>
419-
<Command>
420-
</Command>
421-
<Outputs>
422-
</Outputs>
423-
<TreatOutputAsContent>true</TreatOutputAsContent>
424-
<Message>
425-
</Message>
426-
</CustomBuildStep>
427-
<PostBuildEvent>
428-
<Command>copytoflexsim.bat "$(OutDir)$(TargetName)$(TargetExt)" "$(ProjectDir)..\..\..\program\python\"</Command>
429-
</PostBuildEvent>
430-
<PostBuildEvent>
431-
<Message>Copying to FlexSim Directory</Message>
432-
</PostBuildEvent>
433-
<PreBuildEvent>
434-
<Command>copyheaders.bat</Command>
435-
</PreBuildEvent>
436-
<PreBuildEvent>
437-
<Message>Copy the latest headers from the flexsim build</Message>
438-
</PreBuildEvent>
439-
</ItemDefinitionGroup>
440298
<ItemGroup>
441299
<ClInclude Include="PyConnector.h" />
442300
<ClInclude Include="PyXDecRefPtr.h" />

‎PyConnector/PyConnector.wxs‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,6 @@
1212

1313
<Directory Id="TARGETDIR" Name="SourceDir">
1414
<Directory Id="MergeRedirectFolder">
15-
<!--Program GUIDs>
16-
<FlexSim="0C90D2E1-849F-4FAC-9448-BB72E8709803">
17-
<FlexSimChinese="8545BD56-205D-4C07-8A52-1E05BC330C7C">
18-
<FlexSimJapanese="29AF964B-D760-489A-9C41-32E34BB81C61">
19-
<FlexSimChineseTraditional="E94F2CBC-1F0E-40C0-A834-1D24EF544AF6">
20-
<FlexSimSpanish="7F76FECE-957C-4508-8F59-68D7950670B9">
21-
</Program GUIDs-->
22-
<Component Id="PyConnector_37" Guid="E5F7138E-ADCE-4E1A-B053-3137829CBBCC" KeyPath="yes">
23-
<File Name="PyConnector37.dll" Source="$(var.ProjectDir)../out/PyConnector37.dll" />
24-
</Component>
25-
<!--Program GUIDs>
26-
<FlexSim="DEE2F6BC-3561-4CA9-95B6-E8EC745DEB3E">
27-
<FlexSimChinese="380E55E4-B6CA-498E-9AD9-6AA7E0DEDC22">
28-
<FlexSimJapanese="B2884AD3-55FD-4D77-9307-E1F8CBA8DC68">
29-
<FlexSimChineseTraditional="55F11E3A-5AEB-4A04-B20E-2B57DC5532D2">
30-
<FlexSimSpanish="C9A8AFC7-A531-4AD8-9E78-64E555D7FEF1">
31-
</Program GUIDs-->
32-
<Component Id="PyConnector_38" Guid="509401D4-B640-4379-A928-EF6C859C5277" KeyPath="yes">
33-
<File Name="PyConnector38.dll" Source="$(var.ProjectDir)../out/PyConnector38.dll" />
34-
</Component>
3515
<!--Program GUIDs>
3616
<FlexSim="2C93D9EF-E61A-4D07-8BE3-563E91F018A4">
3717
<FlexSimChinese="42215653-7FE5-490C-9410-5494256CF3C8">

‎Python3.7.props‎

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

‎Python3.8.props‎

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

‎build_all_configs.bat‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
set msbuildpath=%1
44
if "%msbuildpath%"=="" (
5-
set msbuildpath="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe"
5+
set msbuildpath="C:\Program Files\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\MSBuild.exe"
66
)
77

88
%msbuildpath% FlexSimPy.sln /p:Platform=x64;Configuration=Rel_3_11 /t:Rebuild
99
%msbuildpath% FlexSimPy.sln /p:Platform=x64;Configuration=Rel_3_10 /t:Rebuild
1010
%msbuildpath% FlexSimPy.sln /p:Platform=x64;Configuration=Rel_3_9 /t:Rebuild
11-
%msbuildpath% FlexSimPy.sln /p:Platform=x64;Configuration=Rel_3_8 /t:Rebuild
12-
%msbuildpath% FlexSimPy.sln /p:Platform=x64;Configuration=Rel_3_7 /t:Rebuild
1311
%msbuildpath% PyConnector\PyConnectorInstaller.sln /p:Configuration=Release /t:Rebuild

0 commit comments

Comments
 (0)