Réorganisation de l'architecture du projet

314r · Mar 21, 2013 · 8b15d97 · 8b15d97
1 parent 3254f6d
commit 8b15d97
Show file tree

Hide file tree

Showing 128 changed files with 9 additions and 129 deletions.
diff --git a/MANIFEST b/MANIFEST
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,47 +1,3 @@
-include base.py
-include brewCalc.py
-include densimetre_ui.py
-include editdivers.py
-include editgrain.py
-include edithoublon.py
-include editlevures.py
-include editorG_ui.py
-include editorH_ui.py
-include editorM_ui.py
-include editorY_ui.py
-include exportHTML.py
-include export.py
-include exportMash.py
-include globals.py
-include importmashXml.py
-include joliebulle_en.qm
-include main.py
-include mash.xml
-include mashEditor_ui.py
-include mashEditWindow.py
-include outilAlc.py
-include outilAlc_ui.py
-include outilDens.py
-include outilDilution.py
-include outilDilution_ui.py
-include outilEvaporation.py
-include outilEvaporation_ui.py
-include outilPaliers.py
-include outilPaliers_ui.py
-include preferences.py
-include preferences_ui.py
-include reader.py
-include ressources_rc.py
-include settings.py
-include stepAdjust_ui.py
-include stepAdjustWindow.py
-include stepEditor_ui.py
-include stepEditWindow.py
-include database.xml
-include launch.sh
-include joliebulle.desktop
 include AUTHORS
 include README
 include COPYING
-recursive-include images *
-
diff --git a/Images/add.png → joliebulle/Images/add.png b/Images/add.png → joliebulle/Images/add.png
diff --git a/Images/application-exit.png → joliebulle/Images/application-exit.png b/Images/application-exit.png → joliebulle/Images/application-exit.png
diff --git a/Images/brewday.png → joliebulle/Images/brewday.png b/Images/brewday.png → joliebulle/Images/brewday.png
diff --git a/Images/bulle.png → joliebulle/Images/bulle.png b/Images/bulle.png → joliebulle/Images/bulle.png
diff --git a/Images/config.png → joliebulle/Images/config.png b/Images/config.png → joliebulle/Images/config.png
diff --git a/Images/document-open.png → joliebulle/Images/document-open.png b/Images/document-open.png → joliebulle/Images/document-open.png
diff --git a/Images/document-open.svg → joliebulle/Images/document-open.svg b/Images/document-open.svg → joliebulle/Images/document-open.svg
diff --git a/Images/document-properties.png → joliebulle/Images/document-properties.png b/Images/document-properties.png → joliebulle/Images/document-properties.png
diff --git a/Images/edit.png → joliebulle/Images/edit.png b/Images/edit.png → joliebulle/Images/edit.png
diff --git a/Images/evolution-tasks.png → joliebulle/Images/evolution-tasks.png b/Images/evolution-tasks.png → joliebulle/Images/evolution-tasks.png
diff --git a/Images/folder.png → joliebulle/Images/folder.png b/Images/folder.png → joliebulle/Images/folder.png
diff --git a/Images/glade.png → joliebulle/Images/glade.png b/Images/glade.png → joliebulle/Images/glade.png
diff --git a/Images/help-about.png → joliebulle/Images/help-about.png b/Images/help-about.png → joliebulle/Images/help-about.png
diff --git a/Images/library.png → joliebulle/Images/library.png b/Images/library.png → joliebulle/Images/library.png
diff --git a/Images/more.png → joliebulle/Images/more.png b/Images/more.png → joliebulle/Images/more.png
diff --git a/Images/print.png → joliebulle/Images/print.png b/Images/print.png → joliebulle/Images/print.png
diff --git a/Images/reload.png → joliebulle/Images/reload.png b/Images/reload.png → joliebulle/Images/reload.png
diff --git a/Images/remove.png → joliebulle/Images/remove.png b/Images/remove.png → joliebulle/Images/remove.png
diff --git a/Images/save.png → joliebulle/Images/save.png b/Images/save.png → joliebulle/Images/save.png
diff --git a/Images/stock_bookmark.png → joliebulle/Images/stock_bookmark.png b/Images/stock_bookmark.png → joliebulle/Images/stock_bookmark.png
diff --git a/Samples/Blanche.xml → joliebulle/Samples/Blanche.xml b/Samples/Blanche.xml → joliebulle/Samples/Blanche.xml
diff --git a/Samples/SMASH Amarillo.xml → joliebulle/Samples/SMASH Amarillo.xml b/Samples/SMASH Amarillo.xml → joliebulle/Samples/SMASH Amarillo.xml
diff --git a/base.py → joliebulle/base.py b/base.py → joliebulle/base.py
diff --git a/brewCalc.py → joliebulle/brewCalc.py b/brewCalc.py → joliebulle/brewCalc.py
diff --git a/database.xml → joliebulle/database.xml b/database.xml → joliebulle/database.xml
diff --git a/densimetre.ui → joliebulle/densimetre.ui b/densimetre.ui → joliebulle/densimetre.ui
diff --git a/densimetre_ui.py → joliebulle/densimetre_ui.py b/densimetre_ui.py → joliebulle/densimetre_ui.py
diff --git a/editdivers.py → joliebulle/editdivers.py b/editdivers.py → joliebulle/editdivers.py
diff --git a/editgrain.py → joliebulle/editgrain.py b/editgrain.py → joliebulle/editgrain.py
diff --git a/edithoublon.py → joliebulle/edithoublon.py b/edithoublon.py → joliebulle/edithoublon.py
diff --git a/editlevures.py → joliebulle/editlevures.py b/editlevures.py → joliebulle/editlevures.py
diff --git a/editorG.ui → joliebulle/editorG.ui b/editorG.ui → joliebulle/editorG.ui
diff --git a/editorG_ui.py → joliebulle/editorG_ui.py b/editorG_ui.py → joliebulle/editorG_ui.py
diff --git a/editorH.ui → joliebulle/editorH.ui b/editorH.ui → joliebulle/editorH.ui
diff --git a/editorH_ui.py → joliebulle/editorH_ui.py b/editorH_ui.py → joliebulle/editorH_ui.py
diff --git a/editorM.ui → joliebulle/editorM.ui b/editorM.ui → joliebulle/editorM.ui
diff --git a/editorM_ui.py → joliebulle/editorM_ui.py b/editorM_ui.py → joliebulle/editorM_ui.py
diff --git a/editorY.ui → joliebulle/editorY.ui b/editorY.ui → joliebulle/editorY.ui
diff --git a/editorY_ui.py → joliebulle/editorY_ui.py b/editorY_ui.py → joliebulle/editorY_ui.py
diff --git a/export.py → joliebulle/export.py b/export.py → joliebulle/export.py
diff --git a/exportBBCode.py → joliebulle/exportBBCode.py b/exportBBCode.py → joliebulle/exportBBCode.py
diff --git a/exportHTML.py → joliebulle/exportHTML.py b/exportHTML.py → joliebulle/exportHTML.py
diff --git a/exportMash.py → joliebulle/exportMash.py b/exportMash.py → joliebulle/exportMash.py
diff --git a/globals.py → joliebulle/globals.py b/globals.py → joliebulle/globals.py
diff --git a/home.py → joliebulle/home.py b/home.py → joliebulle/home.py
diff --git a/importMashXml.py → joliebulle/importMashXml.py b/importMashXml.py → joliebulle/importMashXml.py
diff --git a/joliebulle → joliebulle/joliebulle b/joliebulle → joliebulle/joliebulle
diff --git a/joliebulle.desktop → joliebulle/joliebulle.desktop b/joliebulle.desktop → joliebulle/joliebulle.desktop
diff --git a/joliebulle.pro → joliebulle/joliebulle.pro b/joliebulle.pro → joliebulle/joliebulle.pro
diff --git a/joliebulle_en.qm → joliebulle/joliebulle_en.qm b/joliebulle_en.qm → joliebulle/joliebulle_en.qm
diff --git a/joliebulle_en.ts → joliebulle/joliebulle_en.ts b/joliebulle_en.ts → joliebulle/joliebulle_en.ts
diff --git a/launch.sh → joliebulle/launch.sh b/launch.sh → joliebulle/launch.sh
diff --git a/main.py → joliebulle/main.py b/main.py → joliebulle/main.py
diff --git a/mash.ui → joliebulle/mash.ui b/mash.ui → joliebulle/mash.ui
diff --git a/mash.xml → joliebulle/mash.xml b/mash.xml → joliebulle/mash.xml
diff --git a/mashDetail.py → joliebulle/mashDetail.py b/mashDetail.py → joliebulle/mashDetail.py
diff --git a/mashDetail.ui → joliebulle/mashDetail.ui b/mashDetail.ui → joliebulle/mashDetail.ui
diff --git a/mashDetail_ui.py → joliebulle/mashDetail_ui.py b/mashDetail_ui.py → joliebulle/mashDetail_ui.py
diff --git a/mashEditWindow.py → joliebulle/mashEditWindow.py b/mashEditWindow.py → joliebulle/mashEditWindow.py
diff --git a/mashEditor.ui → joliebulle/mashEditor.ui b/mashEditor.ui → joliebulle/mashEditor.ui
diff --git a/mashEditor_ui.py → joliebulle/mashEditor_ui.py b/mashEditor_ui.py → joliebulle/mashEditor_ui.py
diff --git a/model/__init__.py → joliebulle/model/__init__.py b/model/__init__.py → joliebulle/model/__init__.py
diff --git a/model/constants/__init__.py → joliebulle/model/constants/__init__.py b/model/constants/__init__.py → joliebulle/model/constants/__init__.py
diff --git a/model/fermentable.py → joliebulle/model/fermentable.py b/model/fermentable.py → joliebulle/model/fermentable.py
diff --git a/model/hop.py → joliebulle/model/hop.py b/model/hop.py → joliebulle/model/hop.py
diff --git a/model/mash.py → joliebulle/model/mash.py b/model/mash.py → joliebulle/model/mash.py
diff --git a/model/mashstep.py → joliebulle/model/mashstep.py b/model/mashstep.py → joliebulle/model/mashstep.py
diff --git a/model/misc.py → joliebulle/model/misc.py b/model/misc.py → joliebulle/model/misc.py
diff --git a/model/recipe.py → joliebulle/model/recipe.py b/model/recipe.py → joliebulle/model/recipe.py
diff --git a/model/yeast.py → joliebulle/model/yeast.py b/model/yeast.py → joliebulle/model/yeast.py
diff --git a/outilAlc.py → joliebulle/outilAlc.py b/outilAlc.py → joliebulle/outilAlc.py
diff --git a/outilAlc.ui → joliebulle/outilAlc.ui b/outilAlc.ui → joliebulle/outilAlc.ui
diff --git a/outilAlc_ui.py → joliebulle/outilAlc_ui.py b/outilAlc_ui.py → joliebulle/outilAlc_ui.py
diff --git a/outilDens.py → joliebulle/outilDens.py b/outilDens.py → joliebulle/outilDens.py
diff --git a/outilDilution.py → joliebulle/outilDilution.py b/outilDilution.py → joliebulle/outilDilution.py
diff --git a/outilDilution.ui → joliebulle/outilDilution.ui b/outilDilution.ui → joliebulle/outilDilution.ui
diff --git a/outilDilution_ui.py → joliebulle/outilDilution_ui.py b/outilDilution_ui.py → joliebulle/outilDilution_ui.py
diff --git a/outilEvaporation.py → joliebulle/outilEvaporation.py b/outilEvaporation.py → joliebulle/outilEvaporation.py
diff --git a/outilEvaporation.ui → joliebulle/outilEvaporation.ui b/outilEvaporation.ui → joliebulle/outilEvaporation.ui
diff --git a/outilEvaporation_ui.py → joliebulle/outilEvaporation_ui.py b/outilEvaporation_ui.py → joliebulle/outilEvaporation_ui.py
diff --git a/outilPaliers.py → joliebulle/outilPaliers.py b/outilPaliers.py → joliebulle/outilPaliers.py
diff --git a/outilPaliers.ui → joliebulle/outilPaliers.ui b/outilPaliers.ui → joliebulle/outilPaliers.ui
diff --git a/outilPaliers_ui.py → joliebulle/outilPaliers_ui.py b/outilPaliers_ui.py → joliebulle/outilPaliers_ui.py
diff --git a/plugins/ExtensionPoints.py → joliebulle/plugins/ExtensionPoints.py b/plugins/ExtensionPoints.py → joliebulle/plugins/ExtensionPoints.py
diff --git a/plugins/PluginManager.py → joliebulle/plugins/PluginManager.py b/plugins/PluginManager.py → joliebulle/plugins/PluginManager.py
diff --git a/plugins/__init__.py → joliebulle/plugins/__init__.py b/plugins/__init__.py → joliebulle/plugins/__init__.py
diff --git a/plugins/extensions/LogLifecycleExtension.py → ...ugins/extensions/LogLifecycleExtension.py b/plugins/extensions/LogLifecycleExtension.py → ...ugins/extensions/LogLifecycleExtension.py
diff --git a/plugins/extensions/__init__.py → joliebulle/plugins/extensions/__init__.py b/plugins/extensions/__init__.py → joliebulle/plugins/extensions/__init__.py
diff --git a/preferences.py → joliebulle/preferences.py b/preferences.py → joliebulle/preferences.py
diff --git a/preferences.ui → joliebulle/preferences.ui b/preferences.ui → joliebulle/preferences.ui
diff --git a/preferences_ui.py → joliebulle/preferences_ui.py b/preferences_ui.py → joliebulle/preferences_ui.py
diff --git a/qt_fr.qm → joliebulle/qt_fr.qm b/qt_fr.qm → joliebulle/qt_fr.qm
diff --git a/qt_help_fr.qm → joliebulle/qt_help_fr.qm b/qt_help_fr.qm → joliebulle/qt_help_fr.qm
diff --git a/reader (copie).ui → joliebulle/reader (copie).ui b/reader (copie).ui → joliebulle/reader (copie).ui
diff --git a/reader.py → joliebulle/reader.py b/reader.py → joliebulle/reader.py
diff --git a/reader.ui → joliebulle/reader.ui b/reader.ui → joliebulle/reader.ui
diff --git a/ressources.qrc → joliebulle/ressources.qrc b/ressources.qrc → joliebulle/ressources.qrc
diff --git a/ressources_rc.py → joliebulle/ressources_rc.py b/ressources_rc.py → joliebulle/ressources_rc.py
diff --git a/settings.py → joliebulle/settings.py b/settings.py → joliebulle/settings.py
diff --git a/stepAdjust.ui → joliebulle/stepAdjust.ui b/stepAdjust.ui → joliebulle/stepAdjust.ui
diff --git a/stepAdjustWindow.py → joliebulle/stepAdjustWindow.py b/stepAdjustWindow.py → joliebulle/stepAdjustWindow.py
diff --git a/stepAdjust_ui.py → joliebulle/stepAdjust_ui.py b/stepAdjust_ui.py → joliebulle/stepAdjust_ui.py
diff --git a/stepEditWindow.py → joliebulle/stepEditWindow.py b/stepEditWindow.py → joliebulle/stepEditWindow.py
diff --git a/stepEditor.ui → joliebulle/stepEditor.ui b/stepEditor.ui → joliebulle/stepEditor.ui
diff --git a/stepEditor_ui.py → joliebulle/stepEditor_ui.py b/stepEditor_ui.py → joliebulle/stepEditor_ui.py
diff --git a/ui/MainWindow.py → joliebulle/ui/MainWindow.py b/ui/MainWindow.py → joliebulle/ui/MainWindow.py
diff --git a/ui/MainWindow.ui → joliebulle/ui/MainWindow.ui b/ui/MainWindow.ui → joliebulle/ui/MainWindow.ui
diff --git a/ui/MainWindowUI.py → joliebulle/ui/MainWindowUI.py b/ui/MainWindowUI.py → joliebulle/ui/MainWindowUI.py
diff --git a/ui/NavTreeViewDefaultsExtension.py → ...ebulle/ui/NavTreeViewDefaultsExtension.py b/ui/NavTreeViewDefaultsExtension.py → ...ebulle/ui/NavTreeViewDefaultsExtension.py
diff --git a/ui/NavTreeViewModel.py → joliebulle/ui/NavTreeViewModel.py b/ui/NavTreeViewModel.py → joliebulle/ui/NavTreeViewModel.py
diff --git a/ui/RecipeView.py → joliebulle/ui/RecipeView.py b/ui/RecipeView.py → joliebulle/ui/RecipeView.py
diff --git a/ui/RecipeView.ui → joliebulle/ui/RecipeView.ui b/ui/RecipeView.ui → joliebulle/ui/RecipeView.ui
diff --git a/ui/RecipeViewUI.py → joliebulle/ui/RecipeViewUI.py b/ui/RecipeViewUI.py → joliebulle/ui/RecipeViewUI.py
diff --git a/ui/__init__.py → joliebulle/ui/__init__.py b/ui/__init__.py → joliebulle/ui/__init__.py
diff --git a/view/__init__.py → joliebulle/view/__init__.py b/view/__init__.py → joliebulle/view/__init__.py
diff --git a/view/base.py → joliebulle/view/base.py b/view/base.py → joliebulle/view/base.py
diff --git a/view/constants/__init__.py → joliebulle/view/constants/__init__.py b/view/constants/__init__.py → joliebulle/view/constants/__init__.py
diff --git a/view/fermentableview.py → joliebulle/view/fermentableview.py b/view/fermentableview.py → joliebulle/view/fermentableview.py
diff --git a/view/hopview.py → joliebulle/view/hopview.py b/view/hopview.py → joliebulle/view/hopview.py
diff --git a/view/mashstepview.py → joliebulle/view/mashstepview.py b/view/mashstepview.py → joliebulle/view/mashstepview.py
diff --git a/view/miscview.py → joliebulle/view/miscview.py b/view/miscview.py → joliebulle/view/miscview.py
diff --git a/view/recipeview.py → joliebulle/view/recipeview.py b/view/recipeview.py → joliebulle/view/recipeview.py
diff --git a/view/yeastview.py → joliebulle/view/yeastview.py b/view/yeastview.py → joliebulle/view/yeastview.py
diff --git a/window.ui → joliebulle/window.ui b/window.ui → joliebulle/window.ui
diff --git a/dist/setup.cfg → setup.cfg b/dist/setup.cfg → setup.cfg
@@ -1,4 +1,4 @@
 [install] 
 install_data=/usr/share
 install_scripts=/usr/bin
-install_lib=/usr/share/joliebulle
+install_lib=/usr/share
diff --git a/dist/setup.py → setup.py b/dist/setup.py → setup.py
@@ -1,14 +1,15 @@
 #!/usr/bin/python3
 #*coding: utf8 -*
 
-APP = ["../main.py"]
+APP = ["joliebulle/main.py"]
 NAME = "Joliebulle"
 VERSION = "2.8.0"
 
 setup_info = dict(
       name = NAME,
       version = VERSION,
       app = APP,
+      license='GPLv3',
       options=dict(
 	py2app=dict(
 		iconfile='Mac/bulle.icns',
@@ -28,21 +29,20 @@
       author = "Pierre Tavares",
       author_email = "contact.314r@gmail.com",
       url = "http://joliebulle.tuxfamily.org",
-      package_dir = { "":".." },
-      package_data = { "":["*.py", "*.qm", "*.xml", "Images/*.png", "Samples/*.xml", "README", "COPYING", "AUTHORS"] },
+      package_data = { "joliebulle":["*.py", "*.qm", "*.xml", "Images/*.png", "Samples/*.xml"] },
       setup_requires=['py2app'],
-      scripts = ["../joliebulle"],
-      iconfile='../Images/bulle.png'       
+      scripts = ["joliebulle/joliebulle"],
+      iconfile='joliebulle/Images/bulle.png'       
 )  
 
 from sys import platform
 
 if platform == 'darwin':
     from setuptools import setup
-    setup_info['data_files'] = ["../database.xml","../mash.xml", "Mac/qt.conf"]
+    setup_info['data_files'] = ["joliebulle/database.xml","joliebulle/mash.xml", "dist/Mac/qt.conf"]
 elif platform.startswith('linux'):
     from distutils.core import setup
-    setup_info['packages'] = [ "" ]
-    setup_info['data_files'] = [("applications", ["../joliebulle.desktop"])]
+    setup_info['packages'] = [ "joliebulle" ]
+    setup_info['data_files'] = [("applications", ["joliebulle/joliebulle.desktop"])]
 
 setup(**setup_info)