From d36768aafabc71a370182b6264c44ceba018264c Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 8 Nov 2021 11:12:35 +0000 Subject: [PATCH 1/8] Update macosx-builder.py --- builders/macosx-builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builders/macosx-builder.py b/builders/macosx-builder.py index 79001cb..df89314 100644 --- a/builders/macosx-builder.py +++ b/builders/macosx-builder.py @@ -351,7 +351,7 @@ class MacOSXBuilder(Builder): argv = ['-s', self.dmg_settings_path, '-D', 'size={size}M'.format(size=size), '-D', 'icon={icon_path}'.format(icon_path=self.icon_path), '-D', 'app={dist_app_path}'.format(dist_app_path=self.dist_app_path), dmg_title, self.dmg_file] - self._run_module('dmgbuild', argv, 'Error running dmgbuild') + self._run_module('dmgbuild', argv, 'Error running dmgbuild', run_name='__main__') self._print('Finished creating dmg file, resulting file: %s' % self.dmg_file) def get_platform(self): From da7291116aef46ecc0e0a84f72e4698895e55397 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 8 Nov 2021 11:26:08 +0000 Subject: [PATCH 2/8] Put dmg version in quotes --- builders/macosx-builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builders/macosx-builder.py b/builders/macosx-builder.py index df89314..d99b6a8 100644 --- a/builders/macosx-builder.py +++ b/builders/macosx-builder.py @@ -336,7 +336,7 @@ class MacOSXBuilder(Builder): """ self._print('Creating dmg file...') dmg_name = 'OpenLP-{version}.dmg'.format(version=self.version) - dmg_title = 'OpenLP {version}'.format(version=self.version) + dmg_title = '"OpenLP {version}"'.format(version=self.version) self.dmg_file = os.path.join(self.work_path, 'dist', dmg_name) # Remove dmg if it exists. From 4d9695264750e6b8314b6702ef3f62a55b359818 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 8 Nov 2021 11:38:20 +0000 Subject: [PATCH 3/8] Also quote dmg filename --- builders/macosx-builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builders/macosx-builder.py b/builders/macosx-builder.py index d99b6a8..2c9eb87 100644 --- a/builders/macosx-builder.py +++ b/builders/macosx-builder.py @@ -335,7 +335,7 @@ class MacOSXBuilder(Builder): Create .dmg file. """ self._print('Creating dmg file...') - dmg_name = 'OpenLP-{version}.dmg'.format(version=self.version) + dmg_name = '"OpenLP-{version}.dmg"'.format(version=self.version) dmg_title = '"OpenLP {version}"'.format(version=self.version) self.dmg_file = os.path.join(self.work_path, 'dist', dmg_name) From 661a51645696e7ea24a42b69a2991f3066fdd29c Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 8 Nov 2021 11:47:01 +0000 Subject: [PATCH 4/8] quote the filename in the right place --- builders/macosx-builder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builders/macosx-builder.py b/builders/macosx-builder.py index 2c9eb87..eb42e9d 100644 --- a/builders/macosx-builder.py +++ b/builders/macosx-builder.py @@ -335,10 +335,10 @@ class MacOSXBuilder(Builder): Create .dmg file. """ self._print('Creating dmg file...') - dmg_name = '"OpenLP-{version}.dmg"'.format(version=self.version) + dmg_name = 'OpenLP-{version}.dmg'.format(version=self.version) dmg_title = '"OpenLP {version}"'.format(version=self.version) - self.dmg_file = os.path.join(self.work_path, 'dist', dmg_name) + self.dmg_file = '"{dmgfile}"'.format(dmgfile=os.path.join(self.work_path, 'dist', dmg_name)) # Remove dmg if it exists. if os.path.exists(self.dmg_file): os.remove(self.dmg_file) From 71490791e2597c8e93830fd63fcfc265fbd5e7de Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 8 Nov 2021 11:58:24 +0000 Subject: [PATCH 5/8] shot in the dark... --- builders/macosx-builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builders/macosx-builder.py b/builders/macosx-builder.py index eb42e9d..e51991e 100644 --- a/builders/macosx-builder.py +++ b/builders/macosx-builder.py @@ -348,7 +348,7 @@ class MacOSXBuilder(Builder): size += 10 os.chdir(os.path.dirname(self.dmg_settings_path)) - argv = ['-s', self.dmg_settings_path, '-D', 'size={size}M'.format(size=size), + argv = ['--settings', self.dmg_settings_path, '-D', 'size={size}M'.format(size=size), '-D', 'icon={icon_path}'.format(icon_path=self.icon_path), '-D', 'app={dist_app_path}'.format(dist_app_path=self.dist_app_path), dmg_title, self.dmg_file] self._run_module('dmgbuild', argv, 'Error running dmgbuild', run_name='__main__') From a6b0afc86df66c1c5cc63e4a58f961d19930d1ec Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 8 Nov 2021 12:04:27 +0000 Subject: [PATCH 6/8] add dmgbuild to its own commandline --- builders/macosx-builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builders/macosx-builder.py b/builders/macosx-builder.py index e51991e..e8b9456 100644 --- a/builders/macosx-builder.py +++ b/builders/macosx-builder.py @@ -348,7 +348,7 @@ class MacOSXBuilder(Builder): size += 10 os.chdir(os.path.dirname(self.dmg_settings_path)) - argv = ['--settings', self.dmg_settings_path, '-D', 'size={size}M'.format(size=size), + argv = ['dmgbuild', '-s', self.dmg_settings_path, '-D', 'size={size}M'.format(size=size), '-D', 'icon={icon_path}'.format(icon_path=self.icon_path), '-D', 'app={dist_app_path}'.format(dist_app_path=self.dist_app_path), dmg_title, self.dmg_file] self._run_module('dmgbuild', argv, 'Error running dmgbuild', run_name='__main__') From 92edc0d67973ff01331952ae54eb9c30c1be169f Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 8 Nov 2021 12:09:11 +0000 Subject: [PATCH 7/8] Remove quotes from dmgfile... --- builders/macosx-builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builders/macosx-builder.py b/builders/macosx-builder.py index e8b9456..4caf1c1 100644 --- a/builders/macosx-builder.py +++ b/builders/macosx-builder.py @@ -338,7 +338,7 @@ class MacOSXBuilder(Builder): dmg_name = 'OpenLP-{version}.dmg'.format(version=self.version) dmg_title = '"OpenLP {version}"'.format(version=self.version) - self.dmg_file = '"{dmgfile}"'.format(dmgfile=os.path.join(self.work_path, 'dist', dmg_name)) + self.dmg_file = os.path.join(self.work_path, 'dist', dmg_name) # Remove dmg if it exists. if os.path.exists(self.dmg_file): os.remove(self.dmg_file) From 29f99a1096e6bca38eb7fb3abc312429d3539a61 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 8 Nov 2021 13:26:49 +0000 Subject: [PATCH 8/8] Update macosx-builder.py --- builders/macosx-builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builders/macosx-builder.py b/builders/macosx-builder.py index 4caf1c1..984649b 100644 --- a/builders/macosx-builder.py +++ b/builders/macosx-builder.py @@ -336,7 +336,7 @@ class MacOSXBuilder(Builder): """ self._print('Creating dmg file...') dmg_name = 'OpenLP-{version}.dmg'.format(version=self.version) - dmg_title = '"OpenLP {version}"'.format(version=self.version) + dmg_title = 'OpenLP {version}'.format(version=self.version) self.dmg_file = os.path.join(self.work_path, 'dist', dmg_name) # Remove dmg if it exists.