Adapt Shiboken generation for Qt6

NatronGitHub · Dec 17, 2024 · 1783af7 · 1783af7
1 parent 24fc376
commit 1783af7
Show file tree

Hide file tree

Showing 12 changed files with 153 additions and 262 deletions.
diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt
@@ -28,8 +28,12 @@ set(PYENGINE_OUT ${CMAKE_CURRENT_BINARY_DIR}/Qt${QT_VERSION_MAJOR})
 set(PYENGINE_INCLUDE_DIRS ${PYSIDE_INCLUDE_DIRS} ${PYSIDE_INCLUDE_DIRS}/QtCore)
 list(APPEND PYENGINE_INCLUDE_DIRS ${QTCORE_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 list(TRANSFORM PYENGINE_INCLUDE_DIRS PREPEND "-I" OUTPUT_VARIABLE PYENGINE_INCS)
-set(PYENGINE_HEADER PySide2_Engine_Python.h)
-set(POST_SHIBOKEN ../tools/utils/runPostShiboken2.sh)
+
+if(NATRON_QT6)
+    set(PYENGINE_HEADER PySide6_Engine_Python.h)
+else()
+    set(PYENGINE_HEADER PySide2_Engine_Python.h)
+endif()
 
 set(shiboken_args
     "-std=c++17" "--enable-parent-ctor-heuristic" "--use-isnull-as-nb_nonzero"
@@ -43,9 +47,9 @@ execute_process(COMMAND ${Python3_EXECUTABLE} ../tools/utils/sourceList.py types
     OUTPUT_VARIABLE PyEngine_SOURCES)
 set_property(SOURCE ${PyEngine_SOURCES} PROPERTY SKIP_AUTOGEN ON)
 add_custom_command(OUTPUT ${PyEngine_SOURCES}
-    COMMAND Shiboken2::shiboken2 ${shiboken_args}
-    COMMAND bash ${POST_SHIBOKEN} ${PYENGINE_OUT}/NatronEngine natronengine
-    DEPENDS ${PYENGINE_HEADER} ${NatronEngine_HEADERS} ${POST_SHIBOKEN} typesystem_engine.xml
+    COMMAND $<TARGET_FILE:${SHIBOKEN_EXE}> ${shiboken_args}
+    COMMAND ${Python3_EXECUTABLE} ../tools/utils/sourceCleanup.py typesystem_engine.xml ${PYENGINE_OUT}
+    DEPENDS ${SHIBOKEN_EXE} ${PYENGINE_HEADER} ${NatronEngine_HEADERS} ../tools/utils/sourceCleanup.py typesystem_engine.xml
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(UNIX AND NOT APPLE)

diff --git a/Engine/PySide6_Engine_Python.h b/Engine/PySide6_Engine_Python.h
@@ -0,0 +1,39 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * This file is part of Natron <https://natrongithub.github.io/>,
+ * (C) 2018-2024 The Natron developers
+ * (C) 2013-2018 INRIA and Alexandre Gauthier-Foichat
+ *
+ * Natron is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Natron is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Natron.  If not, see <http://www.gnu.org/licenses/gpl-2.0.html>
+ * ***** END LICENSE BLOCK ***** */
+
+
+#ifndef PYSIDE6_ENGINE_PYTHON_H
+#define PYSIDE6_ENGINE_PYTHON_H
+
+// Defined for shiboken6-specific tweaks
+#define SBK6_RUN
+
+#ifndef BOOST_SERIALIZATION_VERSION_HPP
+#define BOOST_SERIALIZATION_VERSION_HPP
+#define BOOST_CLASS_VERSION(T, N)
+#endif /* BOOST_SERIALIZATION_VERSION_HPP */
+
+#ifndef BOOST_SERIALIZATION_SPLIT_MEMBER_HPP
+#define BOOST_SERIALIZATION_SPLIT_MEMBER_HPP
+#define BOOST_SERIALIZATION_SPLIT_MEMBER()
+#endif /* BOOST_SERIALIZATION_SPLIT_MEMBER_HPP */
+
+#include "Pyside_Engine_Python.h"
+
+#endif // PYSIDE6_ENGINE_PYTHON_H
diff --git a/Engine/Pyside_Engine_Python.h b/Engine/Pyside_Engine_Python.h
@@ -39,7 +39,7 @@
 #ifdef SBK2_RUN
 #include <pyside2_global.h>
 #else
-#include <pyside_global.h>
+#include <pyside6_global.h>
 #endif
 #include <string>
 //Global

diff --git a/Engine/typesystem_engine.xml b/Engine/typesystem_engine.xml
@@ -1856,6 +1856,10 @@
         </modify-function>
     </object-type>
 
+    <inject-code class="target" position="declaration">
+    NATRON_NAMESPACE_USING NATRON_PYTHON_NAMESPACE_USING
+    </inject-code>
+
 
 </typesystem>
 

diff --git a/Gui/CMakeLists.txt b/Gui/CMakeLists.txt
@@ -28,11 +28,12 @@ list(APPEND PYGUI_INCLUDE_DIRS ${PYSIDE_INCLUDE_DIRS} ${PYSIDE_INCLUDE_DIRS}/QtC
 list(APPEND PYGUI_INCLUDE_DIRS ${QTCORE_INCLUDE_DIRS} ${QTGUI_INCLUDE_DIRS}
     ${QTWIDGETS_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 list(TRANSFORM PYGUI_INCLUDE_DIRS PREPEND "-I" OUTPUT_VARIABLE PYGUI_INCS)
-set(PYGUI_HEADER PySide2_Gui_Python.h)
-set(POST_SHIBOKEN ../tools/utils/runPostShiboken2.sh)
 
 if(NATRON_QT6)
     set(QT_OPENGLWIDGETS Qt::OpenGLWidgets)
+    set(PYGUI_HEADER PySide6_Gui_Python.h)
+else()
+    set(PYGUI_HEADER PySide2_Gui_Python.h)
 endif()
 
 set(shiboken_args
@@ -47,9 +48,9 @@ execute_process(COMMAND ${Python3_EXECUTABLE} ../tools/utils/sourceList.py types
     OUTPUT_VARIABLE PyGui_SOURCES)
 set_property(SOURCE ${PyGui_SOURCES} PROPERTY SKIP_AUTOGEN ON)
 add_custom_command(OUTPUT ${PyGui_SOURCES}
-    COMMAND Shiboken2::shiboken2 ${shiboken_args}
-    COMMAND bash ${POST_SHIBOKEN} ${PYGUI_OUT}/NatronGui natrongui
-    DEPENDS ${PYGUI_HEADER} ${NatronEngine_HEADERS} ${NatronGui_HEADERS} ${POST_SHIBOKEN} typesystem_natronGui.xml
+    COMMAND $<TARGET_FILE:${SHIBOKEN_EXE}> ${shiboken_args}
+    COMMAND ${Python3_EXECUTABLE} ../tools/utils/sourceCleanup.py typesystem_natronGui.xml ${PYGUI_OUT}
+    DEPENDS ${SHIBOKEN_EXE} ${PYGUI_HEADER} NatronEngine ${NatronGui_HEADERS} ../tools/utils/sourceCleanup.py typesystem_natronGui.xml
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(APPLE)

diff --git a/Gui/PySide6_Gui_Python.h b/Gui/PySide6_Gui_Python.h
@@ -0,0 +1,39 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * This file is part of Natron <https://natrongithub.github.io/>,
+ * (C) 2018-2024 The Natron developers
+ * (C) 2013-2018 INRIA and Alexandre Gauthier-Foichat
+ *
+ * Natron is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Natron is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Natron.  If not, see <http://www.gnu.org/licenses/gpl-2.0.html>
+ * ***** END LICENSE BLOCK ***** */
+
+
+#ifndef PYSIDE6_GUI_PYTHON_H
+#define PYSIDE6_GUI_PYTHON_H
+
+// Defined for shiboken6-specific tweaks
+#define SBK6_RUN
+
+#ifndef BOOST_SERIALIZATION_VERSION_HPP
+#define BOOST_SERIALIZATION_VERSION_HPP
+#define BOOST_CLASS_VERSION(T, N)
+#endif /* BOOST_SERIALIZATION_VERSION_HPP */
+
+#ifndef BOOST_SERIALIZATION_SPLIT_MEMBER_HPP
+#define BOOST_SERIALIZATION_SPLIT_MEMBER_HPP
+#define BOOST_SERIALIZATION_SPLIT_MEMBER()
+#endif /* BOOST_SERIALIZATION_SPLIT_MEMBER_HPP */
+
+#include "Pyside_Gui_Python.h"
+
+#endif // PYSIDE6_GUI_PYTHON_H
diff --git a/Gui/Pyside_Gui_Python.h b/Gui/Pyside_Gui_Python.h
@@ -34,7 +34,7 @@
 #ifdef SBK2_RUN
 #include <pyside2_global.h>
 #else
-#include <pyside_global.h>
+#include <pyside6_global.h>
 #endif
 
 #include <QSize>

diff --git a/Gui/typesystem_natronGui.xml b/Gui/typesystem_natronGui.xml
@@ -211,4 +211,8 @@
             </inject-code>
         </modify-function>
     </object-type>
+
+    <inject-code class="target" position="declaration">
+    NATRON_NAMESPACE_USING NATRON_PYTHON_NAMESPACE_USING
+    </inject-code>
 </typesystem>
diff --git a/tools/utils/runPostShiboken.bat b/tools/utils/runPostShiboken.bat
diff --git a/tools/utils/runPostShiboken.sh b/tools/utils/runPostShiboken.sh