[Scummvm-git-logs] scummvm master -> ad8129ffa370b98a6bfdbdcabd5b561f6c4890d8
sev-
sev at scummvm.org
Mon Aug 2 14:11:42 UTC 2021
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
21bcbb4254 SYMBIAN: Apply style fix from #3170
ad8129ffa3 SYMBIAN: Resolved installer conflict between test and release versions.
Commit: 21bcbb42544c115bb0f7f98d9f14a51f4a5564c4
https://github.com/scummvm/scummvm/commit/21bcbb42544c115bb0f7f98d9f14a51f4a5564c4
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2021-08-02T16:11:38+02:00
Commit Message:
SYMBIAN: Apply style fix from #3170
Changed paths:
backends/platform/symbian/symbian_builder/pkg_generator.py
diff --git a/backends/platform/symbian/symbian_builder/pkg_generator.py b/backends/platform/symbian/symbian_builder/pkg_generator.py
index b502188f93..6cdcf6f3ea 100644
--- a/backends/platform/symbian/symbian_builder/pkg_generator.py
+++ b/backends/platform/symbian/symbian_builder/pkg_generator.py
@@ -1,5 +1,5 @@
# ScummVM - Graphic Adventure Engine
-# Copyright (C) 2020 Stryzhniou Fiodar
+# Copyright (C) 2020-2021 Stryzhniou Fiodar
# ScummVM is the legal property of its developers, whose names
# are too numerous to list here. Please refer to the COPYRIGHT
@@ -24,13 +24,13 @@ from __future__ import with_statement
import os
from common_names import *
-# Template args = (Package Name = filename + platform, Component name, UID, major version, minor version, build number)
+# Template args = (Package Name = filename + platform, Component name, UID, major version, minor version, build number).
pkg_template = """
;
-; Warning: autogenerated file
+; Warning: autogenerated file.
;
-;Language - standard language definitions
+; Language - standard language definitions.
&EN
; List of localised vendor names - one per language. At least one must be provided (English [EN]).
@@ -39,26 +39,26 @@ pkg_template = """
; The non-localised, globally unique vendor name (mandatory)
:"ScummVM"
-; UID is the app's UID
+; UID is the app's UID.
#{"%s"},(%s),%s,%s,%s
-;Supports Series 60 v 3.0
+; Supports Series 60 v 3.0.
[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-;Supports Series 60 v 5.0
+; Supports Series 60 v 5.0.
[0x1028315F], 0, 0, 0, {"Series60ProductID"}
"""
# Template args = (UID from 1st package, major version, minor version, build number,
-# major version, minor version, build number, 1st package name)
+# major version, minor version, build number, 1st package name).
dependency = """
-;ScummVM1 dependency
+; ScummVM1 dependency.
(%s), %s,%s,%s ~ %s,%s,%s, {"%s"}
"""
pkg_licenses_install = """
-; Scummvm Documentation
+; Scummvm Documentation, licences.
"..\\..\\..\\..\\COPYRIGHT" - "!:\\data\\scummvm\\COPYRIGHT", FT, TC
"..\\..\\..\\..\\COPYING.BSD" - "!:\\data\\scummvm\\COPYING.BSD", FT, TC
"..\\..\\..\\..\\COPYING.ISC" - "!:\\data\\scummvm\\COPYING.ISC", FT, TC
@@ -76,7 +76,7 @@ pkg_licenses_install = """
pkg_licenses_show = """
-; Scummvm Documentation
+; Scummvm Documentation.
"..\\..\\..\\..\COPYRIGHT" - "", FT, TC
"..\\..\\..\\..\COPYING.BSD" - "", FT, TC
"..\\..\\..\\..\COPYING.ISC" - "", FT, TC
@@ -90,10 +90,10 @@ pkg_licenses_show = """
"""
# Template args = (extension, extension, extension, extension,
-# extension, extension, extension, extension )
-# where extension == (ordinal or (ordinal and "_test") )
+# extension, extension, extension, extension ).
+# Where extension == (ordinal or (ordinal and "_test") ).
install_data = """
-; Launcher, Application, AIF & Resource file
+; Launcher, Application, AIF & Resource file.
"$(EPOCROOT)epoc32\\release\\gcce\\urel\\ScummVM%s.exe" - "!:\\sys\\bin\\ScummVM%s.exe"
"$(EPOCROOT)epoc32\\data\\z\\resource\\apps\\ScummVM%s.rsc" - "!:\\resource\\apps\\ScummVM%s.rsc"
"$(EPOCROOT)epoc32\\data\\z\\resource\\apps\\ScummVM%s_loc.rsc"- "!:\\resource\\apps\\ScummVM%s_loc.rsc"
@@ -102,7 +102,7 @@ install_data = """
"""
install_eclipse_data = """
-; Launcher, Application, AIF & Resource file
+; Launcher, Application, AIF & Resource file.
"$(EPOCROOT)epoc32\\release\\$(PLATFORM)\\$(TARGET)\\ScummVM%s.exe" - "!:\\sys\\bin\\ScummVM%s.exe"
"$(EPOCROOT)epoc32\\data\\z\\resource\\apps\\ScummVM%s.rsc" - "!:\\resource\\apps\\ScummVM%s.rsc"
"$(EPOCROOT)epoc32\\data\\z\\resource\\apps\\ScummVM%s_loc.rsc"- "!:\\resource\\apps\\ScummVM%s_loc.rsc"
@@ -112,7 +112,7 @@ install_eclipse_data = """
clear_uninstall = """
-; Config/log files: 'empty' will automagically be removed on uninstall
+; Config/log files: 'empty' will automagically be removed on uninstall.
""- "c:\data\scummvm\scummvm.ini",FILENULL
""- "c:\data\scummvm\scummvm.stdout.txt",FILENULL
""- "c:\data\scummvm\scummvm.stderr.txt",FILENULL
Commit: ad8129ffa370b98a6bfdbdcabd5b561f6c4890d8
https://github.com/scummvm/scummvm/commit/ad8129ffa370b98a6bfdbdcabd5b561f6c4890d8
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2021-08-02T16:11:38+02:00
Commit Message:
SYMBIAN: Resolved installer conflict between test and release versions.
Changed paths:
backends/platform/symbian/symbian_builder/pkg_generator.py
diff --git a/backends/platform/symbian/symbian_builder/pkg_generator.py b/backends/platform/symbian/symbian_builder/pkg_generator.py
index 6cdcf6f3ea..aacce82f7f 100644
--- a/backends/platform/symbian/symbian_builder/pkg_generator.py
+++ b/backends/platform/symbian/symbian_builder/pkg_generator.py
@@ -59,16 +59,17 @@ dependency = """
pkg_licenses_install = """
; Scummvm Documentation, licences.
+"..\\THANKS" - "!:\\data\\scummvm\\THANKS", FT, TC
"..\\..\\..\\..\\COPYRIGHT" - "!:\\data\\scummvm\\COPYRIGHT", FT, TC
-"..\\..\\..\\..\\COPYING.BSD" - "!:\\data\\scummvm\\COPYING.BSD", FT, TC
-"..\\..\\..\\..\\COPYING.ISC" - "!:\\data\\scummvm\\COPYING.ISC", FT, TC
-"..\\..\\..\\..\\COPYING.LGPL" - "!:\\data\\scummvm\\COPYING.LGPL", FT, TC
-"..\\..\\..\\..\\COPYING.LUA" - "!:\\data\\scummvm\\COPYING.LUA", FT, TC
-"..\\..\\..\\..\\COPYING.MIT" - "!:\\data\\scummvm\\COPYING.MIT", FT, TC
-"..\\..\\..\\..\\COPYING.OFL" - "!:\\data\\scummvm\\COPYING.OFL", FT, TC
-"..\\..\\..\\..\\COPYING.TINYGL" - "!:\\data\\scummvm\\COPYING.TINYGL", FT, TC
-"..\\..\\..\\..\\COPYING" - "!:\\data\\scummvm\\COPYING", FT, TC
-"..\\..\\..\\..\\AUTHORS" - "!:\\data\\scummvm\\AUTHORS"
+"..\\..\\..\\..\\COPYING.BSD" - "!:\\data\\scummvm\\COPYING.BSD"
+"..\\..\\..\\..\\COPYING.ISC" - "!:\\data\\scummvm\\COPYING.ISC"
+"..\\..\\..\\..\\COPYING.LGPL" - "!:\\data\\scummvm\\COPYING.LGPL"
+"..\\..\\..\\..\\COPYING.LUA" - "!:\\data\\scummvm\\COPYING.LUA"
+"..\\..\\..\\..\\COPYING.MIT" - "!:\\data\\scummvm\\COPYING.MIT"
+"..\\..\\..\\..\\COPYING.OFL" - "!:\\data\\scummvm\\COPYING.OFL"
+"..\\..\\..\\..\\COPYING.TINYGL" - "!:\\data\\scummvm\\COPYING.TINYGL"
+"..\\..\\..\\..\\COPYING" - "!:\\data\\scummvm\\COPYING"
+"..\\..\\..\\..\\AUTHORS" - "!:\\data\\scummvm\\AUTHORS", FT, TC
"..\\..\\..\\..\\README.md" - "!:\\data\\scummvm\\README.md"
"..\\..\\..\\..\\NEWS.md" - "!:\\data\\scummvm\\NEWS.md"
"..\\README" - "!:\\data\\scummvm\\SYMBIAN_README", FT, TC
@@ -77,14 +78,8 @@ pkg_licenses_install = """
pkg_licenses_show = """
; Scummvm Documentation.
+"..\\THANKS" - "", FT, TC
"..\\..\\..\\..\COPYRIGHT" - "", FT, TC
-"..\\..\\..\\..\COPYING.BSD" - "", FT, TC
-"..\\..\\..\\..\COPYING.ISC" - "", FT, TC
-"..\\..\\..\\..\COPYING.LGPL" - "", FT, TC
-"..\\..\\..\\..\COPYING.LUA" - "", FT, TC
-"..\\..\\..\\..\COPYING.MIT" - "", FT, TC
-"..\\..\\..\\..\COPYING.OFL" - "", FT, TC
-"..\\..\\..\\..\COPYING.TINYGL" - "", FT, TC
"..\\..\\..\\..\COPYING" - "", FT, TC
"..\\README" - "", FT, TC
"""
@@ -198,8 +193,11 @@ def CreateFirstPkg(install_uid, build, path, target):
SafeWriteFile(pkg, pkg_template %(pack_name, install_uid, sis_major_version, sis_minor_version, sis_build_number) )
SafeWriteFile(pkg_cmdline, pkg_template %(pack_name, install_uid, sis_major_version, sis_minor_version, sis_build_number) )
- AppendToFile(pkg, pkg_licenses_install)
- AppendToFile(pkg_cmdline, pkg_licenses_install)
+ p_license = pkg_licenses_install
+ if build == 'full':
+ p_license = p_license.replace("scummvm", "scummvm\\beta")
+ AppendToFile(pkg, p_license)
+ AppendToFile(pkg_cmdline, p_license)
if build == 'release':
AppendToFile(pkg, mif_install)
AppendToFile(pkg_cmdline, ResolveEpocRoot(mif_install))
More information about the Scummvm-git-logs
mailing list