From 780979e0f075bcceb221064ac2b9844452012a82 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 12 Jun 2015 21:35:28 +0200 Subject: [PATCH] [DEV] correct some interface --- MANIFEST.in | 3 --- lutin/{builder => z_builder}/__init__.py | 0 .../{builder => z_builder}/lutinBuilder_binary.py | 0 lutin/{builder => z_builder}/lutinBuilder_c.py | 0 lutin/{builder => z_builder}/lutinBuilder_cpp.py | 0 lutin/{builder => z_builder}/lutinBuilder_java.py | 0 .../lutinBuilder_libraryDynamic.py | 0 .../lutinBuilder_libraryStatic.py | 0 lutin/{builder => z_builder}/lutinBuilder_m.py | 0 lutin/{builder => z_builder}/lutinBuilder_mm.py | 0 lutin/{builder => z_builder}/lutinBuilder_s.py | 0 lutin/{system => z_system}/__init__.py | 0 .../lutinSystem_IOs_CoreAudio.py | 0 .../lutinSystem_Linux_alsa.py | 0 .../lutinSystem_Linux_boost.py | 0 .../lutinSystem_Linux_jack.py | 0 .../{system => z_system}/lutinSystem_Linux_oss.py | 0 .../lutinSystem_Linux_pulse.py | 0 lutin/{system => z_system}/lutinSystem_Linux_z.py | 0 .../lutinSystem_MacOs_CoreAudio.py | 0 .../lutinSystem_Windows_asio.py | 0 .../lutinSystem_Windows_ds.py | 0 lutin/{target => z_target}/AndroidDebugKey.jks | Bin lutin/{target => z_target}/__init__.py | 0 lutin/{target => z_target}/lutinTarget_Android.py | 0 lutin/{target => z_target}/lutinTarget_IOs.py | 0 lutin/{target => z_target}/lutinTarget_Linux.py | 0 lutin/{target => z_target}/lutinTarget_MacOs.py | 0 lutin/{target => z_target}/lutinTarget_Windows.py | 0 setup.py | 14 ++++++-------- 30 files changed, 6 insertions(+), 11 deletions(-) rename lutin/{builder => z_builder}/__init__.py (100%) rename lutin/{builder => z_builder}/lutinBuilder_binary.py (100%) rename lutin/{builder => z_builder}/lutinBuilder_c.py (100%) rename lutin/{builder => z_builder}/lutinBuilder_cpp.py (100%) rename lutin/{builder => z_builder}/lutinBuilder_java.py (100%) rename lutin/{builder => z_builder}/lutinBuilder_libraryDynamic.py (100%) rename lutin/{builder => z_builder}/lutinBuilder_libraryStatic.py (100%) rename lutin/{builder => z_builder}/lutinBuilder_m.py (100%) rename lutin/{builder => z_builder}/lutinBuilder_mm.py (100%) rename lutin/{builder => z_builder}/lutinBuilder_s.py (100%) rename lutin/{system => z_system}/__init__.py (100%) rename lutin/{system => z_system}/lutinSystem_IOs_CoreAudio.py (100%) rename lutin/{system => z_system}/lutinSystem_Linux_alsa.py (100%) rename lutin/{system => z_system}/lutinSystem_Linux_boost.py (100%) rename lutin/{system => z_system}/lutinSystem_Linux_jack.py (100%) rename lutin/{system => z_system}/lutinSystem_Linux_oss.py (100%) rename lutin/{system => z_system}/lutinSystem_Linux_pulse.py (100%) rename lutin/{system => z_system}/lutinSystem_Linux_z.py (100%) rename lutin/{system => z_system}/lutinSystem_MacOs_CoreAudio.py (100%) rename lutin/{system => z_system}/lutinSystem_Windows_asio.py (100%) rename lutin/{system => z_system}/lutinSystem_Windows_ds.py (100%) rename lutin/{target => z_target}/AndroidDebugKey.jks (100%) rename lutin/{target => z_target}/__init__.py (100%) rename lutin/{target => z_target}/lutinTarget_Android.py (100%) rename lutin/{target => z_target}/lutinTarget_IOs.py (100%) rename lutin/{target => z_target}/lutinTarget_Linux.py (100%) rename lutin/{target => z_target}/lutinTarget_MacOs.py (100%) rename lutin/{target => z_target}/lutinTarget_Windows.py (100%) diff --git a/MANIFEST.in b/MANIFEST.in index db73496..f092607 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,2 @@ include README.rst include bash-autocompletion/lutin -recursive-include lutin/builder -recursive-include lutin/system -recursive-include lutin/target \ No newline at end of file diff --git a/lutin/builder/__init__.py b/lutin/z_builder/__init__.py similarity index 100% rename from lutin/builder/__init__.py rename to lutin/z_builder/__init__.py diff --git a/lutin/builder/lutinBuilder_binary.py b/lutin/z_builder/lutinBuilder_binary.py similarity index 100% rename from lutin/builder/lutinBuilder_binary.py rename to lutin/z_builder/lutinBuilder_binary.py diff --git a/lutin/builder/lutinBuilder_c.py b/lutin/z_builder/lutinBuilder_c.py similarity index 100% rename from lutin/builder/lutinBuilder_c.py rename to lutin/z_builder/lutinBuilder_c.py diff --git a/lutin/builder/lutinBuilder_cpp.py b/lutin/z_builder/lutinBuilder_cpp.py similarity index 100% rename from lutin/builder/lutinBuilder_cpp.py rename to lutin/z_builder/lutinBuilder_cpp.py diff --git a/lutin/builder/lutinBuilder_java.py b/lutin/z_builder/lutinBuilder_java.py similarity index 100% rename from lutin/builder/lutinBuilder_java.py rename to lutin/z_builder/lutinBuilder_java.py diff --git a/lutin/builder/lutinBuilder_libraryDynamic.py b/lutin/z_builder/lutinBuilder_libraryDynamic.py similarity index 100% rename from lutin/builder/lutinBuilder_libraryDynamic.py rename to lutin/z_builder/lutinBuilder_libraryDynamic.py diff --git a/lutin/builder/lutinBuilder_libraryStatic.py b/lutin/z_builder/lutinBuilder_libraryStatic.py similarity index 100% rename from lutin/builder/lutinBuilder_libraryStatic.py rename to lutin/z_builder/lutinBuilder_libraryStatic.py diff --git a/lutin/builder/lutinBuilder_m.py b/lutin/z_builder/lutinBuilder_m.py similarity index 100% rename from lutin/builder/lutinBuilder_m.py rename to lutin/z_builder/lutinBuilder_m.py diff --git a/lutin/builder/lutinBuilder_mm.py b/lutin/z_builder/lutinBuilder_mm.py similarity index 100% rename from lutin/builder/lutinBuilder_mm.py rename to lutin/z_builder/lutinBuilder_mm.py diff --git a/lutin/builder/lutinBuilder_s.py b/lutin/z_builder/lutinBuilder_s.py similarity index 100% rename from lutin/builder/lutinBuilder_s.py rename to lutin/z_builder/lutinBuilder_s.py diff --git a/lutin/system/__init__.py b/lutin/z_system/__init__.py similarity index 100% rename from lutin/system/__init__.py rename to lutin/z_system/__init__.py diff --git a/lutin/system/lutinSystem_IOs_CoreAudio.py b/lutin/z_system/lutinSystem_IOs_CoreAudio.py similarity index 100% rename from lutin/system/lutinSystem_IOs_CoreAudio.py rename to lutin/z_system/lutinSystem_IOs_CoreAudio.py diff --git a/lutin/system/lutinSystem_Linux_alsa.py b/lutin/z_system/lutinSystem_Linux_alsa.py similarity index 100% rename from lutin/system/lutinSystem_Linux_alsa.py rename to lutin/z_system/lutinSystem_Linux_alsa.py diff --git a/lutin/system/lutinSystem_Linux_boost.py b/lutin/z_system/lutinSystem_Linux_boost.py similarity index 100% rename from lutin/system/lutinSystem_Linux_boost.py rename to lutin/z_system/lutinSystem_Linux_boost.py diff --git a/lutin/system/lutinSystem_Linux_jack.py b/lutin/z_system/lutinSystem_Linux_jack.py similarity index 100% rename from lutin/system/lutinSystem_Linux_jack.py rename to lutin/z_system/lutinSystem_Linux_jack.py diff --git a/lutin/system/lutinSystem_Linux_oss.py b/lutin/z_system/lutinSystem_Linux_oss.py similarity index 100% rename from lutin/system/lutinSystem_Linux_oss.py rename to lutin/z_system/lutinSystem_Linux_oss.py diff --git a/lutin/system/lutinSystem_Linux_pulse.py b/lutin/z_system/lutinSystem_Linux_pulse.py similarity index 100% rename from lutin/system/lutinSystem_Linux_pulse.py rename to lutin/z_system/lutinSystem_Linux_pulse.py diff --git a/lutin/system/lutinSystem_Linux_z.py b/lutin/z_system/lutinSystem_Linux_z.py similarity index 100% rename from lutin/system/lutinSystem_Linux_z.py rename to lutin/z_system/lutinSystem_Linux_z.py diff --git a/lutin/system/lutinSystem_MacOs_CoreAudio.py b/lutin/z_system/lutinSystem_MacOs_CoreAudio.py similarity index 100% rename from lutin/system/lutinSystem_MacOs_CoreAudio.py rename to lutin/z_system/lutinSystem_MacOs_CoreAudio.py diff --git a/lutin/system/lutinSystem_Windows_asio.py b/lutin/z_system/lutinSystem_Windows_asio.py similarity index 100% rename from lutin/system/lutinSystem_Windows_asio.py rename to lutin/z_system/lutinSystem_Windows_asio.py diff --git a/lutin/system/lutinSystem_Windows_ds.py b/lutin/z_system/lutinSystem_Windows_ds.py similarity index 100% rename from lutin/system/lutinSystem_Windows_ds.py rename to lutin/z_system/lutinSystem_Windows_ds.py diff --git a/lutin/target/AndroidDebugKey.jks b/lutin/z_target/AndroidDebugKey.jks similarity index 100% rename from lutin/target/AndroidDebugKey.jks rename to lutin/z_target/AndroidDebugKey.jks diff --git a/lutin/target/__init__.py b/lutin/z_target/__init__.py similarity index 100% rename from lutin/target/__init__.py rename to lutin/z_target/__init__.py diff --git a/lutin/target/lutinTarget_Android.py b/lutin/z_target/lutinTarget_Android.py similarity index 100% rename from lutin/target/lutinTarget_Android.py rename to lutin/z_target/lutinTarget_Android.py diff --git a/lutin/target/lutinTarget_IOs.py b/lutin/z_target/lutinTarget_IOs.py similarity index 100% rename from lutin/target/lutinTarget_IOs.py rename to lutin/z_target/lutinTarget_IOs.py diff --git a/lutin/target/lutinTarget_Linux.py b/lutin/z_target/lutinTarget_Linux.py similarity index 100% rename from lutin/target/lutinTarget_Linux.py rename to lutin/z_target/lutinTarget_Linux.py diff --git a/lutin/target/lutinTarget_MacOs.py b/lutin/z_target/lutinTarget_MacOs.py similarity index 100% rename from lutin/target/lutinTarget_MacOs.py rename to lutin/z_target/lutinTarget_MacOs.py diff --git a/lutin/target/lutinTarget_Windows.py b/lutin/z_target/lutinTarget_Windows.py similarity index 100% rename from lutin/target/lutinTarget_Windows.py rename to lutin/z_target/lutinTarget_Windows.py diff --git a/setup.py b/setup.py index 5c8bbb6..aef4567 100755 --- a/setup.py +++ b/setup.py @@ -7,19 +7,17 @@ def readme(): # https://pypi.python.org/pypi?%3Aaction=list_classifiers setup(name='lutin', - version='0.5.9', + version='0.5.12', description='Lutin generic builder', long_description=readme(), url='http://github.com/HeeroYui/lutin', author='Edouard DUPIN', author_email='yui.heero@gmail.com', license='APACHE-2', - packages=['lutin'], - package_data={ - 'lutin.builder': ['lutin/builder/*'], - 'lutin.system': ['lutin/system/*'], - 'lutin.target': ['lutin/target/*'] - }, + packages=['lutin', + 'lutin/z_builder', + 'lutin/z_system', + 'lutin/z_target'], classifiers=[ 'Development Status :: 3 - Alpha', 'License :: OSI Approved :: Apache Software License', @@ -28,10 +26,10 @@ setup(name='lutin', ], keywords='builder c++ c android ios macos makefile cmake', scripts=['bin/lutin'], - include_package_data = True, data_file=[ ('/etc/bash_completion.d', ['bash-autocompletion/lutin']), ], + include_package_data = True, install_requires=[ 'PIL>=1.0.0' ],