Rename wingames.lst to gamedesc.txt, and add a couple of extra fields

to it giving each game's "internal" name (as seen in the source file,
.R etc) and also a brief description of the game. The idea of the
latter is that it should be usable as a comment field in .desktop
files and similar.

[originally from svn r9858]

diff --git a/Buildscr b/Buildscr
index 6925ce35dc9487c479622a6cda3dc3f725a2c72e..9552fb34bb85f7a241c0d3ace76aee786958b989 100644 (file)
--- a/Buildscr
+++ b/Buildscr
@@ -29,7 +29,7 @@ in puzzles do make clean
 in puzzles do make -f Makefile.doc clean
 in puzzles do make -f Makefile.doc chm
 in puzzles do make -f Makefile.doc # build help file for installer
-in puzzles do perl winiss.pl $(revision) wingames.lst > puzzles.iss
+in puzzles do perl winiss.pl $(revision) gamedesc.txt > puzzles.iss
 delegate windows
   # Ignore the poorly controlled return value from HHC, and instead
   # just test that the output file was generated.
@@ -66,7 +66,7 @@ in puzzles do chmod +x *.exe
 # approaches such as a third-party CAB generator), I don't think I
 # can sensibly enable this build.
 
-#in puzzles do perl wceinf.pl wingames.lst > puzzles.inf
+#in puzzles do perl wceinf.pl gamedesc.txt > puzzles.inf
 #delegate windows
 #  in puzzles do cmd /c 'wcearmv4 & nmake -f Makefile.wce clean'
 #  in puzzles do cmd /c 'wcearmv4 & nmake -f Makefile.wce VER=-DREVISION=$(revision)'
@@ -89,11 +89,11 @@ in puzzles/doc do halibut --html -Chtml-contents-filename:index.html -Chtml-inde
 in puzzles/devel do halibut --html -Chtml-contents-filename:index.html -Chtml-index-filename:indexpage.html -Chtml-template-filename:%k.html -Chtml-template-fragment:%k ../devel.but
 
 # Move the deliver-worthy Windows binaries (those specified in
-# wingames.lst, which is generated by mkfiles.pl and helpfully
+# gamedesc.txt, which is generated by mkfiles.pl and helpfully
 # excludes the command-line auxiliary utilities such as solosolver,
 # and nullgame.exe) into a subdirectory for easy access.
 in puzzles do mkdir winbin
-in puzzles do mv `cut -f1 -d: wingames.lst` winbin
+in puzzles do mv `cut -f2 -d: gamedesc.txt` winbin
 
 # Make a zip file of the Windows binaries and help files.
 in puzzles do zip -j puzzles.zip winbin/*.exe puzzles.chm puzzles.hlp puzzles.cnt

diff --git a/CHECKLST.txt b/CHECKLST.txt
index 8c6f03f4f1524777f307fdb0313e3543c798ba3e..55d190d9843db498d2ec42c91ba24059988d0e5f 100644 (file)
--- a/CHECKLST.txt
+++ b/CHECKLST.txt
@@ -17,8 +17,8 @@ Create a .R file for it which:
  - adds auxiliary solver binaries if any
  - adds it to $(GAMES) in the GTK makefile, for `make install'
  - adds it to list.c for the OS X binary
- - adds it to wingames.lst along with a textual name, for the build
-   system and Windows installer.
+ - adds it to gamedesc.txt, with its Windows executable name, display
+   name, and slightly longer description.
 
 If the puzzle is by a new author, modify the copyright notice in
 LICENCE and in puzzles.but. (Also in index.html, but that's listed

diff --git a/blackbox.R b/blackbox.R
index d9751addb65c9d2a76af227760ab34422a8f3001..65220be75d60434e273d77b294ce545c326f3e04 100644 (file)
--- a/blackbox.R
+++ b/blackbox.R
@@ -14,6 +14,6 @@ GAMES += blackbox
     A(blackbox) \
 !end
 
-!begin >wingames.lst
-blackbox.exe:Black Box
+!begin >gamedesc.txt
+blackbox:blackbox.exe:Black Box:Ball-finding puzzle
 !end

diff --git a/bridges.R b/bridges.R
index d1c4d3727d843a34ede9c7a619a79cc3e7a126e8..2f0fd6cc3569d350b66dab7d6c000d8e922e2bb9 100644 (file)
--- a/bridges.R
+++ b/bridges.R
@@ -16,6 +16,6 @@ GAMES += bridges
     A(bridges) \
 !end
 
-!begin >wingames.lst
-bridges.exe:Bridges
+!begin >gamedesc.txt
+bridges:bridges.exe:Bridges:Bridge-placing puzzle
 !end

diff --git a/cube.R b/cube.R
index 6cea5502fa22fce765233ef91e2005d155353659..8fa472c123e5454bce96283507c48343f6e50b79 100644 (file)
--- a/cube.R
+++ b/cube.R
@@ -14,6 +14,6 @@ GAMES += cube
     A(cube) \
 !end
 
-!begin >wingames.lst
-cube.exe:Cube
+!begin >gamedesc.txt
+cube:cube.exe:Cube:Rolling cube puzzle
 !end

diff --git a/dominosa.R b/dominosa.R
index 22826538e0f9a9398cab939bd722eb42f5611e2c..23936269cedc599b117262bc93f37ac046c3f99b 100644 (file)
--- a/dominosa.R
+++ b/dominosa.R
@@ -16,6 +16,6 @@ GAMES += dominosa
     A(dominosa) \
 !end
 
-!begin >wingames.lst
-dominosa.exe:Dominosa
+!begin >gamedesc.txt
+dominosa:dominosa.exe:Dominosa:Domino tiling puzzle
 !end

diff --git a/fifteen.R b/fifteen.R
index 6a6cded053b85f225d1563a7c3b15292fe3c7b99..9a3f72bfc9bdc3f3474072a7c9c1d02ffc8f5f1d 100644 (file)
--- a/fifteen.R
+++ b/fifteen.R
@@ -14,6 +14,6 @@ GAMES += fifteen
     A(fifteen) \
 !end
 
-!begin >wingames.lst
-fifteen.exe:Fifteen
+!begin >gamedesc.txt
+fifteen:fifteen.exe:Fifteen:Sliding block puzzle
 !end

diff --git a/filling.R b/filling.R
index 385c426f50589ba0c68fcc62bdd1bbc369564266..3769c006002da41ef5e5ee45d25790cf9a9a35ca 100644 (file)
--- a/filling.R
+++ b/filling.R
@@ -19,6 +19,6 @@ GAMES += filling
     A(filling) \
 !end
 
-!begin >wingames.lst
-filling.exe:Filling
+!begin >gamedesc.txt
+filling:filling.exe:Filling:Polyomino puzzle
 !end

diff --git a/flip.R b/flip.R
index 167e859926706362e26966df10f7f8b3e2743de6..997c7c214097c44687fe256404135dc4c38de637 100644 (file)
--- a/flip.R
+++ b/flip.R
@@ -16,6 +16,6 @@ GAMES += flip
     A(flip) \
 !end
 
-!begin >wingames.lst
-flip.exe:Flip
+!begin >gamedesc.txt
+flip:flip.exe:Flip:Tile inversion puzzle
 !end

diff --git a/galaxies.R b/galaxies.R
index bfa347a397d4a4b39f844753fc66678ea5f32fc1..91e814bd8ed9f9caf6cd70f97dcb91c1a65687d1 100644 (file)
--- a/galaxies.R
+++ b/galaxies.R
@@ -23,6 +23,6 @@ GAMES += galaxies
     A(galaxies) \
 !end
 
-!begin >wingames.lst
-galaxies.exe:Galaxies
+!begin >gamedesc.txt
+galaxies:galaxies.exe:Galaxies:Symmetric polyomino puzzle
 !end

diff --git a/guess.R b/guess.R
index f35b4d49eaa67bbb9f6229e9c05081422794326c..b5896459ac7f54d4520cccf72f2ae97b5eb6a574 100644 (file)
--- a/guess.R
+++ b/guess.R
@@ -14,6 +14,6 @@ GAMES += guess
     A(guess) \
 !end
 
-!begin >wingames.lst
-guess.exe:Guess
+!begin >gamedesc.txt
+guess:guess.exe:Guess:Combination-guessing puzzle
 !end

diff --git a/inertia.R b/inertia.R
index 84829bd24cf731d7b8d895b326408aae1d6795ab..24b4d16e700564aa662054c8cced9c7f9fdf0a63 100644 (file)
--- a/inertia.R
+++ b/inertia.R
@@ -14,6 +14,6 @@ GAMES += inertia
     A(inertia) \
 !end
 
-!begin >wingames.lst
-inertia.exe:Inertia
+!begin >gamedesc.txt
+inertia:inertia.exe:Inertia:Gem-collecting puzzle
 !end

diff --git a/keen.R b/keen.R
index e93df34c4ebdb7b4bf17004d0dd32804664c4bf7..06e7aa0fbcf91e2740c9e1ad09770f3784acd66f 100644 (file)
--- a/keen.R
+++ b/keen.R
@@ -20,6 +20,6 @@ GAMES += keen
     A(keen) \
 !end
 
-!begin >wingames.lst
-keen.exe:Keen
+!begin >gamedesc.txt
+keen:keen.exe:Keen:Arithmetic Latin square puzzle
 !end

diff --git a/lightup.R b/lightup.R
index 87246af91a9589a18fc1f1a786ea1ba8a504499a..82b6bdc991ee7bfbd365ac7ca74d438ab9ffda31 100644 (file)
--- a/lightup.R
+++ b/lightup.R
@@ -19,6 +19,6 @@ GAMES += lightup
     A(lightup) \
 !end
 
-!begin >wingames.lst
-lightup.exe:Light Up
+!begin >gamedesc.txt
+lightup:lightup.exe:Light Up:Light-bulb placing puzzle
 !end

diff --git a/loopy.R b/loopy.R
index 5bad5d2aa4aecba25bb591fd080383bbd6fdeea6..7f68b371cfb08f13ad01e266794a6ef7eeac2add 100644 (file)
--- a/loopy.R
+++ b/loopy.R
@@ -26,6 +26,6 @@ GAMES += loopy
     A(loopy) \
 !end
 
-!begin >wingames.lst
-loopy.exe:Loopy
+!begin >gamedesc.txt
+loopy:loopy.exe:Loopy:Loop-drawing puzzle
 !end

diff --git a/magnets.R b/magnets.R
index a3ba7d18ca22e4e1abf3693a61fd3e1672ca5b95..997371fd4d95ed924f0fa1826c84cb7c7622dfea 100644 (file)
--- a/magnets.R
+++ b/magnets.R
@@ -19,6 +19,6 @@ GAMES += magnets
     A(magnets) \
 !end
 
-!begin >wingames.lst
-magnets.exe:Magnets
+!begin >gamedesc.txt
+magnets:magnets.exe:Magnets:Magnet-placing puzzle
 !end

diff --git a/map.R b/map.R
index a26e8b8cf7a743b41e2a29c60f2fee8c1a6c452f..f5950b4637da490c4353a500c8997e447f6232d8 100644 (file)
--- a/map.R
+++ b/map.R
@@ -19,6 +19,6 @@ GAMES += map
     A(map) \
 !end
 
-!begin >wingames.lst
-map.exe:Map
+!begin >gamedesc.txt
+map:map.exe:Map:Map-colouring puzzle
 !end

diff --git a/mines.R b/mines.R
index 4550e186c031d5e1ae433dff65c4bef68e001da3..0212a48e39a2b64a3c03e3bf680bdeaecff90b4f 100644 (file)
--- a/mines.R
+++ b/mines.R
@@ -19,6 +19,6 @@ GAMES += mines
     A(mines) \
 !end
 
-!begin >wingames.lst
-mines.exe:Mines
+!begin >gamedesc.txt
+mines:mines.exe:Mines:Mine-finding puzzle
 !end

diff --git a/net.R b/net.R
index b880c7c6ff6a3411d16a25aa7a5b252e5fe4a2b9..b5442781c972dc049f427184f6342c41e597a314 100644 (file)
--- a/net.R
+++ b/net.R
@@ -18,6 +18,6 @@ GAMES += net
     A(net) \
 !end
 
-!begin >wingames.lst
-netgame.exe:Net
+!begin >gamedesc.txt
+net:netgame.exe:Net:Network jigsaw puzzle
 !end

diff --git a/netslide.R b/netslide.R
index 29d538c55ad59df59f9fc848bb7a300cda9d70d0..4a35e77850b1226e04992d8c4052149dc9d6fc9c 100644 (file)
--- a/netslide.R
+++ b/netslide.R
@@ -16,6 +16,6 @@ GAMES += netslide
     A(netslide) \
 !end
 
-!begin >wingames.lst
-netslide.exe:Netslide
+!begin >gamedesc.txt
+netslide:netslide.exe:Netslide:Toroidal sliding network puzzle
 !end

diff --git a/pattern.R b/pattern.R
index 1e9bc18e58306bc8e05745ef5684d310a4436714..fe83bae9f0d34edc2f040e71518568f686f774b9 100644 (file)
--- a/pattern.R
+++ b/pattern.R
@@ -17,6 +17,6 @@ GAMES += pattern
     A(pattern) \
 !end
 
-!begin >wingames.lst
-pattern.exe:Pattern
+!begin >gamedesc.txt
+pattern:pattern.exe:Pattern:Pattern puzzle
 !end

diff --git a/pearl.R b/pearl.R
index 82cf465d18197fb0280654d0041f533ec1cb9305..3d24b3d3b4e14975246021e2f4dac024145b2dd8 100644 (file)
--- a/pearl.R
+++ b/pearl.R
@@ -18,6 +18,6 @@ GAMES += pearl
     A(pearl) \
 !end
 
-!begin >wingames.lst
-pearl.exe:Pearl
+!begin >gamedesc.txt
+pearl:pearl.exe:Pearl:Loop-drawing puzzle
 !end

diff --git a/pegs.R b/pegs.R
index 5468713448298af1c8944f3892e43bbb559ff610..d461bca28e216b2ea85087796a607ac92530a055 100644 (file)
--- a/pegs.R
+++ b/pegs.R
@@ -16,6 +16,6 @@ GAMES += pegs
     A(pegs) \
 !end
 
-!begin >wingames.lst
-pegs.exe:Pegs
+!begin >gamedesc.txt
+pegs:pegs.exe:Pegs:Peg solitaire puzzle
 !end

diff --git a/range.R b/range.R
index 257b270629176d78b5c6cd2635839dd7b1466f3c..79303d985444ff181df68a6706ddf8adface93ea 100644 (file)
--- a/range.R
+++ b/range.R
@@ -14,6 +14,6 @@ GAMES += range
     A(range) \
 !end
 
-!begin >wingames.lst
-range.exe:Range
+!begin >gamedesc.txt
+range:range.exe:Range:Visible-distance puzzle
 !end

diff --git a/rect.R b/rect.R
index 010ffba3717e8b3a946626b3887ba558313988d0..f599ec8817bd9f10f5f8a344ea57135240afd638 100644 (file)
--- a/rect.R
+++ b/rect.R
@@ -14,6 +14,6 @@ GAMES += rect
     A(rect) \
 !end
 
-!begin >wingames.lst
-rect.exe:Rectangles
+!begin >gamedesc.txt
+rect:rect.exe:Rectangles:Rectangles puzzle
 !end

diff --git a/samegame.R b/samegame.R
index 8e6eb1181b6d74e7b0e3e3677d7bbbc741b7651f..6d016688f118009179bec2a7821de35718604ec4 100644 (file)
--- a/samegame.R
+++ b/samegame.R
@@ -14,6 +14,6 @@ GAMES += samegame
     A(samegame) \
 !end
 
-!begin >wingames.lst
-samegame.exe:Same Game
+!begin >gamedesc.txt
+samegame:samegame.exe:Same Game:Block-clearing puzzle
 !end

diff --git a/signpost.R b/signpost.R
index 6305fde18755cd1c827adb33a664abc54d3204cf..58789da6dfc3cfec652b31eeae47d63d55943493 100644 (file)
--- a/signpost.R
+++ b/signpost.R
@@ -18,6 +18,6 @@ GAMES += signpost
     A(signpost) \
 !end
 
-!begin >wingames.lst
-signpost.exe:Signpost
+!begin >gamedesc.txt
+signpost:signpost.exe:Signpost:Square-connecting puzzle
 !end

diff --git a/singles.R b/singles.R
index 3275455ba961b259299b65809b8ee7acf25aec98..5220eeb0a8df4e462870d5d06fc37200a002dd05 100644 (file)
--- a/singles.R
+++ b/singles.R
@@ -18,6 +18,6 @@ GAMES += singles
     A(singles) \
 !end
 
-!begin >wingames.lst
-singles.exe:Singles
+!begin >gamedesc.txt
+singles:singles.exe:Singles:Number-removing puzzle
 !end

diff --git a/sixteen.R b/sixteen.R
index b9a26af8b9706881fd0016432b201dcdac313be3..1d16aa82aaec3c2cda954bd94b9348bf2cb8345e 100644 (file)
--- a/sixteen.R
+++ b/sixteen.R
@@ -14,6 +14,6 @@ GAMES += sixteen
     A(sixteen) \
 !end
 
-!begin >wingames.lst
-sixteen.exe:Sixteen
+!begin >gamedesc.txt
+sixteen:sixteen.exe:Sixteen:Toroidal sliding block puzzle
 !end

diff --git a/slant.R b/slant.R
index 8a72070f1af18e026a26774f58528d107ba99a46..6086025c70ae481df4642735f132f234874b78d4 100644 (file)
--- a/slant.R
+++ b/slant.R
@@ -19,6 +19,6 @@ GAMES += slant
     A(slant) \
 !end
 
-!begin >wingames.lst
-slant.exe:Slant
+!begin >gamedesc.txt
+slant:slant.exe:Slant:Maze-drawing puzzle
 !end

diff --git a/solo.R b/solo.R
index 09d1f7cb9bc3d0aa7991a79abcc473843883e6fc..af0a1c38770fcf221dc51d5c98dc6abd43f8c4d6 100644 (file)
--- a/solo.R
+++ b/solo.R
@@ -19,6 +19,6 @@ GAMES += solo
     A(solo) \
 !end
 
-!begin >wingames.lst
-solo.exe:Solo
+!begin >gamedesc.txt
+solo:solo.exe:Solo:Number placement puzzle
 !end

diff --git a/tents.R b/tents.R
index 3e5138aa54bf91bcbe067e9bcf5c28b783fca691..a0a64a54fd74aecb8989a73a5efe2599de897633 100644 (file)
--- a/tents.R
+++ b/tents.R
@@ -19,6 +19,6 @@ GAMES += tents
     A(tents) \
 !end
 
-!begin >wingames.lst
-tents.exe:Tents
+!begin >gamedesc.txt
+tents:tents.exe:Tents:Tent-placing puzzle
 !end

diff --git a/towers.R b/towers.R
index 49632d0f5fd4e67c1eb74bf22249d6aa2e8c57bf..eb774013fb57f9cef9b7a8734fb2033a85e73347 100644 (file)
--- a/towers.R
+++ b/towers.R
@@ -20,6 +20,6 @@ GAMES += towers
     A(towers) \
 !end
 
-!begin >wingames.lst
-towers.exe:Towers
+!begin >gamedesc.txt
+towers:towers.exe:Towers:Tower-placing Latin square puzzle
 !end

diff --git a/twiddle.R b/twiddle.R
index eeee7cb3ddb50fd0f15e8fe06cfa1895f5a6c329..c9337d60d2c4eec657dfc648eee602c611a9da08 100644 (file)
--- a/twiddle.R
+++ b/twiddle.R
@@ -14,6 +14,6 @@ GAMES += twiddle
     A(twiddle) \
 !end
 
-!begin >wingames.lst
-twiddle.exe:Twiddle
+!begin >gamedesc.txt
+twiddle:twiddle.exe:Twiddle:Rotational sliding block puzzle
 !end

diff --git a/undead.R b/undead.R
index 2492d5e6d6b0c8bbedcf6043de14070a576c58dd..792678ee03ca338865b51ca69edd3eb3cc8201f6 100644 (file)
--- a/undead.R
+++ b/undead.R
@@ -13,6 +13,6 @@ GAMES += undead
     A(undead) \
 !end
 
-!begin >wingames.lst
-undead.exe:Undead
+!begin >gamedesc.txt
+undead:undead.exe:Undead:Monster-placing puzzle
 !end

diff --git a/unequal.R b/unequal.R
index ef6fe53c05b804ff9c97828ffd49c62a64e65c1a..8f755d11b95af012d83c38546fb7210a36defdbf 100644 (file)
--- a/unequal.R
+++ b/unequal.R
@@ -22,6 +22,6 @@ GAMES += unequal
     A(unequal) \
 !end
 
-!begin >wingames.lst
-unequal.exe:Unequal
+!begin >gamedesc.txt
+unequal:unequal.exe:Unequal:Latin square puzzle
 !end

diff --git a/unfinished/group.R b/unfinished/group.R
index 16cb41bffa12747f0c781ac6e2eea71e80a959b8..c12caca4e6f3b040bcdc00c659e6e3e4fe616a22 100644 (file)
--- a/unfinished/group.R
+++ b/unfinished/group.R
@@ -20,6 +20,6 @@ GAMES += group
     A(group) \
 !end
 
-!begin >wingames.lst
-group.exe:Group
+!begin >gamedesc.txt
+unfinished/group:group.exe:Group:Group theory puzzle
 !end

diff --git a/unfinished/separate.R b/unfinished/separate.R
index 31e253ebf9a69d11abdb55f5f9f1369db4c0475a..6e908707d8c87c59f1e107a89f33b32fd1d4961d 100644 (file)
--- a/unfinished/separate.R
+++ b/unfinished/separate.R
@@ -16,6 +16,6 @@ GAMES += separate
     A(separate) \
 !end
 
-!begin >wingames.lst
-separate.exe:Separate
+!begin >gamedesc.txt
+unfinished/separate:separate.exe:Separate:Rectangle-dividing puzzle
 !end

diff --git a/unfinished/slide.R b/unfinished/slide.R
index 9ff70a72b42a7bf107dec90ac62c413435064082..3438476c60845046662c4f264ee31d7f761012f0 100644 (file)
--- a/unfinished/slide.R
+++ b/unfinished/slide.R
@@ -19,6 +19,6 @@ GAMES += slide
     A(slide) \
 !end
 
-!begin >wingames.lst
-slide.exe:Slide
+!begin >gamedesc.txt
+unfinished/slide:slide.exe:Slide:Sliding block puzzle
 !end

diff --git a/unfinished/sokoban.R b/unfinished/sokoban.R
index e03edd9df0287be408153d79fb21d178cf2a4288..77b1e122ba4fda6840323b9d0c969c29362000de 100644 (file)
--- a/unfinished/sokoban.R
+++ b/unfinished/sokoban.R
@@ -14,6 +14,6 @@ GAMES += sokoban
     A(sokoban) \
 !end
 
-!begin >wingames.lst
-sokoban.exe:Sokoban
+!begin >gamedesc.txt
+unfinished/sokoban:sokoban.exe:Sokoban:Barrel-pushing puzzle
 !end

diff --git a/unruly.R b/unruly.R
index b69a144867fff1988d1e9b7fa1d766c04c43d731..da02c34a2a0c180e0729708a0e9f74e1811de7f3 100644 (file)
--- a/unruly.R
+++ b/unruly.R
@@ -16,6 +16,6 @@ GAMES += unruly
     A(unruly) \
 !end
 
-!begin >wingames.lst
-unruly.exe:Unruly
+!begin >gamedesc.txt
+unruly:unruly.exe:Unruly:Black and white grid puzzle
 !end

diff --git a/untangle.R b/untangle.R
index 83ab0d83f23afeff88dda649feb718f471ed3ce6..868eb9300aaabedd1acbf1781d93a7a5c14b2916 100644 (file)
--- a/untangle.R
+++ b/untangle.R
@@ -16,6 +16,6 @@ GAMES += untangle
     A(untangle) \
 !end
 
-!begin >wingames.lst
-untangle.exe:Untangle
+!begin >gamedesc.txt
+untangle:untangle.exe:Untangle:Planar graph layout puzzle
 !end

diff --git a/wceinf.pl b/wceinf.pl
index 8bfc11774bdd6525e54ad0a674f62208c87f07d1..4756f3c2b8dd61f7b75fa87d94f6bcd53cd58d11 100644 (file)
--- a/wceinf.pl
+++ b/wceinf.pl
@@ -2,22 +2,22 @@
 
 # Perl script to generate a .INF file for building a Pocket PC .CAB
 # archive of Puzzles. This has to be scripted so that it can read
-# wingames.lst and automatically adjust to the current available
+# gamedesc.txt and automatically adjust to the current available
 # set of puzzles.
 
 # Usage:
 #
-#   $ ./wceinf.pl wingames.lst > puzzles.inf
+#   $ ./wceinf.pl gamedesc.txt > puzzles.inf
 
-$lst = shift @ARGV;
-open LST, "<", $lst;
-while (<LST>) {
+$desc = shift @ARGV;
+open DESC, "<", $desc;
+while (<DESC>) {
     chomp;
-    split /:/;
-    push @exes, $_[0];
-    $names{$_[0]} = $_[1];
+    @_ = split /:/;
+    push @exes, $_[1];
+    $names{$_[1]} = $_[2];
 }
-close LST;
+close DESC;
 
 print '[Version]'."\n";
 print 'Signature   = "$Windows NT$"    ; required as-is'."\n";

diff --git a/winiss.pl b/winiss.pl
index 7416ace0a2c91224e374098433da92641201a8be..9e796e04322e6c755030e063a20f0d9459737171 100755 (executable)
--- a/winiss.pl
+++ b/winiss.pl
@@ -1,12 +1,12 @@
 #!/usr/bin/perl
 
 # Perl script to generate an Inno Setup installer script for
-# Puzzles. This has to be scripted so that it can read wingames.lst
+# Puzzles. This has to be scripted so that it can read gamedesc.txt
 # and automatically adjust to the current available set of puzzles.
 
 # Usage:
 #
-#   $ ./winiss.pl 1234 wingames.lst > puzzles.iss
+#   $ ./winiss.pl 1234 gamedesc.txt > puzzles.iss
 #
 # where `1234' is the revision number which will be encoded in the
 # installer's version indicators.
@@ -15,15 +15,15 @@ use warnings;
 
 $rev = shift @ARGV;
 ($revclean=$rev) =~ s/M$//;
-$lst = shift @ARGV;
-open LST, "<", $lst;
-while (<LST>) {
+$desc = shift @ARGV;
+open DESC, "<", $desc;
+while (<DESC>) {
     chomp;
     @_ = split /:/;
-    push @exes, $_[0];
-    $names{$_[0]} = $_[1];
+    push @exes, $_[1];
+    $names{$_[1]} = $_[2];
 }
-close LST;
+close DESC;
 
 print '; -*- no -*-'."\n";
 print ';'."\n";