From f43ccfa90dd77a8b2b89539e174ad8947191b6ed Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 18 Sep 2020 00:43:09 +0200 Subject: [PATCH] Remove Windows XP support. --- platform/windows/wscript | 41 +++++++--------------------------------- 1 file changed, 7 insertions(+), 34 deletions(-) diff --git a/platform/windows/wscript b/platform/windows/wscript index b5d546a79..f958aa218 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -1,16 +1,13 @@ from __future__ import print_function import os -def write_installer(bits, windows_version, dcpomatic_version, debug, variant, disk): +def write_installer(bits, dcpomatic_version, debug, variant, disk): try: os.makedirs('build/platform/windows') except: pass - filename = 'build/platform/windows/installer.' - if windows_version is not None: - filename += 'xp.' - filename += '%d.nsi' % bits + filename = 'build/platform/windows/installer.%d.nsi' % bits f = open(filename, 'w') print('!include "MUI2.nsh"', file=f) @@ -27,10 +24,7 @@ def write_installer(bits, windows_version, dcpomatic_version, debug, variant, di outfile = 'DCP-o-matic ' if debug: outfile += 'Debug ' - outfile += '%s %d-bit ' % (dcpomatic_version, bits) - if windows_version is 'xp': - outfile += 'XP ' - outfile += 'Installer.exe' + outfile += '%s %d-bit Installer.exe' % (dcpomatic_version, bits) print('outFile "%s"' % outfile, file=f) @@ -176,19 +170,7 @@ File "%cdist_deps%/lib/libblockdev.dll" File "%cdist_deps%/lib/liblwext4.dll" """, file=f) - if windows_version == 'xp': - print(""" -File "%cdist_deps%/bin/avcodec-57.dll" -File "%cdist_deps%/bin/avfilter-6.dll" -File "%cdist_deps%/bin/avformat-57.dll" -File "%cdist_deps%/bin/avutil-55.dll" -File "%cdist_deps%/bin/avdevice-57.dll" -File "%cdist_deps%/bin/postproc-54.dll" -File "%cdist_deps%/bin/swresample-2.dll" -File "%cdist_deps%/bin/swscale-4.dll" - """, file=f) - else: - print(""" + print(""" File "%cdist_deps%/bin/avcodec-58.dll" File "%cdist_deps%/bin/avfilter-7.dll" File "%cdist_deps%/bin/avformat-58.dll" @@ -197,21 +179,14 @@ File "%cdist_deps%/bin/avdevice-58.dll" File "%cdist_deps%/bin/postproc-55.dll" File "%cdist_deps%/bin/swresample-3.dll" File "%cdist_deps%/bin/swscale-5.dll" - """, file=f) - - print(""" File "%cdist_deps%/bin/dcp-1.0.dll" File "%cdist_deps%/bin/cxml-0.dll" File "%cdist_deps%/bin/sub-1.0.dll" File "%cdist_deps%/bin/ffprobe.exe" File "%cdist_deps%/src/openssl/apps/openssl.exe" +File "%cdist_deps%/bin/libopenjp2.dll" """, file=f) - if windows_version == 'xp': - print('File "%cdist_deps%/bin/libopenjpeg-1.dll"', file=f) - else: - print('File "%cdist_deps%/bin/libopenjp2.dll"', file=f) - if debug: print('File "%resources%/gdb_script"', file=f) print('File "%resources%/dcpomatic2_debug.bat"', file=f) @@ -487,7 +462,5 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\U def build(bld): - write_installer(32, None, bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT, bld.env.ENABLE_DISK) - write_installer(64, None, bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT, bld.env.ENABLE_DISK) - write_installer(32, 'xp', bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT, bld.env.ENABLE_DISK) - write_installer(64, 'xp', bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT, bld.env.ENABLE_DISK) + write_installer(32, bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT, bld.env.ENABLE_DISK) + write_installer(64, bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT, bld.env.ENABLE_DISK) -- 2.30.2