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

Proposed by Nico on 2012-09-17
Status: Merged
Merged at revision: 298
Proposed branch: lp:~nico44/joliebulle/bundleMac
Merge into: lp:joliebulle
Diff against target: 357 lines (+178/-124)
8 files modified
Win/install.iss (+0/-71)
Win/setup.py (+0/-53)
dist/Mac/createDMG.sh (+1/-0)
dist/Mac/qt.conf (+3/-0)
dist/Mac/setup.py (+38/-0)
dist/Win/install.iss (+71/-0)
dist/Win/setup.py (+53/-0)
globals.py (+12/-0)
To merge this branch: bzr merge lp:~nico44/joliebulle/bundleMac
Reviewer Review Type Date Requested Status
314r 2012-09-17 Pending
Review via email: mp+124781@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Nico (nico44) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory 'Win'
2=== removed file 'Win/install.iss'
3--- Win/install.iss 2012-09-07 17:59:53 +0000
4+++ Win/install.iss 1970-01-01 00:00:00 +0000
5@@ -1,71 +0,0 @@
6-; Script generated by the Inno Setup Script Wizard.
7-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
8-
9-[Setup]
10-; NOTE: The value of AppId uniquely identifies this application.
11-; Do not use the same AppId value in installers for other applications.
12-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
13-AppId={{E76BE5E1-3EBD-4634-93D4-BEBEEA43C433}
14-AppName=JolieBulle
15-AppVersion=2.7
16-;AppVerName=JolieBulle 2.7
17-AppPublisher=Pierre Tavares
18-AppPublisherURL=http://joliebulle.tuxfamily.org
19-AppSupportURL=http://joliebulle.tuxfamily.org
20-AppUpdatesURL=http://joliebulle.tuxfamily.org
21-DefaultDirName={pf}\JolieBulle
22-DefaultGroupName=JolieBulle
23-LicenseFile=C:\Documents and Settings\pierre\Desktop\gpl-3.0.txt
24-OutputDir=C:\Documents and Settings\pierre\Desktop
25-OutputBaseFilename=joliebulle_setup
26-Compression=lzma
27-SolidCompression=yes
28-
29-[Languages]
30-Name: "english"; MessagesFile: "compiler:Default.isl"
31-Name: "french"; MessagesFile: "compiler:Languages\French.isl"
32-
33-[Tasks]
34-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
35-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
36-
37-[Files]
38-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\main.exe"; DestDir: "{app}"; Flags: ignoreversion
39-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\joliebulle_en.qm"; DestDir: "{app}"; Flags: ignoreversion
40-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\Images\*"; DestDir: "{app}\Images"; Flags: ignoreversion recursesubdirs createallsubdirs
41-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\Samples\*"; DestDir: "{app}\Samples"; Flags: ignoreversion recursesubdirs createallsubdirs
42-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_ctypes.pyd"; DestDir: "{app}"; Flags: ignoreversion
43-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_hashlib.pyd"; DestDir: "{app}"; Flags: ignoreversion
44-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_multiprocessing.pyd"; DestDir: "{app}"; Flags: ignoreversion
45-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_socket.pyd"; DestDir: "{app}"; Flags: ignoreversion
46-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_ssl.pyd"; DestDir: "{app}"; Flags: ignoreversion
47-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\database.xml"; DestDir: "{app}"; Flags: ignoreversion
48-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\mash.xml"; DestDir: "{app}"; Flags: ignoreversion
49-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\library.zip"; DestDir: "{app}"; Flags: ignoreversion
50-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\phonon4.dll"; DestDir: "{app}"; Flags: ignoreversion
51-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\pyexpat.pyd"; DestDir: "{app}"; Flags: ignoreversion
52-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtCore.pyd"; DestDir: "{app}"; Flags: ignoreversion
53-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtGui.pyd"; DestDir: "{app}"; Flags: ignoreversion
54-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtNetwork.pyd"; DestDir: "{app}"; Flags: ignoreversion
55-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtWebKit.pyd"; DestDir: "{app}"; Flags: ignoreversion
56-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\python31.dll"; DestDir: "{app}"; Flags: ignoreversion
57-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion
58-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion
59-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion
60-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtWebKit4.dll"; DestDir: "{app}"; Flags: ignoreversion
61-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\sip.pyd"; DestDir: "{app}"; Flags: ignoreversion
62-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\SSLEAY32.dll"; DestDir: "{app}"; Flags: ignoreversion
63-
64-Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\unicodedata.pyd"; DestDir: "{app}"; Flags: ignoreversion
65-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
66-
67-[Icons]
68-Name: "{group}\JolieBulle"; Filename: "{app}\main.exe" ; WorkingDir: "{app}"
69-Name: "{group}\{cm:ProgramOnTheWeb,JolieBulle}"; Filename: "http://joliebulle.tuxfamily.org"
70-Name: "{group}\{cm:UninstallProgram,JolieBulle}"; Filename: "{uninstallexe}"
71-Name: "{commondesktop}\JolieBulle"; Filename: "{app}\main.exe"; Tasks: desktopicon ; WorkingDir: "{app}"
72-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\JolieBulle"; Filename: "{app}\main.exe"; Tasks: quicklaunchicon ; WorkingDir: "{app}"
73-
74-[Run]
75-Filename: "{app}\main.exe"; Description: "{cm:LaunchProgram,JolieBulle}"; Flags: nowait postinstall skipifsilent
76-
77
78=== removed file 'Win/setup.py'
79--- Win/setup.py 2012-09-07 17:59:53 +0000
80+++ Win/setup.py 1970-01-01 00:00:00 +0000
81@@ -1,53 +0,0 @@
82-#!/usr/bin/python
83-#­*­coding: utf­8 -­*­
84-
85-
86-import sys, os
87-from cx_Freeze import setup, Executable
88-
89-
90-
91-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"]
92-
93-excludes = []
94-packages = ["database.xml","mash.xml"]
95-icon = ["main.ico"]
96-
97-options = {"includes": includes,
98- "excludes": excludes,
99- "packages": packages,
100- "icon":icon
101- }
102-
103-
104-
105-base = None
106-if sys.platform == "win32":
107- base = "Win32GUI"
108-
109-
110-
111-cible_1 = Executable(
112- script = "main.py",
113- base = base,
114- compress = True,
115- icon = "main.ico",
116- )
117-
118-
119-
120-
121-
122-
123-
124-
125-
126-setup(name = "joliebulle",
127- version = "2.7",
128- description = "joliebulle, logiciel de brassage libre",
129- author = "Pierre Tavares",
130- author_email = "contact.314r@gmail.com",
131- url = "http://joliebulle.tuxfamily.org",
132-
133- executables = [cible_1]
134- )
135
136=== added directory 'dist'
137=== added directory 'dist/Mac'
138=== added file 'dist/Mac/bulle.icns'
139Binary 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
140=== added file 'dist/Mac/createDMG.sh'
141--- dist/Mac/createDMG.sh 1970-01-01 00:00:00 +0000
142+++ dist/Mac/createDMG.sh 2012-09-17 19:47:26 +0000
143@@ -0,0 +1,1 @@
144+hdiutil create -imagekey zlib-level=9 -volname Joliebulle_2.7.0 -srcfolder dist/ Joliebulle_2.7.0.dmg
145
146=== added file 'dist/Mac/qt.conf'
147--- dist/Mac/qt.conf 1970-01-01 00:00:00 +0000
148+++ dist/Mac/qt.conf 2012-09-17 19:47:26 +0000
149@@ -0,0 +1,3 @@
150+[Paths]
151+Plugins = empty
152+
153
154=== added file 'dist/Mac/setup.py'
155--- dist/Mac/setup.py 1970-01-01 00:00:00 +0000
156+++ dist/Mac/setup.py 2012-09-17 19:47:26 +0000
157@@ -0,0 +1,38 @@
158+from setuptools import setup
159+
160+APP = ['../../main.py']
161+NAME = "Joliebulle"
162+VERSION = "2.7.0"
163+
164+DATA_FILES = ["../../database.xml","../../mash.xml", "qt.conf"]
165+
166+setup(
167+ options=dict(
168+ py2app=dict(
169+ iconfile='bulle.icns',
170+# site_packages=True,
171+ plist=dict(
172+ CFBundleName = NAME,
173+ CFBundleShortVersionString = VERSION, # must be in X.X.X format
174+ CFBundleGetInfoString = NAME + " " + VERSION,
175+ CFBundleExecutable = NAME,
176+ CFBundleIdentifier = "com.joliebulle",
177+ LSEnvironment = {'LC_ALL':'en_US.UTF-8'}
178+ ),
179+ argv_emulation=True,
180+ includes=['sip', 'PyQt4','PyQt4.QtNetwork'],
181+# packages=DATA_FILES
182+ ),
183+ ),
184+ iconfile='../../Images/bulle.png',
185+ app=APP,
186+ data_files=DATA_FILES,
187+ #options={'py2app': OPTIONS},
188+ setup_requires=['py2app'],
189+ name = NAME,
190+ version = VERSION,
191+ description = "joliebulle, logiciel de brassage libre",
192+ author = "Pierre Tavares",
193+ author_email = "contact.314r@gmail.com",
194+ url = "http://joliebulle.tuxfamily.org"
195+)
196
197=== added directory 'dist/Win'
198=== added file 'dist/Win/install.iss'
199--- dist/Win/install.iss 1970-01-01 00:00:00 +0000
200+++ dist/Win/install.iss 2012-09-17 19:47:26 +0000
201@@ -0,0 +1,71 @@
202+; Script generated by the Inno Setup Script Wizard.
203+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
204+
205+[Setup]
206+; NOTE: The value of AppId uniquely identifies this application.
207+; Do not use the same AppId value in installers for other applications.
208+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
209+AppId={{E76BE5E1-3EBD-4634-93D4-BEBEEA43C433}
210+AppName=JolieBulle
211+AppVersion=2.7
212+;AppVerName=JolieBulle 2.7
213+AppPublisher=Pierre Tavares
214+AppPublisherURL=http://joliebulle.tuxfamily.org
215+AppSupportURL=http://joliebulle.tuxfamily.org
216+AppUpdatesURL=http://joliebulle.tuxfamily.org
217+DefaultDirName={pf}\JolieBulle
218+DefaultGroupName=JolieBulle
219+LicenseFile=C:\Documents and Settings\pierre\Desktop\gpl-3.0.txt
220+OutputDir=C:\Documents and Settings\pierre\Desktop
221+OutputBaseFilename=joliebulle_setup
222+Compression=lzma
223+SolidCompression=yes
224+
225+[Languages]
226+Name: "english"; MessagesFile: "compiler:Default.isl"
227+Name: "french"; MessagesFile: "compiler:Languages\French.isl"
228+
229+[Tasks]
230+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
231+Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
232+
233+[Files]
234+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\main.exe"; DestDir: "{app}"; Flags: ignoreversion
235+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\joliebulle_en.qm"; DestDir: "{app}"; Flags: ignoreversion
236+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\Images\*"; DestDir: "{app}\Images"; Flags: ignoreversion recursesubdirs createallsubdirs
237+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\Samples\*"; DestDir: "{app}\Samples"; Flags: ignoreversion recursesubdirs createallsubdirs
238+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_ctypes.pyd"; DestDir: "{app}"; Flags: ignoreversion
239+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_hashlib.pyd"; DestDir: "{app}"; Flags: ignoreversion
240+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_multiprocessing.pyd"; DestDir: "{app}"; Flags: ignoreversion
241+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_socket.pyd"; DestDir: "{app}"; Flags: ignoreversion
242+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\_ssl.pyd"; DestDir: "{app}"; Flags: ignoreversion
243+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\database.xml"; DestDir: "{app}"; Flags: ignoreversion
244+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\mash.xml"; DestDir: "{app}"; Flags: ignoreversion
245+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\library.zip"; DestDir: "{app}"; Flags: ignoreversion
246+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\phonon4.dll"; DestDir: "{app}"; Flags: ignoreversion
247+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\pyexpat.pyd"; DestDir: "{app}"; Flags: ignoreversion
248+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtCore.pyd"; DestDir: "{app}"; Flags: ignoreversion
249+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtGui.pyd"; DestDir: "{app}"; Flags: ignoreversion
250+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtNetwork.pyd"; DestDir: "{app}"; Flags: ignoreversion
251+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\PyQt4.QtWebKit.pyd"; DestDir: "{app}"; Flags: ignoreversion
252+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\python31.dll"; DestDir: "{app}"; Flags: ignoreversion
253+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion
254+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion
255+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion
256+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\QtWebKit4.dll"; DestDir: "{app}"; Flags: ignoreversion
257+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\sip.pyd"; DestDir: "{app}"; Flags: ignoreversion
258+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\SSLEAY32.dll"; DestDir: "{app}"; Flags: ignoreversion
259+
260+Source: "C:\Documents and Settings\pierre\Desktop\joliebulle-2.7\build\exe.win32-3.1\unicodedata.pyd"; DestDir: "{app}"; Flags: ignoreversion
261+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
262+
263+[Icons]
264+Name: "{group}\JolieBulle"; Filename: "{app}\main.exe" ; WorkingDir: "{app}"
265+Name: "{group}\{cm:ProgramOnTheWeb,JolieBulle}"; Filename: "http://joliebulle.tuxfamily.org"
266+Name: "{group}\{cm:UninstallProgram,JolieBulle}"; Filename: "{uninstallexe}"
267+Name: "{commondesktop}\JolieBulle"; Filename: "{app}\main.exe"; Tasks: desktopicon ; WorkingDir: "{app}"
268+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\JolieBulle"; Filename: "{app}\main.exe"; Tasks: quicklaunchicon ; WorkingDir: "{app}"
269+
270+[Run]
271+Filename: "{app}\main.exe"; Description: "{cm:LaunchProgram,JolieBulle}"; Flags: nowait postinstall skipifsilent
272+
273
274=== added file 'dist/Win/setup.py'
275--- dist/Win/setup.py 1970-01-01 00:00:00 +0000
276+++ dist/Win/setup.py 2012-09-17 19:47:26 +0000
277@@ -0,0 +1,53 @@
278+#!/usr/bin/python
279+#­*­coding: utf­8 -­*­
280+
281+
282+import sys, os
283+from cx_Freeze import setup, Executable
284+
285+
286+
287+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"]
288+
289+excludes = []
290+packages = ["database.xml","mash.xml"]
291+icon = ["main.ico"]
292+
293+options = {"includes": includes,
294+ "excludes": excludes,
295+ "packages": packages,
296+ "icon":icon
297+ }
298+
299+
300+
301+base = None
302+if sys.platform == "win32":
303+ base = "Win32GUI"
304+
305+
306+
307+cible_1 = Executable(
308+ script = "main.py",
309+ base = base,
310+ compress = True,
311+ icon = "main.ico",
312+ )
313+
314+
315+
316+
317+
318+
319+
320+
321+
322+setup(name = "joliebulle",
323+ version = "2.7",
324+ description = "joliebulle, logiciel de brassage libre",
325+ author = "Pierre Tavares",
326+ author_email = "contact.314r@gmail.com",
327+ url = "http://joliebulle.tuxfamily.org",
328+
329+ executables = [cible_1]
330+ )
331
332=== modified file 'globals.py'
333--- globals.py 2012-09-04 22:31:19 +0000
334+++ globals.py 2012-09-17 19:47:26 +0000
335@@ -31,6 +31,17 @@
336 samples_dir = 'Samples'
337 samples_target = os.path.join(os.path.expanduser("~"), "AppData", "Local", "joliebulle", "recettes","Samples")
338
339+elif platform == 'darwin':
340+ home_dir = os.path.expanduser("~")
341+ config_dir = os.path.join(os.path.expanduser("~"), ".config", "joliebulle")
342+ recettes_dir = settings.conf.value("pathUnix", os.path.join(os.path.expanduser("~"), ".config", "joliebulle", "recettes"))
343+ database_file = os.path.join(os.path.expanduser("~"), ".config", "joliebulle", "database.xml")
344+ database_root = os.path.join(os.environ['RESOURCEPATH'], "database.xml")
345+ mash_file = os.path.join(os.path.expanduser("~"), ".config", "joliebulle", "mash.xml")
346+ mash_root = os.path.join(os.environ['RESOURCEPATH'], "mash.xml")
347+ samples_dir='Samples'
348+ samples_target = os.path.join(os.path.expanduser("~"), ".config", "joliebulle", "recettes", "Samples")
349+
350
351 else:
352 home_dir = os.path.expanduser("~")
353@@ -44,3 +55,4 @@
354 mash_root = '/usr/share/joliebulle/mash.xml'
355 samples_dir='Samples'
356 samples_target = os.path.join(os.path.expanduser("~"), ".config", "joliebulle", "recettes", "Samples")
357+

Subscribers

People subscribed via source and target branches

to all changes: