[Scummvm-cvs-logs] SF.net SVN: scummvm:[41373] scummvm/trunk/backends

[djwillis at users.sourceforge.net]

Revision: 41373
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41373&view=rev
Author:   djwillis
Date:     2009-06-08 14:47:38 +0000 (Mon, 08 Jun 2009)

Log Message:
-----------
Virtual Keyboard: Move vkeybd.zip into packs folder and rename default keyboard pack to vkeybd_default(.zip) with updates to default-events.cpp. Also update vkeybdpack.py to use zlib compression if Python zlib is found. Update GP2X and GP2XWiz bundle files to get new vkeybd_default.zip.

Modified Paths:
--------------
    scummvm/trunk/backends/events/default/default-events.cpp
    scummvm/trunk/backends/platform/gp2x/build/bundle.sh
    scummvm/trunk/backends/platform/gp2xwiz/build/bundle.sh
    scummvm/trunk/backends/vkeybd/packs/vkeybdpack.py

Added Paths:
-----------
    scummvm/trunk/backends/vkeybd/packs/vkeybd_default/
    scummvm/trunk/backends/vkeybd/packs/vkeybd_default.zip

Removed Paths:
-------------
    scummvm/trunk/backends/vkeybd/packs/vkeybd/
    scummvm/trunk/backends/vkeybd/vkeybd.zip

Modified: scummvm/trunk/backends/events/default/default-events.cpp
===================================================================
--- scummvm/trunk/backends/events/default/default-events.cpp	2009-06-08 14:21:43 UTC (rev 41372)
+++ scummvm/trunk/backends/events/default/default-events.cpp	2009-06-08 14:47:38 UTC (rev 41373)
@@ -278,7 +278,7 @@
 	if (ConfMan.hasKey("vkeybd_pack_name")) {
 		_vk->loadKeyboardPack(ConfMan.get("vkeybd_pack_name"));
 	} else {
-		_vk->loadKeyboardPack("vkeybd");
+		_vk->loadKeyboardPack("vkeybd_default");
 	}
 #endif
 }

Modified: scummvm/trunk/backends/platform/gp2x/build/bundle.sh
===================================================================
--- scummvm/trunk/backends/platform/gp2x/build/bundle.sh	2009-06-08 14:21:43 UTC (rev 41372)
+++ scummvm/trunk/backends/platform/gp2x/build/bundle.sh	2009-06-08 14:47:38 UTC (rev 41373)
@@ -12,6 +12,7 @@
 echo Collecting files.
 mkdir "scummvm-gp2x-`date '+%Y-%m-%d'`"
 mkdir "scummvm-gp2x-`date '+%Y-%m-%d'`/saves"
+mkdir "scummvm-gp2x-`date '+%Y-%m-%d'`/plugins"
 mkdir "scummvm-gp2x-`date '+%Y-%m-%d'`/engine-data"
 
 echo "Please put your save games in this dir" >> "scummvm-gp2x-`date '+%Y-%m-%d'`/saves/PUT_SAVES_IN_THIS_DIR"
@@ -28,9 +29,10 @@
 cp ../../../../COPYRIGHT ./scummvm-gp2x-`date '+%Y-%m-%d'`/
 cp ../../../../NEWS ./scummvm-gp2x-`date '+%Y-%m-%d'`/
 cp ../../../../gui/themes/scummmodern.zip ./scummvm-gp2x-`date '+%Y-%m-%d'`/
-cp ../../../../backends/vkeybd/vkeybd.zip ./scummvm-gp2x-`date '+%Y-%m-%d'`/
+cp ../../../../backends/vkeybd/packs/vkeybd_default.zip ./scummvm-gp2x-`date '+%Y-%m-%d'`/
 cp ../../../../dists/pred.dic ./scummvm-gp2x-`date '+%Y-%m-%d'`/
 cp ../../../../dists/engine-data/* ./scummvm-gp2x-`date '+%Y-%m-%d'`/engine-data
+cp ../../../../plugins/* ./scummvm-gp2x-`date '+%Y-%m-%d'`/plugins
 
 echo Making Stripped GPE.
 arm-open2x-linux-strip ./scummvm-gp2x-`date '+%Y-%m-%d'`/scummvm.gp2x

Modified: scummvm/trunk/backends/platform/gp2xwiz/build/bundle.sh
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/build/bundle.sh	2009-06-08 14:21:43 UTC (rev 41372)
+++ scummvm/trunk/backends/platform/gp2xwiz/build/bundle.sh	2009-06-08 14:47:38 UTC (rev 41373)
@@ -22,7 +22,7 @@
 cp ../../../../COPYRIGHT ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
 cp ../../../../NEWS ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
 cp ../../../../gui/themes/scummmodern.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../backends/vkeybd/vkeybd.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
+cp ../../../../backends/vkeybd/packs/vkeybd_default.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
 cp ../../../../dists/pred.dic ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
 cp ../../../../dists/engine-data/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/engine-data
 cp ../../../../plugins/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins

Copied: scummvm/trunk/backends/vkeybd/packs/vkeybd_default.zip (from rev 41366, scummvm/trunk/backends/vkeybd/vkeybd.zip)
===================================================================
(Binary files differ)

Modified: scummvm/trunk/backends/vkeybd/packs/vkeybdpack.py
===================================================================
--- scummvm/trunk/backends/vkeybd/packs/vkeybdpack.py	2009-06-08 14:21:43 UTC (rev 41372)
+++ scummvm/trunk/backends/vkeybd/packs/vkeybdpack.py	2009-06-08 14:47:38 UTC (rev 41373)
@@ -4,6 +4,11 @@
 import re
 import os
 import zipfile
+try:
+    import zlib
+    compression = zipfile.ZIP_DEFLATED
+except:
+    compression = zipfile.ZIP_STORED
 
 PACK_FILE_EXTENSIONS = ('.xml', '.bmp')
 
@@ -14,12 +19,14 @@
 	
 	zf = zipfile.ZipFile(packName + ".zip", 'w')
 	
+	zf.compress_type = zipfile.ZIP_DEFLATED
+
 	print ("Building '" + packName + "' pack:")
 	os.chdir(packName)
 
 	for filename in os.listdir('.'):
 		if os.path.isfile(filename) and not filename[0] == '.' and filename.endswith(PACK_FILE_EXTENSIONS):
-			zf.write(filename, './' + filename)
+			zf.write(filename, './' + filename, compress_type=compression)
 			print ("    Adding file: " + filename)
 			
 	os.chdir('../')
@@ -30,24 +37,7 @@
 	for f in os.listdir('.'):
 		if os.path.isdir(os.path.join('.', f)) and not f[0] == '.':
 			buildPack(f)
-			
-def parseSTX(pack_file, def_file):
-	comm = re.compile("<!--(.*?)-->", re.DOTALL)
-	head = re.compile("<\?(.*?)\?>")
 
-	output = ""
-	for line in pack_file:
-		output +=  line.rstrip("\r\n\t ").lstrip() + " \n"
-	
-	output = re.sub(comm, "", output)
-	output = re.sub(head, "", output)
-	output = output.replace("\t", " ").replace("  ", " ").replace("\"", "'")
-	output = output.replace(" = ", "=").replace(", ", ",")
-		
-	for line in output.splitlines():
-		if line and not line.isspace():
-			def_file.write("\"" + line + "\"\n")
-	
 def printUsage():
 	print ("===============================================")
 	print ("ScummVM Virtual Keyboard Pack Generation Script")

Deleted: scummvm/trunk/backends/vkeybd/vkeybd.zip
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.