1
0
mirror of https://gitlab.com/openlp/packaging.git synced 2024-12-22 21:12:50 +00:00

Changes to make windows building on CI easier

This commit is contained in:
Tomas Groth 2015-06-28 10:50:54 +01:00
parent 0d66066160
commit ea7a2e4f12

View File

@ -555,8 +555,11 @@ class WindowsBuilder(object):
portable_app_path = os.path.join(self.portable_path, 'App', 'OpenLP') portable_app_path = os.path.join(self.portable_path, 'App', 'OpenLP')
dir_util.copy_tree(self.dist_path, portable_app_path) dir_util.copy_tree(self.dist_path, portable_app_path)
# Copy help files to portableapp build directory. # Copy help files to portableapp build directory.
self._print(' Copying help files') if os.path.isfile(os.path.join(self.helpfile_path, 'OpenLP.chm')):
dir_util.copy_tree(self.helpfile_path, os.path.join(portable_app_path, 'help')) 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. # Build the launcher.
self._print(' Building PortableApps Launcher') self._print(' Building PortableApps Launcher')
portableapps = Popen((self.portablelauncher, self.portable_path), stdout=PIPE) portableapps = Popen((self.portablelauncher, self.portable_path), stdout=PIPE)
@ -582,6 +585,9 @@ class WindowsBuilder(object):
Build the PowerPoint Viewer DLL using Visual Studio. Build the PowerPoint Viewer DLL using Visual Studio.
""" """
self._print('Building PPTVIEWLIB.DLL...') 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'), vcbuild = Popen((self.vcbuild, '/rebuild', os.path.join(self.pptviewlib_path, 'pptviewlib.vcproj'),
'Release|Win32')) 'Release|Win32'))
code = vcbuild.wait() code = vcbuild.wait()