Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix to include optional info.txt info

Browse source
This commit is contained in:
Eric House 2020-07-07 11:54:45 -07:00
parent 45e7e716b9
commit 729fb5d6b7
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xwords4/dawg/Makefile.langcommon
View file

@ -16,9 +16,11 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
ifndef XWDICTPATH # This breaks generating byod files on otherwise-unconfigured
$(error XWDICTPATH is not set) # machines. Move it perhaps?
endif # ifndef XWDICTPATH
# $(error XWDICTPATH is not set)
# endif
ifneq ($(DIRTY_LIST),) ifneq ($(DIRTY_LIST),)
BOWDLERIZER = ../remove-dirty.py $(DIRTY_LIST) BOWDLERIZER = ../remove-dirty.py $(DIRTY_LIST)

4
xwords4/dawg/mkbyodbins.sh
View file

@ -2,6 +2,6 @@
for INFO in $(ls */info.txt); do for INFO in $(ls */info.txt); do
DIR=$(dirname $INFO) DIR=$(dirname $INFO)
echo "*** processing $(basename $DIRNAME) ***" echo "*** processing $(basename $DIR) ***"
(cd $DIR && make byodbins) (cd $DIR && make clean byodbins)
done done

6
xwords4/dawg/xloc.py
View file

@ -28,8 +28,8 @@ sPreComment = re.compile('^(.*)#.*$')
sVarAssign = re.compile('^(\w+):(.*)$') sVarAssign = re.compile('^(\w+):(.*)$')
sBeginTiles = re.compile('^<BEGIN_TILES>$') sBeginTiles = re.compile('^<BEGIN_TILES>$')
sEndTiles = re.compile('^<END_TILES>$') sEndTiles = re.compile('^<END_TILES>$')
sSingleCharMatch = re.compile('\'(.(\|.)+)\'') sSingleCharMatch = re.compile("'(.(\|.)*)'")
sSpecialsMatch = re.compile('{"(.+)"}') sSpecialsMatch = re.compile('{"(.+)"(,.+)?}')
def parseTileInfo(infoFile, encoding): def parseTileInfo(infoFile, encoding):
result = {'_TILES' : []} result = {'_TILES' : []}
@ -53,7 +53,7 @@ def parseTileInfo(infoFile, encoding):
if sEndTiles.match(line): if sEndTiles.match(line):
break break
else: else:
(count, val, face) = line.split(None, 3) (count, val, face) = line.split(None, 2)
result['_TILES'].append((count, val, face)) result['_TILES'].append((count, val, face))
elif sBeginTiles.match(line): elif sBeginTiles.match(line):
inTiles = True inTiles = True