diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-05-05 11:58:18 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-05-06 20:42:22 +0200 |
| commit | 6cb1beea8357e5a0669166d50ba106fb8cac7064 (patch) | |
| tree | df84d7a9c93f0f8e7492e1d1106d1c1ed6af4fc8 /src/tools/wscript | |
| parent | 330da8967d8ae6366f1992f691e1f472351cfa67 (diff) | |
Remove use of f-strings in wscripts
Various Linux build environments have a python that is too old.
Diffstat (limited to 'src/tools/wscript')
| -rw-r--r-- | src/tools/wscript | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/tools/wscript b/src/tools/wscript index 5375ae430..7d03bab62 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -38,7 +38,7 @@ def description(tool, variant): def make_rc(tool, icon, variant): - filename = f'build/src/tools/{tool}.rc' + filename = 'build/src/tools/%s.rc' % tool with open(filename, 'w') as rc: if tool == 'dcpomatic_disk_writer': print('#include "winuser.h"', file=rc) @@ -58,8 +58,8 @@ def make_rc(tool, icon, variant): </trustInfo> </assembly>""", file=manifest) else: - print(f""" -id ICON "../../graphics/windows/{icon}" + print(""" +id ICON "../../graphics/windows/%s" #include "wx-3.1/wx/msw/wx.rc" VS_VERSION_INFO VERSIONINFO FILEVERSION 0,0,0,2 @@ -73,20 +73,20 @@ VS_VERSION_INFO VERSIONINFO FILEOS 0x4L FILETYPE 0x1L FILESUBTYPE 0x0L -{{ + { BLOCK "StringFileInfo" - {{ + { BLOCK "040904b0" - {{ - VALUE "FileDescription", "{description(tool, variant)}\\0" - }} - }} + { + VALUE "FileDescription", "%s\\0" + } + } BLOCK "VarFileInfo" - {{ + { VALUE "Translation", 0x409, 1200 - }} -}} - """, file=rc) + } + } + """ % (icon, description(tool, variant)), file=rc) return filename def configure(conf): @@ -125,7 +125,7 @@ def build(bld): obj.use = ['libdcpomatic2'] obj.source = '%s.cc' % t if (bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32) and t == 'dcpomatic_disk_writer': - obj.source += f' ../../{make_rc(t, None, bld.env.VARIANT)}' + obj.source += ' ../../%s' % (make_rc(t, None, bld.env.VARIANT)) # Prevent a console window opening when we start dcpomatic2_disk_writer obj.env.append_value('LINKFLAGS', '-Wl,-subsystem,windows') obj.target = t.replace('dcpomatic', 'dcpomatic2') @@ -162,7 +162,7 @@ def build(bld): obj.use = ['libdcpomatic2', 'libdcpomatic2-wx'] obj.source = '%s.cc' % t if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32: - obj.source += f' ../../{make_rc(t, t.replace("dcpomatic", "dcpomatic2") + ".ico", bld.env.VARIANT)}' + obj.source += ' ../../%s' % make_rc(t, t.replace("dcpomatic", "dcpomatic2") + ".ico", bld.env.VARIANT) obj.target = t.replace('dcpomatic', 'dcpomatic2') i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic2', bld) |