From 7a136312614f4d853898d6e0ad96b69af2d232be Mon Sep 17 00:00:00 2001 From: Jonathan Beck Date: Wed, 11 Nov 2009 21:43:54 +0100 Subject: Simplify 'libplist.PList' python module to 'plist'. --- swig/CMakeLists.txt | 14 +++++++------- swig/__init__.py | 4 +++- swig/plist.i | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt index e71e6e8..379cb95 100644 --- a/swig/CMakeLists.txt +++ b/swig/CMakeLists.txt @@ -5,20 +5,20 @@ SET(CMAKE_SWIG_FLAGS -Werror -Wall -modern) INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} ) SET_SOURCE_FILES_PROPERTIES(plist.i PROPERTIES CPLUSPLUS ON) -SWIG_ADD_MODULE( PList python plist.i ) -SWIG_LINK_LIBRARIES( PList plist plist++ ${PYTHON_LIBRARIES} ) +SWIG_ADD_MODULE( plist python plist.i ) +SWIG_LINK_LIBRARIES( plist plist plist++ ${PYTHON_LIBRARIES} ) EXEC_PROGRAM("${PYTHON_EXECUTABLE}" ARGS "-c 'try:\n import distutils.sysconfig; print distutils.sysconfig.get_python_lib(plat_specific=1)\nexcept: pass\n'" OUTPUT_VARIABLE DISTUTILS_PYTHON_ILIBRARY_PATH ) -INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/_PList${CMAKE_SHARED_MODULE_SUFFIX} - DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/libplist/ ) -INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/PList.py - DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/libplist/ ) +INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/_plist${CMAKE_SHARED_MODULE_SUFFIX} + DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/plist/ ) +INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/plist.py + DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/plist/ ) INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py - DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/libplist/ ) + DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/plist/ ) INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/plist.i DESTINATION include/plist/swig COMPONENT dev) diff --git a/swig/__init__.py b/swig/__init__.py index 8d1c8b6..f4c0dbb 100644 --- a/swig/__init__.py +++ b/swig/__init__.py @@ -1 +1,3 @@ - +# -*- coding: utf-8 -*- + +from plist import * diff --git a/swig/plist.i b/swig/plist.i index 925752e..278ca7a 100644 --- a/swig/plist.i +++ b/swig/plist.i @@ -1,5 +1,5 @@ /* swig.i */ - %module(package="libplist") PList + %module plist %feature("autodoc", "1"); %{ /* Includes the header in the wrapper code */ -- cgit v1.1-32-gdbae