--- a/build/buildutils/extractJavaLocFiles.py	Mon Oct 04 11:29:25 2010 +0300
+++ b/build/buildutils/extractJavaLocFiles.py	Fri Oct 15 12:29:39 2010 +0300
@@ -50,9 +50,15 @@
 
 def main():
     parser = OptionParser(
-        usage = "Usage: %prog [args] <input_dir> <output_dir>")
+        usage = "Usage: %prog [args] <input_dir> <output_dir> <loc-file.jar>")
+    parser.add_option(
+        "--files", dest = "files", default = ",".join(JAVA_LOC_FILES),
+        help = "list of Java loc files to read from input (default: %s)" % 
+        ",".join(JAVA_LOC_FILES))
     (opts, args) = parser.parse_args()
 
+    locFiles = opts.files.split(",")
+
     try:
         inputDir = args[0]
         outputDir = args[1]
@@ -67,7 +73,7 @@
                     outFilename = os.path.join(outputDir, file.lower())
                     (fileIndex, fileExt) = os.path.splitext(file)
                     print "Extracting %s" % inFilename
-                    extractJavaLocFiles(fileIndex, inFilename)
+                    extractJavaLocFiles(locFiles, fileIndex, inFilename)
                     print "Creating %s" % outFilename
                     os.system("jar cfM " + outFilename + " " + fileIndex)
                     print "Updating %s" % resourcesFilename
@@ -83,12 +89,13 @@
         traceback.print_exc()
         sys.exit(1)
 
-def extractJavaLocFiles(index, inFilename):
+def extractJavaLocFiles(locFiles, index, inFilename):
     javaLocFiles = ""
-    for javaLocFile in JAVA_LOC_FILES:
-        javaLocFilename = os.path.join(index, javaLocFile + "_" + index + ".loc")
+    for javaLocFile in locFiles:
+        javaLocFilename = index + "/" + javaLocFile + "_" + index + ".loc"
         javaLocFiles = javaLocFiles + " " + javaLocFilename
-    os.system("jar xf " + inFilename + javaLocFiles)
+    command = "jar xf " + inFilename + javaLocFiles
+    os.system(command)
 
 def updateResources(index, resourcesFilename):
     resourcesDir = os.path.join(index, RESOURCES_PATH)