jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace private.py file by an inject code.

Browse source
This commit is contained in:
Hugo Parente Lima 2011-12-06 19:53:07 -02:00
commit e3814f27dd
4 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
PySide/CMakeLists.txt
View file

@ -9,9 +9,6 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/global.h.in"
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in" configure_file("${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in"
"${CMAKE_CURRENT_BINARY_DIR}/__init__.py" @ONLY) "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" @ONLY)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/private.py"
"${CMAKE_BINARY_DIR}/PySide/private.py")
HAS_QT_MODULE(QT_QTCORE_FOUND QtCore) HAS_QT_MODULE(QT_QTCORE_FOUND QtCore)
HAS_QT_MODULE(QT_QTGUI_FOUND QtGui) HAS_QT_MODULE(QT_QTGUI_FOUND QtGui)
HAS_QT_MODULE(QT_QTNETWORK_FOUND QtNetwork) HAS_QT_MODULE(QT_QTNETWORK_FOUND QtNetwork)
@ -34,7 +31,7 @@ HAS_QT_MODULE(QT_PHONON_FOUND phonon)
HAS_QT_MODULE(QT_QTDECLARATIVE_FOUND QtDeclarative) HAS_QT_MODULE(QT_QTDECLARATIVE_FOUND QtDeclarative)
# install # install
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" "${CMAKE_CURRENT_BINARY_DIR}/private.py" install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py"
DESTINATION "${SITE_PACKAGE}/${BINDING_NAME}${pyside_SUFFIX}") DESTINATION "${SITE_PACKAGE}/${BINDING_NAME}${pyside_SUFFIX}")
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_templates.xml install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_templates.xml
DESTINATION share/PySide${pyside_SUFFIX}/typesystems) DESTINATION share/PySide${pyside_SUFFIX}/typesystems)

11
PySide/QtCore/typesystem_core.xml
View file

@ -401,6 +401,17 @@
</inject-code> </inject-code>
<inject-code class="target" position="end" file="glue/qt_version.cpp" /> <inject-code class="target" position="end" file="glue/qt_version.cpp" />
<inject-code class="target" position="end">
{ // Avoid name clash
Shiboken::AutoDecRef atexit(Shiboken::Module::import("atexit"));
Shiboken::AutoDecRef regFunc(PyObject_GetAttrString(atexit, "register"));
Shiboken::AutoDecRef shutDownFunc(PyObject_GetAttrString(module, "__moduleShutdown"));
Shiboken::AutoDecRef args(PyTuple_New(1));
PyTuple_SET_ITEM(args, 0, shutDownFunc);
Shiboken::AutoDecRef retval(PyObject_Call(regFunc, args, 0));
Q_ASSERT(!retval.isNull());
}
</inject-code>
<add-function signature="__moduleShutdown()"> <add-function signature="__moduleShutdown()">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">

6
PySide/__init__.py.in
View file

@ -1,9 +1,3 @@
import sys
__all__ = ['QtCore', 'QtGui', 'QtNetwork', 'QtOpenGL', 'QtSql', 'QtSvg', 'QtTest', 'QtWebKit', 'QtScript'] __all__ = ['QtCore', 'QtGui', 'QtNetwork', 'QtOpenGL', 'QtSql', 'QtSvg', 'QtTest', 'QtWebKit', 'QtScript']
if sys.version_info[0] < 3:
import private
__version__ = "@BINDING_API_VERSION_FULL@" __version__ = "@BINDING_API_VERSION_FULL@"
__version_info__ = (@BINDING_API_MAJOR_VERSION@, @BINDING_API_MINOR_VERSION@, @BINDING_API_MICRO_VERSION@, "@BINDING_API_RELEASE_LEVEL@", @BINDING_API_SERIAL@) __version_info__ = (@BINDING_API_MAJOR_VERSION@, @BINDING_API_MINOR_VERSION@, @BINDING_API_MICRO_VERSION@, "@BINDING_API_RELEASE_LEVEL@", @BINDING_API_SERIAL@)

4
PySide/private.py
View file

@ -1,4 +0,0 @@
import atexit
from QtCore import __moduleShutdown
atexit.register(__moduleShutdown)