Move Python __init__.py into src/python/createrepo_c

Author: dralley

.gitignore

@@ -5,12 +5,6 @@
 *_wrap.c
 snippets/
 
-# Binary files
-mergerepo_c
-createrepo_c
-modifyrepo_c
-sqliterepo_c
-
 # Packages and tarball
 createrepo*.rpm
 python-createrepo*.rpm

setup.py

@@ -24,22 +24,22 @@
     ),
     packages=['createrepo_c'],
     package_dir={
-        'createrepo_c': 'src/python'
+        'createrepo_c': 'src/python/createrepo_c'
     },
     cmake_args=[
-        '-DBIN_INSTALL_DIR:PATH=src/python/data/bin',
+        '-DBIN_INSTALL_DIR:PATH=src/python/createrepo_c/data/bin',
         '-DBUILD_LIBCREATEREPO_C_SHARED:BOOL=OFF',
         '-DCREATEREPO_C_INSTALL_DEVELOPMENT:BOOL=OFF',
         '-DCREATEREPO_C_INSTALL_MANPAGES:BOOL=OFF',
         '-DENABLE_BASHCOMP:BOOL=OFF',
     ],
     cmake_languages=['C'],
     entry_points={
-            'console_scripts': [
-                'createrepo_c=createrepo_c:createrepo_c',
-                'mergerepo_c=createrepo_c:mergerepo_c',
-                'modifyrepo_c=createrepo_c:modifyrepo_c',
-                'sqliterepo_c=createrepo_c:sqliterepo_c'
-            ]
+        'console_scripts': [
+            'createrepo_c=createrepo_c:createrepo_c',
+            'mergerepo_c=createrepo_c:mergerepo_c',
+            'modifyrepo_c=createrepo_c:modifyrepo_c',
+            'sqliterepo_c=createrepo_c:sqliterepo_c'
+        ]
     },
 )

src/python/CMakeLists.txt

@@ -30,10 +30,6 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing")
 set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-strict-aliasing")
 set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing")
 
-IF (NOT SKBUILD)
-    FILE(COPY __init__.py DESTINATION createrepo_c)
-ENDIF()
-
 SET (createrepo_cmodule_SRCS
      checksum-py.c
      compression_wrapper-py.c
@@ -80,9 +76,9 @@ IF (NOT SKBUILD)
 ENDIF()
 
 IF (SKBUILD)
-    INSTALL(FILES __init__.py DESTINATION src/python)
-    INSTALL(TARGETS _createrepo_c LIBRARY DESTINATION src/python)
+    INSTALL(FILES createrepo_c/__init__.py DESTINATION src/python/createrepo_c)
+    INSTALL(TARGETS _createrepo_c LIBRARY DESTINATION src/python/createrepo_c)
 ELSE ()
-    INSTALL(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/createrepo_c)
+    INSTALL(FILES createrepo_c/__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/createrepo_c)
     INSTALL(TARGETS _createrepo_c LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/createrepo_c)
 ENDIF ()