[game-data-packager] 02/02: innoextract/include: define $provides shortcut, switch to lowercase
Alexandre Detiste
detiste-guest at moszumanska.debian.org
Sat May 16 10:30:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
detiste-guest pushed a commit to branch master
in repository game-data-packager.
commit 181d6be8e6529aaa0db193d0e5539ac7d77b1665
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date: Sat May 16 12:26:46 2015 +0200
innoextract/include: define $provides shortcut, switch to lowercase
I can't test it on GOG archives I don't have,
so the default remain 'extract' everything.
---
data/arx.yaml | 8 ++++----
data/descent1.yaml | 12 +-----------
data/kingsquest1.yaml | 2 +-
data/kingsquest2.yaml | 2 +-
data/kingsquest3.yaml | 2 +-
data/kingsquest4.yaml | 2 +-
data/kingsquest5.yaml | 2 +-
data/simon2.yaml | 8 +-------
data/spacequest1.yaml | 2 +-
data/spacequest2.yaml | 2 +-
data/spacequest3.yaml | 2 +-
data/spacequest4.yaml | 2 +-
data/spacequest5.yaml | 2 +-
data/zork.yaml | 11 ++++++-----
game_data_packager/__init__.py | 4 ++++
15 files changed, 26 insertions(+), 37 deletions(-)
diff --git a/data/arx.yaml b/data/arx.yaml
index 6b9dba0..dfd67ca 100644
--- a/data/arx.yaml
+++ b/data/arx.yaml
@@ -159,9 +159,9 @@ files:
- misc
- data.pak
- data2.pak
- - LOC.pak
- - SFX.pak
- - SPEECH.pak
+ - loc.pak
+ - sfx.pak
+ - speech.pak
- manual.pdf
- map.pdf
provides:
@@ -213,7 +213,7 @@ files:
- graph
- misc
- data2.pak
- - LOC.pak
+ - loc.pak
- manual.pdf
- map.pdf
provides:
diff --git a/data/descent1.yaml b/data/descent1.yaml
index 11747b0..2d4897b 100644
--- a/data/descent1.yaml
+++ b/data/descent1.yaml
@@ -137,17 +137,7 @@ files:
unpack:
format: innoextract
include:
- - DESCENT.HOG
- - DESCENT.PIG
- - CHAOS.HOG
- - CHAOS.MSN
- - DESCENT.DEM
- - LEVEL18.DEM
- - MINIBOSS.DEM
- - DESCENT.FAQ
- - Manual.pdf
- - readme.txt
- - RefCard.pdf
+ - $provides
provides:
- descent.hog
- descent.pig
diff --git a/data/kingsquest1.yaml b/data/kingsquest1.yaml
index 56510a0..7f5f23e 100644
--- a/data/kingsquest1.yaml
+++ b/data/kingsquest1.yaml
@@ -28,7 +28,7 @@ files:
setup_kings_quest_1_2_3.exe:
unpack:
format: innoextract
- include: ["Kings Quest 1"]
+ include: ["kings quest 1"]
provides:
- logdir
- object
diff --git a/data/kingsquest2.yaml b/data/kingsquest2.yaml
index 62b1346..de85ba7 100644
--- a/data/kingsquest2.yaml
+++ b/data/kingsquest2.yaml
@@ -27,7 +27,7 @@ files:
setup_kings_quest_1_2_3.exe:
unpack:
format: innoextract
- include: ["Kings Quest 2"]
+ include: ["kings quest 2"]
provides:
- logdir
- object
diff --git a/data/kingsquest3.yaml b/data/kingsquest3.yaml
index 5bfd2df..9c8f3fc 100644
--- a/data/kingsquest3.yaml
+++ b/data/kingsquest3.yaml
@@ -29,7 +29,7 @@ files:
setup_kings_quest_1_2_3.exe:
unpack:
format: innoextract
- include: ["Kings Quest 3"]
+ include: ["kings quest 3"]
provides:
- logdir
- object
diff --git a/data/kingsquest4.yaml b/data/kingsquest4.yaml
index 9753016..60cb730 100644
--- a/data/kingsquest4.yaml
+++ b/data/kingsquest4.yaml
@@ -25,7 +25,7 @@ files:
unpack:
format: innoextract
include:
- - "Kings Quest 4"
+ - "kings quest 4"
- manual.pdf
provides:
- resource.001
diff --git a/data/kingsquest5.yaml b/data/kingsquest5.yaml
index b5a6743..0556577 100644
--- a/data/kingsquest5.yaml
+++ b/data/kingsquest5.yaml
@@ -44,7 +44,7 @@ files:
unpack:
format: innoextract
include:
- - "Kings Quest 5"
+ - "kings quest 5"
provides:
- 0.scr
- 0.tex
diff --git a/data/simon2.yaml b/data/simon2.yaml
index 7434016..1206bdc 100644
--- a/data/simon2.yaml
+++ b/data/simon2.yaml
@@ -25,13 +25,7 @@ files:
unpack:
format: innoextract
include:
- - GSPTR30
- - ICON.DAT
- - SIMON2.GME
- - SIMON2.WAV
- - STRIPPED.TXT
- - TBLLIST
- - manual.pdf
+ - $provides
provides:
- gsptr30
- icon.dat
diff --git a/data/spacequest1.yaml b/data/spacequest1.yaml
index 9c732f5..d918440 100644
--- a/data/spacequest1.yaml
+++ b/data/spacequest1.yaml
@@ -29,7 +29,7 @@ files:
setup_space_quest_1_2_3.exe:
unpack:
format: innoextract
- include: ["Space Quest 1"]
+ include: ["space quest 1"]
provides:
- logdir
- object
diff --git a/data/spacequest2.yaml b/data/spacequest2.yaml
index 7a89162..81b7d3a 100644
--- a/data/spacequest2.yaml
+++ b/data/spacequest2.yaml
@@ -27,7 +27,7 @@ files:
setup_space_quest_1_2_3.exe:
unpack:
format: innoextract
- include: ["Space Quest 2"]
+ include: ["space quest 2"]
provides:
- logdir
- object
diff --git a/data/spacequest3.yaml b/data/spacequest3.yaml
index 176f565..950bd92 100644
--- a/data/spacequest3.yaml
+++ b/data/spacequest3.yaml
@@ -22,7 +22,7 @@ files:
setup_space_quest_1_2_3.exe:
unpack:
format: innoextract
- include: ["Space Quest 3"]
+ include: ["space quest 3"]
provides:
- resource.001
- resource.002
diff --git a/data/spacequest4.yaml b/data/spacequest4.yaml
index a4b912a..e121c59 100644
--- a/data/spacequest4.yaml
+++ b/data/spacequest4.yaml
@@ -55,7 +55,7 @@ files:
setup_space_quest.exe:
unpack:
format: innoextract
- include: ["Space Quest 4"]
+ include: ["space quest 4"]
provides:
- 335.hep
- 335.scr
diff --git a/data/spacequest5.yaml b/data/spacequest5.yaml
index b9942ff..94cbba4 100644
--- a/data/spacequest5.yaml
+++ b/data/spacequest5.yaml
@@ -98,7 +98,7 @@ files:
setup_space_quest.exe:
unpack:
format: innoextract
- include: ["Space Quest 5"]
+ include: ["space quest 5"]
provides:
- 0.fon
- 10.fon
diff --git a/data/zork.yaml b/data/zork.yaml
index 0e6abe9..e76dfd9 100644
--- a/data/zork.yaml
+++ b/data/zork.yaml
@@ -102,11 +102,12 @@ files:
unpack:
format: innoextract
include:
- - DATA/ZORK1.DAT
- - DATA/ZORK2.DAT
- - DATA/ZORK3.DAT
- - BEYONDZO.DAT
- - PLANETFA.DAT
+ # '$provides' would match save/zork#.dat too
+ - data/zork1.dat
+ - data/zork2.dat
+ - data/zork3.dat
+ - beyondzo.dat
+ - planetfa.dat
provides:
- zork1.dat_zip
- zork2.dat
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 619af8d..92c4cef 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -1579,12 +1579,16 @@ class GameData(object):
cmdline = ['innoextract', '--silent',
'--language', 'english',
'-T', 'local',
+ '--lowercase',
'-d', tmpdir,
os.path.abspath(found_name)]
version = subprocess.check_output(['innoextract', '-v', '-s'],
universal_newlines=True)
if version != '1.4':
include = provider.unpack.get('include', [])
+ if '$provides' in include:
+ include.remove('$provides')
+ include += provider.provides
for i in include:
cmdline.append('-I')
cmdline.append(i)
--
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