From ea7a2e4f12f4f1d3ca09a2b1316f3495d19e47da Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Sun, 28 Jun 2015 10:50:54 +0100 Subject: [PATCH 1/2] Changes to make windows building on CI easier --- windows/windows-builder.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/windows/windows-builder.py b/windows/windows-builder.py index ec8b426..b16809b 100644 --- a/windows/windows-builder.py +++ b/windows/windows-builder.py @@ -555,8 +555,11 @@ class WindowsBuilder(object): portable_app_path = os.path.join(self.portable_path, 'App', 'OpenLP') dir_util.copy_tree(self.dist_path, portable_app_path) # Copy help files to portableapp build directory. - self._print(' Copying help files') - dir_util.copy_tree(self.helpfile_path, os.path.join(portable_app_path, 'help')) + if os.path.isfile(os.path.join(self.helpfile_path, 'OpenLP.chm')): + self._print(' Copying help files') + dir_util.copy_tree(self.helpfile_path, os.path.join(portable_app_path, 'help')) + else: + self._print('... WARNING: Windows help file not found') # Build the launcher. self._print(' Building PortableApps Launcher') portableapps = Popen((self.portablelauncher, self.portable_path), stdout=PIPE) @@ -582,6 +585,9 @@ class WindowsBuilder(object): Build the PowerPoint Viewer DLL using Visual Studio. """ self._print('Building PPTVIEWLIB.DLL...') + if not os.path.exists(self.vcbuild): + self._print('... WARNING: vcbuild.exe was not found, skipping building pptviewlib.dll') + return vcbuild = Popen((self.vcbuild, '/rebuild', os.path.join(self.pptviewlib_path, 'pptviewlib.vcproj'), 'Release|Win32')) code = vcbuild.wait() From 4ab98b6387743f4e34b56da97f2f07ddfda89d94 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Sun, 28 Jun 2015 10:51:28 +0100 Subject: [PATCH 2/2] Rename hook to make it work. --- .../{hook-mysql-connector-python.py => hook-mysql.connector.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pyinstaller-hooks/{hook-mysql-connector-python.py => hook-mysql.connector.py} (100%) diff --git a/pyinstaller-hooks/hook-mysql-connector-python.py b/pyinstaller-hooks/hook-mysql.connector.py similarity index 100% rename from pyinstaller-hooks/hook-mysql-connector-python.py rename to pyinstaller-hooks/hook-mysql.connector.py