[game-data-packager] 01/02: Remove unnecessary abbreviation
Simon McVittie
smcv at debian.org
Mon Mar 20 07:07:05 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository game-data-packager.
commit 23ad9c0975bed727b4ea431b748d80c50bedc6b2
Author: Simon McVittie <smcv at debian.org>
Date: Sun Mar 19 13:14:03 2017 +0000
Remove unnecessary abbreviation
... and accidentally make it shorter in the process :-)
---
data/baldurs-gate-1.yaml | 2 +-
data/baldurs-gate-2.yaml | 2 +-
data/comi.yaml | 2 +-
data/doom3.yaml | 2 +-
data/enemy-territory.yaml | 2 +-
data/etqw.yaml | 2 +-
data/freespace2.yaml | 2 +-
data/fullthrottle.yaml | 2 +-
data/grimfandango.yaml | 2 +-
data/icewind-dale-1.yaml | 2 +-
data/icewind-dale-2.yaml | 2 +-
data/ja.yaml | 2 +-
data/jk2.yaml | 2 +-
data/morrowind.yaml | 2 +-
data/planescape-torment.yaml | 2 +-
data/quake3.yaml | 2 +-
data/quake4.yaml | 2 +-
data/rtcw.yaml | 2 +-
data/unreal.yaml | 2 +-
doc/adding_a_game.mdwn | 5 +++--
doc/tags.txt | 2 +-
game_data_packager/__init__.py | 4 ++--
game_data_packager/build.py | 8 ++++----
23 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/data/baldurs-gate-1.yaml b/data/baldurs-gate-1.yaml
index 8580bd5..dde72e5 100644
--- a/data/baldurs-gate-1.yaml
+++ b/data/baldurs-gate-1.yaml
@@ -4,7 +4,7 @@ longname: "Baldur's Gate - The Original Saga"
copyright: © 1998 Bioware
genre: Role Playing
engine: gemrb-baldurs-gate
-compress_pkg: [-Zgzip, -z1]
+compression: [-Zgzip, -z1]
missing_langs: [fr,de,pl,ru]
gog:
path:
diff --git a/data/baldurs-gate-2.yaml b/data/baldurs-gate-2.yaml
index 8fdabaa..392815e 100644
--- a/data/baldurs-gate-2.yaml
+++ b/data/baldurs-gate-2.yaml
@@ -4,7 +4,7 @@ longname: "Baldur's Gate 2"
copyright: © 2000 Bioware
genre: Role Playing
engine: gemrb-baldurs-gate-2
-compress_pkg: [-Zgzip, -z1]
+compression: [-Zgzip, -z1]
missing_langs: [fr,de,pl,ru]
gog:
path:
diff --git a/data/comi.yaml b/data/comi.yaml
index e2f1d5e..aace55d 100644
--- a/data/comi.yaml
+++ b/data/comi.yaml
@@ -4,7 +4,7 @@ franchise: Monkey Island
copyright: © 1997 Lucasfilm Games
# gzip -1 saves significant size; gzip -6 only saves an extra 10M and
# takes 1.5x time; xz is really slow
-compress_pkg: [-Zgzip, -z1]
+compression: [-Zgzip, -z1]
plugin: scummvm_common
wiki: The_Curse_of_Monkey_Island
disks: 2
diff --git a/data/doom3.yaml b/data/doom3.yaml
index 255c0ae..26a3703 100644
--- a/data/doom3.yaml
+++ b/data/doom3.yaml
@@ -1,5 +1,5 @@
---
-compress_pkg: false
+compression: false
longname: 'Doom 3 (original or BFG Edition)'
try_repack_from: [/usr/local/share/dhewm3]
engine: dhewm3-doom3
diff --git a/data/enemy-territory.yaml b/data/enemy-territory.yaml
index ef347be..cd5877b 100644
--- a/data/enemy-territory.yaml
+++ b/data/enemy-territory.yaml
@@ -6,7 +6,7 @@ engine: etlegacy
wikibase: http://wolfenstein.wikia.com/wiki/
wiki: "Wolfenstein:_Enemy_Territory"
genre: First-person shooter
-compress_pkg: false
+compression: false
help_text: |
Data from Wolfenstein Enemy Territory can be downloaded automatically.
You can skip the download by providing et260b.x86_full.zip.
diff --git a/data/etqw.yaml b/data/etqw.yaml
index 30b6a71..7b955ea 100644
--- a/data/etqw.yaml
+++ b/data/etqw.yaml
@@ -6,7 +6,7 @@ engine: etqw | etqw-server
genre: First-person shooter
wikibase: http://quake.wikia.com/wiki/
wiki: Enemy_Territory%3A_Quake_Wars
-compress_pkg: false
+compression: false
binary_executables: i386
try_repack_from:
- /usr/local/games/etqw
diff --git a/data/freespace2.yaml b/data/freespace2.yaml
index 695cb41..62fbae9 100644
--- a/data/freespace2.yaml
+++ b/data/freespace2.yaml
@@ -2,7 +2,7 @@
longname: Freespace 2
genre: Flight simulator
engine: freespace2
-compress_pkg: false
+compression: false
disks: 3
# FS2.bmp & mod.ini
diff --git a/data/fullthrottle.yaml b/data/fullthrottle.yaml
index e3c759d..7b39685 100644
--- a/data/fullthrottle.yaml
+++ b/data/fullthrottle.yaml
@@ -3,7 +3,7 @@ longname: Full Throttle
copyright: © 1995 Lucasfilm Games
# gzip -1 saves significant size; gzip -9 only saves an extra 12M and
# takes 3.5x time; xz is really slow
-compress_pkg: [-Zgzip, -z1]
+compression: [-Zgzip, -z1]
plugin: scummvm_common
wiki: Full_Throttle
gameid: ft
diff --git a/data/grimfandango.yaml b/data/grimfandango.yaml
index 620972f..d2c1bfb 100644
--- a/data/grimfandango.yaml
+++ b/data/grimfandango.yaml
@@ -10,7 +10,7 @@ disks: 2
# from 71MB to 51MB... but it takes 10 minutes to do it (on a Core i7),
# which is going to make people think game-data-packager has crashed.
# gzip compression is only fractionally smaller than uncompressed.
-compress_pkg: false
+compression: false
# for upgrade from versions where it was not multilingual
try_repack_from:
- /usr/share/games/grimfandango
diff --git a/data/icewind-dale-1.yaml b/data/icewind-dale-1.yaml
index 6d7003d..c46fc57 100644
--- a/data/icewind-dale-1.yaml
+++ b/data/icewind-dale-1.yaml
@@ -4,7 +4,7 @@ longname: "Icewind Dale - Complete"
copyright: © 2000 Interplay Entertainment Corp.
genre: Role Playing
engine: gemrb-icewind-dale
-compress_pkg: [-Zgzip, -z1]
+compression: [-Zgzip, -z1]
missing_langs: [de,pl,ru]
help_text: |
Data for Icewind Dale can be downloaded from gog.com automatically.
diff --git a/data/icewind-dale-2.yaml b/data/icewind-dale-2.yaml
index da1b4d4..52a0016 100644
--- a/data/icewind-dale-2.yaml
+++ b/data/icewind-dale-2.yaml
@@ -4,7 +4,7 @@ longname: "Icewind Dale 2"
copyright: © 2002 Interplay Entertainment Corp.
genre: Role Playing
engine: gemrb-icewind-dale-2
-compress_pkg: [-Zgzip, -z1]
+compression: [-Zgzip, -z1]
missing_langs: [de,fr,pl,ru]
help_text: |
Data for Icewind Dale 2 can be downloaded from gog.com automatically.
diff --git a/data/ja.yaml b/data/ja.yaml
index 8a4afc3..f318c91 100644
--- a/data/ja.yaml
+++ b/data/ja.yaml
@@ -6,7 +6,7 @@ copyright: © 2003 Activision, Inc. / LucasArts, a division of Lucasfilm Enterta
# things in it are the control files and copyright information,
# alongside ~ 1.2 GiB of compressed zip files. xz can save 20 MiB,
# but that's less than 2% of the total size and takes 10 times as long.
-compress_pkg: false
+compression: false
engine: openjk-academy | openjk-academy-server
genre: Action
disks: 2
diff --git a/data/jk2.yaml b/data/jk2.yaml
index eb73f0e..c3cbf87 100644
--- a/data/jk2.yaml
+++ b/data/jk2.yaml
@@ -6,7 +6,7 @@ engine: openjk-outcast
genre: Action
# Like Jedi Academy, there isn't much point in compressing this .deb.
-compress_pkg: false
+compression: false
steam:
id: 6030
diff --git a/data/morrowind.yaml b/data/morrowind.yaml
index 4b59526..85d6550 100644
--- a/data/morrowind.yaml
+++ b/data/morrowind.yaml
@@ -7,7 +7,7 @@ try_repack_from:
- ~/.local/share/openmw/data
# A lot of the content is compressed, but not all of it.
# TODO: benchmark time vs. size and find a good compromise
-compress_pkg: [-Zgzip, -z1]
+compression: [-Zgzip, -z1]
missing_langs: [de,es,it,pl,ru]
diff --git a/data/planescape-torment.yaml b/data/planescape-torment.yaml
index cce8074..bc25efb 100644
--- a/data/planescape-torment.yaml
+++ b/data/planescape-torment.yaml
@@ -3,7 +3,7 @@ longname: "Planescape Torment"
copyright: © 1999 Interplay Productions
genre: Role Playing
engine: gemrb-planescape-torment
-compress_pkg: [-Zgzip, -z1]
+compression: [-Zgzip, -z1]
missing_langs: [de,fr,pl]
help_text: |
Data for Planescape Torment can be downloaded from gog.com automatically.
diff --git a/data/quake3.yaml b/data/quake3.yaml
index 1105a14..c2b61b5 100644
--- a/data/quake3.yaml
+++ b/data/quake3.yaml
@@ -9,7 +9,7 @@ genre: First-person shooter
wikibase: http://quake.wikia.com/wiki/
wiki: Quake_III_Arena
-compress_pkg: false
+compression: false
try_repack_from:
# Older versions of g-d-p used this directory
- /usr/share/games/quake3
diff --git a/data/quake4.yaml b/data/quake4.yaml
index 5651fb6..4c1214e 100644
--- a/data/quake4.yaml
+++ b/data/quake4.yaml
@@ -9,7 +9,7 @@ steam:
genre: First-person shooter
wikibase: http://quake.wikia.com/wiki/
wiki: Quake_4
-compress_pkg: false
+compression: false
binary_executables: i386
packages:
diff --git a/data/rtcw.yaml b/data/rtcw.yaml
index 7ebacb1..c7c317a 100644
--- a/data/rtcw.yaml
+++ b/data/rtcw.yaml
@@ -11,7 +11,7 @@ wikibase: http://wolfenstein.wikia.com/wiki/
wiki: Return_to_Castle_Wolfenstein
# Like Jedi Academy, there isn't much point in compressing this .deb.
-compress_pkg: false
+compression: false
help_text: |
Install Return to Castle Wolfenstein from CD-ROM using Windows or Wine,
diff --git a/data/unreal.yaml b/data/unreal.yaml
index ca95e65..1a32132 100644
--- a/data/unreal.yaml
+++ b/data/unreal.yaml
@@ -12,7 +12,7 @@ wiki: Unreal
# -Zgzip -z6: 64s, 318M
# -Zgzip -z9: 183s, 317M
# default xz: 411s, 253M
-compress_pkg: [-Zgzip, -z4]
+compression: [-Zgzip, -z4]
binary_executables: i386
packages:
diff --git a/doc/adding_a_game.mdwn b/doc/adding_a_game.mdwn
index f4175df..db4a8c0 100644
--- a/doc/adding_a_game.mdwn
+++ b/doc/adding_a_game.mdwn
@@ -30,8 +30,9 @@ which should get you easily started.
This should match the title screen of the game, if any.
* `engine`: string: package name that contain the program needed to run the game.
* `genre`: the game genre
-* `compress_pkg`: boolean, default true: If false, the `.deb` or `.rpm`
- will never be compressed.
+* `compression`: boolean or list of strings, default true. If false, the
+ `.deb` or `.rpm` will never be compressed. If a list of strings,
+ they are dpkg-deb arguments to compress with non-default settings.
Use this if it contains non-compressible files (e.g. `*.pk3`
which are zip files) for which `xz` will waste a lot of time and
produce poor results.
diff --git a/doc/tags.txt b/doc/tags.txt
index 04af53c..416471e 100644
--- a/doc/tags.txt
+++ b/doc/tags.txt
@@ -2,7 +2,7 @@ longname: string
franchise: string
copyright: string
fanmade: bool
-compress_pkg: bool/list of strings (=argv)
+compression: bool/list of strings (=argv)
aliases: list
engine: string
plugin: string
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index f111f91..43e91ff 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -127,9 +127,9 @@ class GameData(object):
# False: -Znone
# str: -Zstr (gzip, xz or none)
# list: arbitrary options (e.g. -z9 -Zgz -Sfixed)
- self.compress_pkg = True
+ self.compression = True
- for k in ('longname', 'copyright', 'compress_pkg', 'help_text', 'disks', 'fanmade',
+ for k in ('longname', 'copyright', 'compression', 'help_text', 'disks', 'fanmade',
'engine', 'genre', 'missing_langs', 'franchise', 'wiki', 'wikibase',
'steam', 'gog', 'dotemu', 'origin', 'url_misc', 'wikipedia',
'binary_executables', 'copyright_notice'):
diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index bd9f8cd..1ccf35a 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -2030,12 +2030,12 @@ class PackagingTask(object):
# only compress if the caller says we should, the YAML
# says it's worthwhile, and this isn't a ripped CD
# (Vorbis is already compressed)
- compress_pkg = compress and not package.rip_cd
- if compress_pkg:
- compress_pkg = self.game.compress_pkg
+ compression = compress and not package.rip_cd
+ if compression:
+ compression = self.game.compression
pkg = self.packaging.build_package(per_package_dir, self.game,
- package, destination, compress=compress_pkg,
+ package, destination, compress=compression,
md5sums=self.package_md5sums.get(package.name),
component=self.package_components[package.name])
assert pkg is not None
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git
More information about the Pkg-games-commits
mailing list