Merge lp:~nico44/joliebulle/bundleMac into lp:joliebulle

[Nico]

Ajout d'un script py2app permettant de créer le paquet applicatif JolieBulle sur Mac.

[Nico (nico44)]

J'ai également déplacé les scripts de création du paquet Windows :
dist/Win
dist/Mac
Il faudrait créer un repertoire dist/Linux avec les scripts de création des paquets pour Linux.

=== removed directory 'Win'
=== removed file 'Win/install.iss'
--- Win/install.iss	2012-09-07 17:59:53 +0000
+++ Win/install.iss	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{E76BE5E1-3EBD-4634-93D4-BEBEEA43C433}
-AppName=JolieBulle
-AppVersion=2.7
-;AppVerName=JolieBulle 2.7
-AppPublisher=Pierre Tavares
-AppPublisherURL=http://joliebulle.tuxfamily.org
-AppSupportURL=http://joliebulle.tuxfamily.org
-AppUpdatesURL=http://joliebulle.tuxfamily.org
-DefaultDirName={pf}\JolieBulle
-DefaultGroupName=JolieBulle
-LicenseFile=C:\Documents and Settings\pierre\Desktop\gpl-3.0.txt
-OutputDir=C:\Documents and Settings\pierre\Desktop
-OutputBaseFilename=joliebulle_setup
-Compression=lzma
-SolidCompression=yes
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
-
-[Files]
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\main.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\joliebulle_en.qm"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\Images\*"; DestDir: "{app}\Images"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\Samples\*"; DestDir: "{app}\Samples"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_ctypes.pyd"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_hashlib.pyd"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_multiprocessing.pyd"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_socket.pyd"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_ssl.pyd"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\database.xml"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\mash.xml"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\library.zip"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\phonon4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\pyexpat.pyd"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtCore.pyd"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtGui.pyd"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtNetwork.pyd"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtWebKit.pyd"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\python31.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtWebKit4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\sip.pyd"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\SSLEAY32.dll"; DestDir: "{app}"; Flags: ignoreversion
-
-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\unicodedata.pyd"; DestDir: "{app}"; Flags: ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\JolieBulle"; Filename: "{app}\main.exe"  ; WorkingDir: "{app}" 
-Name: "{group}\{cm:ProgramOnTheWeb,JolieBulle}"; Filename: "http://joliebulle.tuxfamily.org"
-Name: "{group}\{cm:UninstallProgram,JolieBulle}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\JolieBulle"; Filename: "{app}\main.exe"; Tasks: desktopicon  ; WorkingDir: "{app}" 
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\JolieBulle"; Filename: "{app}\main.exe"; Tasks: quicklaunchicon  ; WorkingDir: "{app}" 
-
-[Run]
-Filename: "{app}\main.exe"; Description: "{cm:LaunchProgram,JolieBulle}"; Flags: nowait postinstall skipifsilent
-

=== removed file 'Win/setup.py'
--- Win/setup.py	2012-09-07 17:59:53 +0000
+++ Win/setup.py	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-#!/usr/bin/python
-#­*­coding: utf­8 -­*­
-
-
-import sys, os
-from cx_Freeze import setup, Executable
-
-
-
-includes=["base.py","brewCalc.py","densimetre_ui.py","editdivers.py","editgrain.py","edithoublon.py","editlevures.py","editorG_ui.py","editorH_ui.py","editorM_ui.py","editorY_ui.py","exportHTML.py","export.py","exportMash.py","globals.py","home.py","importMashXml.py", "joliebulle_en.qm","main.py","mashEditor_ui.py","mashEditWindow.py","outilAlc.py","outilAlc_ui.py","outilDens.py","outilDilution.py", "outilDilution_ui.py","outilEvaporation.py","outilEvaporation_ui.py","outilPaliers.py","outilPaliers_ui.py","preferences.py", "preferences_ui.py", "reader.py", "settings.py","stepAdjust_ui.py","stepAdjustWindow.py","stepEditor_ui.py","stepEditWindow.py","database.xml","mash.xml","launch.sh","README","COPYING"]
-
-excludes = []
-packages = ["database.xml","mash.xml"]
-icon = ["main.ico"]
-
-options = {"includes": includes,
-           "excludes": excludes,
-           "packages": packages,
-		   "icon":icon
-           }
-
-
-
-base = None
-if sys.platform == "win32":
-    base = "Win32GUI"
-
-
-
-cible_1 = Executable(
-    script = "main.py",
-    base = base,
-    compress = True,
-    icon = "main.ico",
-    )
-
-
-
-
-
-
-
-
-
-setup(name = "joliebulle",
-      version = "2.7",
-      description = "joliebulle, logiciel de brassage libre",
-      author = "Pierre Tavares",
-      author_email = "[e-mail]",
-      url = "http://joliebulle.tuxfamily.org", 
-
-      executables = [cible_1]
-      )    

=== added directory 'dist'
=== added directory 'dist/Mac'
=== added file 'dist/Mac/bulle.icns'
Binary files dist/Mac/bulle.icns	1970-01-01 00:00:00 +0000 and dist/Mac/bulle.icns	2012-09-17 19:47:26 +0000 differ
=== added file 'dist/Mac/createDMG.sh'
--- dist/Mac/createDMG.sh	1970-01-01 00:00:00 +0000
+++ dist/Mac/createDMG.sh	2012-09-17 19:47:26 +0000
@@ -0,0 +1,1 @@
+hdiutil create -imagekey zlib-level=9 -volname Joliebulle_2.7.0 -srcfolder dist/ Joliebulle_2.7.0.dmg

=== added file 'dist/Mac/qt.conf'
--- dist/Mac/qt.conf	1970-01-01 00:00:00 +0000
+++ dist/Mac/qt.conf	2012-09-17 19:47:26 +0000
@@ -0,0 +1,3 @@
+[Paths]
+Plugins = empty
+

=== added file 'dist/Mac/setup.py'
--- dist/Mac/setup.py	1970-01-01 00:00:00 +0000
+++ dist/Mac/setup.py	2012-09-17 19:47:26 +0000
@@ -0,0 +1,38 @@
+from setuptools import setup
+
+APP = ['../../main.py']
+NAME = "Joliebulle"
+VERSION = "2.7.0"
+
+DATA_FILES = ["../../database.xml","../../mash.xml", "qt.conf"]
+
+setup(
+	options=dict(
+		py2app=dict(
+			iconfile='bulle.icns',
+#			site_packages=True,
+			plist=dict(
+				CFBundleName               = NAME,
+				CFBundleShortVersionString = VERSION,     # must be in X.X.X format
+				CFBundleGetInfoString      = NAME + " " + VERSION,
+				CFBundleExecutable         = NAME,
+				CFBundleIdentifier         = "com.joliebulle",
+				LSEnvironment			   = {'LC_ALL':'en_US.UTF-8'}
+			),
+			argv_emulation=True,
+			includes=['sip', 'PyQt4','PyQt4.QtNetwork'],
+#			packages=DATA_FILES
+		),
+  	),
+	iconfile='../../Images/bulle.png',
+	app=APP,
+	data_files=DATA_FILES,
+	#options={'py2app': OPTIONS},
+	setup_requires=['py2app'],
+	name = NAME,
+	version = VERSION,
+	description = "joliebulle, logiciel de brassage libre",
+	author = "Pierre Tavares",
+	author_email = "[e-mail]",
+	url = "http://joliebulle.tuxfamily.org"
+)

=== added directory 'dist/Win'
=== added file 'dist/Win/install.iss'
--- dist/Win/install.iss	1970-01-01 00:00:00 +0000
+++ dist/Win/install.iss	2012-09-17 19:47:26 +0000
@@ -0,0 +1,71 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{E76BE5E1-3EBD-4634-93D4-BEBEEA43C433}
+AppName=JolieBulle
+AppVersion=2.7
+;AppVerName=JolieBulle 2.7
+AppPublisher=Pierre Tavares
+AppPublisherURL=http://joliebulle.tuxfamily.org
+AppSupportURL=http://joliebulle.tuxfamily.org
+AppUpdatesURL=http://joliebulle.tuxfamily.org
+DefaultDirName={pf}\JolieBulle
+DefaultGroupName=JolieBulle
+LicenseFile=C:\Documents and Settings\pierre\Desktop\gpl-3.0.txt
+OutputDir=C:\Documents and Settings\pierre\Desktop
+OutputBaseFilename=joliebulle_setup
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+Name: "french"; MessagesFile: "compiler:Languages\French.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
+
+[Files]
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\main.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\joliebulle_en.qm"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\Images\*"; DestDir: "{app}\Images"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\Samples\*"; DestDir: "{app}\Samples"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_ctypes.pyd"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_hashlib.pyd"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_multiprocessing.pyd"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_socket.pyd"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_ssl.pyd"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\database.xml"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\mash.xml"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\library.zip"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\phonon4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\pyexpat.pyd"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtCore.pyd"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtGui.pyd"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtNetwork.pyd"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtWebKit.pyd"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\python31.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtWebKit4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\sip.pyd"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\SSLEAY32.dll"; DestDir: "{app}"; Flags: ignoreversion
+
+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\unicodedata.pyd"; DestDir: "{app}"; Flags: ignoreversion
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\JolieBulle"; Filename: "{app}\main.exe"  ; WorkingDir: "{app}" 
+Name: "{group}\{cm:ProgramOnTheWeb,JolieBulle}"; Filename: "http://joliebulle.tuxfamily.org"
+Name: "{group}\{cm:UninstallProgram,JolieBulle}"; Filename: "{uninstallexe}"
+Name: "{commondesktop}\JolieBulle"; Filename: "{app}\main.exe"; Tasks: desktopicon  ; WorkingDir: "{app}" 
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\JolieBulle"; Filename: "{app}\main.exe"; Tasks: quicklaunchicon  ; WorkingDir: "{app}" 
+
+[Run]
+Filename: "{app}\main.exe"; Description: "{cm:LaunchProgram,JolieBulle}"; Flags: nowait postinstall skipifsilent
+

=== added file 'dist/Win/setup.py'
--- dist/Win/setup.py	1970-01-01 00:00:00 +0000
+++ dist/Win/setup.py	2012-09-17 19:47:26 +0000
@@ -0,0 +1,53 @@
+#!/usr/bin/python
+#­*­coding: utf­8 -­*­
+
+
+import sys, os
+from cx_Freeze import setup, Executable
+
+
+
+includes=["base.py","brewCalc.py","densimetre_ui.py","editdivers.py","editgrain.py","edithoublon.py","editlevures.py","editorG_ui.py","editorH_ui.py","editorM_ui.py","editorY_ui.py","exportHTML.py","export.py","exportMash.py","globals.py","home.py","importMashXml.py", "joliebulle_en.qm","main.py","mashEditor_ui.py","mashEditWindow.py","outilAlc.py","outilAlc_ui.py","outilDens.py","outilDilution.py", "outilDilution_ui.py","outilEvaporation.py","outilEvaporation_ui.py","outilPaliers.py","outilPaliers_ui.py","preferences.py", "preferences_ui.py", "reader.py", "settings.py","stepAdjust_ui.py","stepAdjustWindow.py","stepEditor_ui.py","stepEditWindow.py","database.xml","mash.xml","launch.sh","README","COPYING"]
+
+excludes = []
+packages = ["database.xml","mash.xml"]
+icon = ["main.ico"]
+
+options = {"includes": includes,
+           "excludes": excludes,
+           "packages": packages,
+		   "icon":icon
+           }
+
+
+
+base = None
+if sys.platform == "win32":
+    base = "Win32GUI"
+
+
+
+cible_1 = Executable(
+    script = "main.py",
+    base = base,
+    compress = True,
+    icon = "main.ico",
+    )
+
+
+
+
+
+
+
+
+
+setup(name = "joliebulle",
+      version = "2.7",
+      description = "joliebulle, logiciel de brassage libre",
+      author = "Pierre Tavares",
+      author_email = "[e-mail]",
+      url = "http://joliebulle.tuxfamily.org", 
+
+      executables = [cible_1]
+      )    

=== modified file 'globals.py'
--- globals.py	2012-09-04 22:31:19 +0000
+++ globals.py	2012-09-17 19:47:26 +0000
@@ -31,6 +31,17 @@
     samples_dir = 'Samples'
     samples_target = os.path.join(os.path.expanduser("~"), "AppData", "Local", "joliebulle", "recettes","Samples")
     
+elif platform == 'darwin':
+    home_dir = os.path.expanduser("~")
+    config_dir = os.path.join(os.path.expanduser("~"), ".config", "joliebulle")
+    recettes_dir = settings.conf.value("pathUnix", os.path.join(os.path.expanduser("~"), ".config", "joliebulle", "recettes"))
+    database_file = os.path.join(os.path.expanduser("~"), ".config", "joliebulle", "database.xml")
+    database_root = os.path.join(os.environ['RESOURCEPATH'], "database.xml")
+    mash_file = os.path.join(os.path.expanduser("~"), ".config", "joliebulle", "mash.xml")
+    mash_root = os.path.join(os.environ['RESOURCEPATH'], "mash.xml")
+    samples_dir='Samples'
+    samples_target = os.path.join(os.path.expanduser("~"), ".config", "joliebulle", "recettes", "Samples")
+
     
 else:
     home_dir = os.path.expanduser("~")
@@ -44,3 +55,4 @@
     mash_root = '/usr/share/joliebulle/mash.xml'
     samples_dir='Samples'
     samples_target = os.path.join(os.path.expanduser("~"), ".config", "joliebulle", "recettes", "Samples")
+