[game-data-packager] 01/24: convert 'type:' to 'demo_for:' & 'expansion_for:'
Simon McVittie
smcv at debian.org
Sat Jan 17 23:28:49 UTC 2015
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 e9fba1f0e33396446116702a086b46084480b2db
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date: Sat Jan 17 18:07:37 2015 +0100
convert 'type:' to 'demo_for:' & 'expansion_for:'
A package is considered by default to be the full game.
---
data/doom.yaml | 1 -
data/doom2.yaml | 1 -
data/final-doom.yaml | 2 --
data/heretic.yaml | 3 +--
data/hexen.yaml | 5 ++---
data/hexen2.yaml | 5 ++---
data/ja.yaml | 4 +---
data/jk2.yaml | 2 --
data/quake.yaml | 7 +++----
data/quake2.yaml | 3 +--
data/quake3.yaml | 3 +--
data/rott.yaml | 4 +---
data/rtcw.yaml | 1 -
data/spear-of-destiny.yaml | 7 +++----
data/tyrian.yaml | 1 -
data/wolf3d.yaml | 3 +--
lib/game_data_packager/__init__.py | 11 ++++++++++-
17 files changed, 26 insertions(+), 37 deletions(-)
diff --git a/data/doom.yaml b/data/doom.yaml
index 6e750ad..2139afa 100644
--- a/data/doom.yaml
+++ b/data/doom.yaml
@@ -24,7 +24,6 @@ packages:
doom-wad:
install_to: usr/share/games/doom
longname: Doom
- type: full
install:
- doom.wad
diff --git a/data/doom2.yaml b/data/doom2.yaml
index b5dfcc3..c63bafb 100644
--- a/data/doom2.yaml
+++ b/data/doom2.yaml
@@ -17,7 +17,6 @@ help_text: |
packages:
doom2-wad:
install_to: usr/share/games/doom
- type: full
install:
- doom2.wad
diff --git a/data/final-doom.yaml b/data/final-doom.yaml
index 4dd648c..ef8c634 100644
--- a/data/final-doom.yaml
+++ b/data/final-doom.yaml
@@ -16,14 +16,12 @@ packages:
# these are IWADs so technically they behave like full games:
# you don't need Doom or Doom II to play them
longname: "Final Doom: TNT: Evilution"
- type: full
install:
- tnt.wad
install_to: usr/share/games/doom
plutonia-wad:
longname: "Final Doom: The Plutonia Experiment"
- type: full
install:
- plutonia.wad
install_to: usr/share/games/doom
diff --git a/data/heretic.yaml b/data/heretic.yaml
index 393608f..1f9e004 100644
--- a/data/heretic.yaml
+++ b/data/heretic.yaml
@@ -22,14 +22,13 @@ help_text: |
packages:
heretic-wad:
install_to: usr/share/games/doom
- type: full
install:
- heretic.wad
heretic-shareware-data:
longname: "Heretic (shareware)"
install_to: usr/share/games/doom
- type: demo
+ demo_for: heretic-wad
install:
- heretic1.wad
diff --git a/data/hexen.yaml b/data/hexen.yaml
index 2153308..a0720b4 100644
--- a/data/hexen.yaml
+++ b/data/hexen.yaml
@@ -26,14 +26,13 @@ doom_engine: hexen
packages:
hexen-wad:
install_to: usr/share/games/doom
- type: full
install:
- hexen.wad
hexen-deathkings-data:
longname: "Hexen: Deathkings of the Dark Citadel"
install_to: usr/share/games/doom
- type: expansion
+ expansion_for: hexen-wad
install:
- hexdd.wad
@@ -41,7 +40,7 @@ packages:
#hexen-demo-data:
# longname: "Hexen: Beyond Heretic (demo)"
# install_to: usr/share/games/doom
- # type: demo
+ # demo_for: hexen-wad
# install:
# - hexendemo.wad
diff --git a/data/hexen2.yaml b/data/hexen2.yaml
index 977d5c1..425d79b 100644
--- a/data/hexen2.yaml
+++ b/data/hexen2.yaml
@@ -20,7 +20,6 @@ packages:
steam:
id: 9060
path: "common/Hexen 2"
- type: full
install_to: usr/share/games/hexen2
install_files_from_cksums: |
2912412704 22704056 data1/pak0.pak
@@ -28,14 +27,14 @@ packages:
hexen2-portals-data:
longname: "Hexen II Mission Pack: Portal of Praevus"
- type: expansion
+ expansion_for: hexen2-data
install_to: usr/share/games/hexen2
install_files_from_cksums: |
1873146513 49089114 portals/pak3.pak
hexen2-hexenworld-data:
longname: "Hexen II: HexenWorld"
- type: expansion
+ expansion_for: hexen2-data
install_to: usr/share/games/hexen2
install_files_from_cksums: |
_ 10780245 hw/pak4.pak
diff --git a/data/ja.yaml b/data/ja.yaml
index fabcd68..6168704 100644
--- a/data/ja.yaml
+++ b/data/ja.yaml
@@ -31,8 +31,6 @@ help_text: |
packages:
jedi-academy-data:
- type: full
-
install_files_from_cksums: |
# Jedi Academy CD1 GameData/GameData or installation
3585517488 561806019 base/assets0.pk3
@@ -45,7 +43,7 @@ packages:
jedi-academy-bonus-data:
longname: "Bonus maps for Jedi Academy"
- type: expansion
+ expansion_for: jedi-academy-data
install_files_from_cksums: |
2890259980 14328834 base/bonus.pk3
4222768269 5948070 base/siege_destroyer.pk3
diff --git a/data/jk2.yaml b/data/jk2.yaml
index a090228..db92dc8 100644
--- a/data/jk2.yaml
+++ b/data/jk2.yaml
@@ -24,8 +24,6 @@ help_text: |
packages:
jedi-outcast-data:
- type: full
-
# cksums(1) is pretty useless as a checksumming tool, but it's a convenient
# way to get exact file sizes in bytes (second column), which are a nice
# heuristic for identifying files
diff --git a/data/quake.yaml b/data/quake.yaml
index 6ba1dc7..ff9e2cb 100644
--- a/data/quake.yaml
+++ b/data/quake.yaml
@@ -4,7 +4,7 @@ longname: Quake
packages:
quake-shareware:
- type: demo
+ demo_for: quake-registered
longname: Quake (shareware)
install:
- id1/pak0.pak_106
@@ -13,7 +13,6 @@ packages:
install_to: usr/share/games/quake
quake-registered:
- type: full
install:
- id1/pak0.pak_106
- id1/pak1.pak
@@ -25,7 +24,7 @@ packages:
install_to: usr/share/games/quake
quake-armagon:
- type: expansion
+ expansion_for: quake-armagon
longname: "Quake Mission Pack 1: Scourge of Armagon"
install:
- hipnotic/pak0.pak
@@ -35,7 +34,7 @@ packages:
install_to: usr/share/games/quake
quake-dissolution:
- type: expansion
+ expansion_for: quake-registered
longname: "Quake Mission Pack 2: Dissolution of Eternity"
install:
- rogue/pak0.pak
diff --git a/data/quake2.yaml b/data/quake2.yaml
index 154b2c2..c51a737 100644
--- a/data/quake2.yaml
+++ b/data/quake2.yaml
@@ -2,7 +2,6 @@
---
packages:
quake2-full-data:
- type: full
longname: Quake II
steam:
id: 2320
@@ -26,7 +25,7 @@ packages:
- baseq2/video/ntro.cin
quake2-demo-data:
- type: demo
+ demo_for: quake2-full-data
install_to: usr/share/games/quake2-demo
install_to_docdir:
- quake2_manual
diff --git a/data/quake3.yaml b/data/quake3.yaml
index 49b9703..90e75ff 100644
--- a/data/quake3.yaml
+++ b/data/quake3.yaml
@@ -32,7 +32,6 @@ packages:
longname: Quake III Arena
steam:
id: 2200
- type: full
# We deliberately only put baseq3 in the search path, not
# missionpack, so that the engine doesn't think missionpack
# is installed unless its pak0.pk3 is present.
@@ -76,7 +75,7 @@ packages:
longname: Quake III Team Arena
steam:
id: 2350
- type: expansion
+ expansion_for: quake3-data
symlinks:
usr/share/games/quake3/missionpack/pak0.pk3:
usr/share/games/quake3-team-arena-data/missionpack/pak0.pk3
diff --git a/data/rott.yaml b/data/rott.yaml
index 44aec1e..5d149a6 100644
--- a/data/rott.yaml
+++ b/data/rott.yaml
@@ -10,7 +10,6 @@ steam:
packages:
rott-data:
install_to: usr/share/games/rott
- type: full
longname: "Rise of the Triad: The HUNT begins"
# this shareware data are considered a as full game because
# it includes the HUNT Begin levels not present in the commercial game
@@ -27,7 +26,6 @@ packages:
- VENDOR.DOC
rott-registered-data:
- type: full
longname: "Rise of the Triad: Dark War"
install_to: usr/share/games/rott
install:
@@ -37,7 +35,7 @@ packages:
- LICENSE.TXT
rott-extreme-data:
- type: expansion
+ expansion_for: rott-registered-data
longname: "Extreme Rise of the Triad"
install_to: usr/share/games/rott
install_files_from_cksums: |
diff --git a/data/rtcw.yaml b/data/rtcw.yaml
index ea89789..c3c0dc0 100644
--- a/data/rtcw.yaml
+++ b/data/rtcw.yaml
@@ -8,7 +8,6 @@ compress_deb: false
packages:
rtcw-data:
- type: full
steam:
id: 9010
path: "common/Return to Castle Wolfenstein"
diff --git a/data/spear-of-destiny.yaml b/data/spear-of-destiny.yaml
index 97b08cd..26155b0 100644
--- a/data/spear-of-destiny.yaml
+++ b/data/spear-of-destiny.yaml
@@ -25,7 +25,7 @@ help_text: |
packages:
spear-of-destiny-demo-data:
longname: "Spear of Destiny (shareware)"
- type: demo
+ demo_for: spear-of-destiny-data
install_to: usr/share/games/wolf3d
install_files_from_cksums: |
1612205268 1072 audiohed.sdm
@@ -41,7 +41,6 @@ packages:
spear-of-destiny-data:
longname: "Spear of Destiny (registered version, mission 1)"
- type: full
install_to: usr/share/games/wolf3d
install_files_from_cksums: |
3311987448 1072 audiohed.sod
@@ -61,7 +60,7 @@ packages:
usr/share/games/wolf3d/vswap.sd1
spear-of-destiny-mission2-data:
- type: expansion
+ expansion_for: spear-of-destiny-data
longname: "Spear of Destiny - Mission 2: Return to Danger"
install_to: usr/share/games/wolf3d
install_files_from_cksums: |
@@ -70,7 +69,7 @@ packages:
2555517412 1879712 vswap.sd2
spear-of-destiny-mission3-data:
- type: expansion
+ expansion_for: spear-of-destiny-data
longname: "Spear of Destiny - Mission 3: Ultimate Challenge"
install_to: usr/share/games/wolf3d
install_files_from_cksums: |
diff --git a/data/tyrian.yaml b/data/tyrian.yaml
index b082980..5c8fca0 100644
--- a/data/tyrian.yaml
+++ b/data/tyrian.yaml
@@ -10,7 +10,6 @@ help_text: |
packages:
tyrian-data:
- type: full
# there are two identical files in the zip
symlinks:
usr/share/games/tyrian/netset.pcx: usr/share/games/tyrian/tyrset.pcx
diff --git a/data/wolf3d.yaml b/data/wolf3d.yaml
index 9f1e1ee..5aa07aa 100644
--- a/data/wolf3d.yaml
+++ b/data/wolf3d.yaml
@@ -4,7 +4,7 @@ longname: Wolfenstein 3D
packages:
wolf3d-demo-data:
- type: demo
+ demo_for: wolf3d-full-data
longname: Wolfenstein 3D (demo)
install_to: usr/share/games/wolf3d
install_files_from_cksums: |
@@ -20,7 +20,6 @@ packages:
- vendor.doc
wolf3d-full-data:
- type: full
longname: Wolfenstein 3D
steam:
id: 2270
diff --git a/lib/game_data_packager/__init__.py b/lib/game_data_packager/__init__.py
index a0c5875..e5366a9 100644
--- a/lib/game_data_packager/__init__.py
+++ b/lib/game_data_packager/__init__.py
@@ -309,6 +309,10 @@ class GameDataPackage(object):
# The name of the binary package
self.name = name
+ # Names of relative packages
+ self.demo_for = None
+ self.expansion_for = None
+
# The optional marketing name of this version
self.longname = None
@@ -646,11 +650,16 @@ class GameData(object):
}
def _populate_package(self, package, d):
- for k in ('type', 'longname', 'symlinks', 'install_to',
+ for k in ('demo_for', 'expansion_for', 'longname', 'symlinks', 'install_to',
'install_to_docdir', 'install_contents_of', 'steam'):
if k in d:
setattr(package, k, d[k])
+ if 'demo_for' in d:
+ setattr(package, 'type', 'demo')
+ if 'expansion_for' in d:
+ setattr(package, 'type', 'expansion')
+
if 'install' in d:
for filename in d['install']:
f = self._ensure_file(filename)
--
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