Add support for Python 3.13

FlexSimPy.sln

@@ -15,6 +15,7 @@ Global
 		Rel_3_10|x64 = Rel_3_10|x64
 		Rel_3_11|x64 = Rel_3_11|x64
 		Rel_3_12|x64 = Rel_3_12|x64
+		Rel_3_13|x64 = Rel_3_13|x64
 		Rel_3_9|x64 = Rel_3_9|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -25,6 +26,8 @@ Global
 		{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_11|x64.Build.0 = Rel_3_11|x64
 		{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_12|x64.ActiveCfg = Rel_3_12|x64
 		{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_12|x64.Build.0 = Rel_3_12|x64
+		{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_13|x64.ActiveCfg = Rel_3_13|x64
+		{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_13|x64.Build.0 = Rel_3_13|x64
 		{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_9|x64.ActiveCfg = Rel_3_9|x64
 		{1DD065E6-F2F7-4522-AEC4-4F0D0DFBB78F}.Rel_3_9|x64.Build.0 = Rel_3_9|x64
 		{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Deb_3_10|x64.ActiveCfg = Deb_3_10|x64
@@ -34,12 +37,15 @@ Global
 		{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_11|x64.Build.0 = Rel_3_11|x64
 		{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_12|x64.ActiveCfg = Rel_3_12|x64
 		{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_12|x64.Build.0 = Rel_3_12|x64
+		{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_13|x64.ActiveCfg = Rel_3_13|x64
+		{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_13|x64.Build.0 = Rel_3_13|x64
 		{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_9|x64.ActiveCfg = Rel_3_9|x64
 		{1CB9E349-A7F5-4F21-9C8A-034A7481C216}.Rel_3_9|x64.Build.0 = Rel_3_9|x64
 		{C6A7BD76-61A9-4078-87D6-DFD568848EF8}.Deb_3_10|x64.ActiveCfg = Debug|Any CPU
 		{C6A7BD76-61A9-4078-87D6-DFD568848EF8}.Rel_3_10|x64.ActiveCfg = Release|Any CPU
 		{C6A7BD76-61A9-4078-87D6-DFD568848EF8}.Rel_3_11|x64.ActiveCfg = Rel_3_11|Any CPU
 		{C6A7BD76-61A9-4078-87D6-DFD568848EF8}.Rel_3_12|x64.ActiveCfg = Rel_3_12|Any CPU
+		{C6A7BD76-61A9-4078-87D6-DFD568848EF8}.Rel_3_13|x64.ActiveCfg = Rel_3_13|Any CPU
 		{C6A7BD76-61A9-4078-87D6-DFD568848EF8}.Rel_3_9|x64.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution

FlexSimPy/FlexSimPy.vcxproj

@@ -17,6 +17,10 @@
       <Configuration>Rel_3_12</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Rel_3_13|x64">
+      <Configuration>Rel_3_13</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Rel_3_7|x64">
       <Configuration>Rel_3_7</Configuration>
       <Platform>x64</Platform>
@@ -54,6 +58,15 @@
     <OutDir>$(ProjectDir)..\out\$(Configuration)\</OutDir>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_13|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)..\out\$(Configuration)\</OutDir>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_10|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -106,6 +119,10 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\Python3.12.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_13|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\Python3.13.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_11|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\Python3.11.props" />
@@ -141,6 +158,11 @@
     <TargetName>$(ProjectName)</TargetName>
     <TargetExt>.pyd</TargetExt>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_13|x64'">
+    <LibraryPath>$(ProjectDir)..\python\$(PYTHON_VERSION)\lib;$(LibraryPath)</LibraryPath>
+    <TargetName>$(ProjectName)</TargetName>
+    <TargetExt>.pyd</TargetExt>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_10|x64'">
     <LibraryPath>$(ProjectDir)..\python\$(PYTHON_VERSION)\lib;$(LibraryPath)</LibraryPath>
     <TargetName>$(ProjectName)</TargetName>
@@ -238,6 +260,42 @@
       <Command>..\PyConnector\copyheaders.bat</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_13|x64'">
+    <ClCompile>
+      <WarningLevel>Level2</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NOMINMAX;COMPILING_FLEXSIM_CONTENT;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\flexsimcontent;$(ProjectDir)..\python\$(PYTHON_VERSION)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4005;4190;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
+      <EnableModules>false</EnableModules>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>..\flexsimcontent\flexsim.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <DelayLoadDLLs>FlexSim.dll</DelayLoadDLLs>
+    </Link>
+    <BuildLog>
+      <Path>$(Platform)\$(Configuration)\$(MSBuildProjectName).log</Path>
+    </BuildLog>
+    <PreBuildEvent>
+      <Message>Copy the latest headers from the flexsim build</Message>
+      <Command>..\PyConnector\copyheaders.bat</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_10|x64'">
     <ClCompile>
       <WarningLevel>Level2</WarningLevel>

PyConnector/PyConnector.vcxproj

@@ -17,6 +17,10 @@
       <Configuration>Rel_3_12</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Rel_3_13|x64">
+      <Configuration>Rel_3_13</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Rel_3_9|x64">
       <Configuration>Rel_3_9</Configuration>
       <Platform>x64</Platform>
@@ -37,6 +41,15 @@
     <OutDir>$(ProjectDir)..\out\</OutDir>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_13|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)..\out\</OutDir>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_11|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -80,6 +93,10 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\Python3.12.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_13|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\Python3.13.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_11|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\Python3.11.props" />
@@ -107,6 +124,11 @@
     <TargetName>$(ProjectName)$(DLL_SUFFIX)</TargetName>
     <CustomBuildAfterTargets />
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_13|x64'">
+    <LibraryPath>$(ProjectDir)..\python\$(PYTHON_VERSION)\lib;$(LibraryPath)</LibraryPath>
+    <TargetName>$(ProjectName)$(DLL_SUFFIX)</TargetName>
+    <CustomBuildAfterTargets />
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_10|x64'">
     <LibraryPath>$(ProjectDir)..\python\$(PYTHON_VERSION)\lib;$(LibraryPath)</LibraryPath>
     <TargetName>$(ProjectName)$(DLL_SUFFIX)</TargetName>
@@ -221,6 +243,54 @@
       <Message>Copy the latest headers from the flexsim build</Message>
     </PreBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_13|x64'">
+    <ClCompile>
+      <WarningLevel>Level2</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;COMPILING_FLEXSIM_CONTENT;NOMINMAX;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\FlexSimPy;$(ProjectDir)..\flexsimcontent;$(ProjectDir)..\python\$(PYTHON_VERSION)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4005;4190;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>..\flexsimcontent\flexsimcontent.lib;..\flexsimcontent\flexsim.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+    </Link>
+    <BuildLog>
+      <Path>$(Platform)\$(Configuration)\$(MSBuildProjectName).log</Path>
+    </BuildLog>
+    <CustomBuildStep>
+      <Command>
+      </Command>
+      <Outputs>
+      </Outputs>
+      <TreatOutputAsContent>true</TreatOutputAsContent>
+      <Message>
+      </Message>
+    </CustomBuildStep>
+    <PostBuildEvent>
+      <Command>copytoflexsim.bat "$(OutDir)$(TargetName)$(TargetExt)" "$(ProjectDir)..\..\..\program\python\"</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>Copying to FlexSim Directory</Message>
+    </PostBuildEvent>
+    <PreBuildEvent>
+      <Command>copyheaders.bat</Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Message>Copy the latest headers from the flexsim build</Message>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Rel_3_10|x64'">
     <ClCompile>
       <WarningLevel>Level2</WarningLevel>

PyConnector/PyConnector.wxs

@@ -52,6 +52,16 @@
 		<Component Id="PyConnector_312" Guid="35ECCF5A-885B-462D-80D0-955DD4DB4472" KeyPath="yes">
     	  <File Name="PyConnector312.dll" Source="$(var.ProjectDir)../out/PyConnector312.dll" />
 		</Component>
+        <!--Program GUIDs>
+            <FlexSim="901050A2-8EE3-4066-B936-6C359DEE9368">
+		    <FlexSimChinese="D7084266-0857-4F8A-8E6C-94ABD4E682AE">
+            <FlexSimJapanese="8DE9BB89-AD35-43D4-8337-AB8D15421F66">
+            <FlexSimChineseTraditional="ED4AA4E3-D2E8-4AAD-83BD-939C9731AC8C">
+            <FlexSimSpanish="ACA56D0A-CBCB-4E27-892E-605F6065F44D">
+        </Program GUIDs-->
+		<Component Id="PyConnector_313" Guid="D9209AED-EC93-438B-9CE4-391AD6E415F2" KeyPath="yes">
+    	  <File Name="PyConnector313.dll" Source="$(var.ProjectDir)../out/PyConnector313.dll" />
+		</Component>
       </Directory>
     </Directory>
   </Module>

Python3.13.props

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <PYTHON_VERSION>3.13</PYTHON_VERSION>
+    <DLL_SUFFIX>313</DLL_SUFFIX>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+  <ItemGroup>
+    <BuildMacro Include="PYTHON_VERSION">
+      <Value>$(PYTHON_VERSION)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="DLL_SUFFIX">
+      <Value>$(DLL_SUFFIX)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

TestFlexSimPy/TestFlexSimPy.pyproj

@@ -30,6 +30,16 @@
     <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
     <OutputPath>bin\Rel_3_11\</OutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Rel_3_12' ">
+    <DebugSymbols>true</DebugSymbols>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+    <OutputPath>bin\Rel_3_12\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Rel_3_13' ">
+    <DebugSymbols>true</DebugSymbols>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+    <OutputPath>bin\Rel_3_13\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="TestFlexSimPy.py" />
   </ItemGroup>

python/3.12/include/include/Python.h

@@ -0,0 +1,109 @@
+// Entry point of the Python C API.
+// C extensions should only #include <Python.h>, and not include directly
+// the other Python header files included by <Python.h>.
+
+#ifndef Py_PYTHON_H
+#define Py_PYTHON_H
+
+// Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" {
+
+// Include Python header files
+#include "patchlevel.h"
+#include "pyconfig.h"
+#include "pymacconfig.h"
+
+#if defined(__sgi) && !defined(_SGI_MP_SOURCE)
+#  define _SGI_MP_SOURCE
+#endif
+
+// stdlib.h, stdio.h, errno.h and string.h headers are not used by Python
+// headers, but kept for backward compatibility. They are excluded from the
+// limited C API of Python 3.11.
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000
+#  include <stdlib.h>
+#  include <stdio.h>              // FILE*
+#  include <errno.h>              // errno
+#  include <string.h>             // memcpy()
+#endif
+#ifndef MS_WINDOWS
+#  include <unistd.h>
+#endif
+#ifdef HAVE_STDDEF_H
+#  include <stddef.h>             // size_t
+#endif
+
+#include <assert.h>               // assert()
+#include <wchar.h>                // wchar_t
+
+#include "pyport.h"
+#include "pymacro.h"
+#include "pymath.h"
+#include "pymem.h"
+#include "pytypedefs.h"
+#include "pybuffer.h"
+#include "object.h"
+#include "objimpl.h"
+#include "typeslots.h"
+#include "pyhash.h"
+#include "cpython/pydebug.h"
+#include "bytearrayobject.h"
+#include "bytesobject.h"
+#include "unicodeobject.h"
+#include "cpython/initconfig.h"
+#include "pystate.h"
+#include "pyerrors.h"
+#include "longobject.h"
+#include "cpython/longintrepr.h"
+#include "boolobject.h"
+#include "floatobject.h"
+#include "complexobject.h"
+#include "rangeobject.h"
+#include "memoryobject.h"
+#include "tupleobject.h"
+#include "listobject.h"
+#include "dictobject.h"
+#include "cpython/odictobject.h"
+#include "enumobject.h"
+#include "setobject.h"
+#include "methodobject.h"
+#include "moduleobject.h"
+#include "cpython/funcobject.h"
+#include "cpython/classobject.h"
+#include "fileobject.h"
+#include "pycapsule.h"
+#include "cpython/code.h"
+#include "pyframe.h"
+#include "traceback.h"
+#include "sliceobject.h"
+#include "cpython/cellobject.h"
+#include "iterobject.h"
+#include "cpython/genobject.h"
+#include "descrobject.h"
+#include "genericaliasobject.h"
+#include "warnings.h"
+#include "weakrefobject.h"
+#include "structseq.h"
+#include "cpython/picklebufobject.h"
+#include "cpython/pytime.h"
+#include "codecs.h"
+#include "pythread.h"
+#include "cpython/context.h"
+#include "modsupport.h"
+#include "compile.h"
+#include "pythonrun.h"
+#include "pylifecycle.h"
+#include "ceval.h"
+#include "sysmodule.h"
+#include "osmodule.h"
+#include "intrcheck.h"
+#include "import.h"
+#include "abstract.h"
+#include "bltinmodule.h"
+#include "cpython/pyctype.h"
+#include "pystrtod.h"
+#include "pystrcmp.h"
+#include "fileutils.h"
+#include "cpython/pyfpe.h"
+#include "tracemalloc.h"
+
+#endif /* !Py_PYTHON_H */