openlp-core team mailing list archive

[Tomas Groth <tomasgroth@xxxxxxxx>]

Tomas Groth has proposed merging lp:~tomasgroth/openlp/packaging-ci-fixes into lp:openlp/packaging.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~tomasgroth/openlp/packaging-ci-fixes/+merge/263196

Rename hook to make it work.
Changes to make windows building on CI easier.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~tomasgroth/openlp/packaging-ci-fixes into lp:openlp/packaging.

=== renamed file 'pyinstaller-hooks/hook-mysql-connector-python.py' => 'pyinstaller-hooks/hook-mysql.connector.py'
=== modified file 'windows/windows-builder.py'
--- windows/windows-builder.py	2015-06-16 20:07:34 +0000
+++ windows/windows-builder.py	2015-06-28 09:56:47 +0000
@@ -555,8 +555,11 @@
         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 @@
         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()