X-Git-Url: https://git.donarmstrong.com/?p=kiibohd-kll.git;a=blobdiff_plain;f=kll.py;h=eab30981aa6d4abdeeb318dd80074f26bf669482;hp=cc33b578a872cbf1dc92ff36a2ecb46015dc40bf;hb=5af3e3a0b549e00eb84ac8bb038dc2b9a870f3aa;hpb=7d0094ed3affc1219a83caf5cc2422ea0923816f

diff --git a/kll.py b/kll.py
index cc33b57..eab3098 100755
--- a/kll.py
+++ b/kll.py
@@ -90,18 +90,14 @@ def processCommandLineArgs():
 		help="Specify .kll files to generate partial map, multiple files per flag.\n"
 		"Each -p defines another partial map.\n"
 		"Base .kll files (that define the scan code maps) must be defined for each partial map." )
-	pArgs.add_argument( '-t', '--template', type=str, default="templates/kiibohdKeymap.h",
+	pArgs.add_argument( '-t', '--templates', type=str, nargs='+',
+		default=["templates/kiibohdKeymap.h", "templates/kiibohdDefs.h"],
 		help="Specify template used to generate the keymap.\n"
-		"Default: templates/kiibohdKeymap.h" )
-	pArgs.add_argument( '--defines-template', type=str, default="templates/kiibohdDefs.h",
-		help="Specify template used to generate kll_defs.h.\n"
-		"Default: templates/kiibohdDefs.h" )
-	pArgs.add_argument( '-o', '--output', type=str, default="generatedKeymap.h",
+		"Default: templates/kiibohdKeymap.h templates/kiibohdDefs.h" )
+	pArgs.add_argument( '-o', '--outputs', type=str, nargs='+',
+		default=["generatedKeymap.h", "kll_defs.h"],
 		help="Specify output file. Writes to current working directory by default.\n"
-		"Default: generatedKeymap.h" )
-	pArgs.add_argument( '--defines-output', type=str, default="kll_defs.h",
-		help="Specify output path for kll_defs.h. Writes to current working directory by default.\n"
-		"Default: kll_defs.h" )
+		"Default: generatedKeymap.h kll_defs.h" )
 	pArgs.add_argument( '-h', '--help', action="help",
 		help="This message." )
 
@@ -128,7 +124,7 @@ def processCommandLineArgs():
 		for filename in partial:
 			checkFileExists( filename )
 
-	return (baseFiles, defaultFiles, partialFileSets, args.backend, args.template, args.defines_template, args.output, args.defines_output)
+	return (baseFiles, defaultFiles, partialFileSets, args.backend, args.templates, args.outputs)
 
 
 
@@ -588,7 +584,7 @@ def gitRevision( kllPath ):
 ### Main Entry Point ###
 
 if __name__ == '__main__':
-	(baseFiles, defaultFiles, partialFileSets, backend_name, template, defines_template, output, defines_output) = processCommandLineArgs()
+	(baseFiles, defaultFiles, partialFileSets, backend_name, templates, outputs) = processCommandLineArgs()
 
 	# Look up git information on the compiler
 	gitRev, gitChanges = gitRevision( os.path.dirname( os.path.realpath( __file__ ) ) )
@@ -596,7 +592,7 @@ if __name__ == '__main__':
 	# Load backend module
 	global backend
 	backend_import = importlib.import_module( "backends.{0}".format( backend_name ) )
-	backend = backend_import.Backend( template, defines_template )
+	backend = backend_import.Backend( templates )
 
 	# Process base layout files
 	for filename in baseFiles:
@@ -641,7 +637,7 @@ if __name__ == '__main__':
 	)
 
 	# Generate output file using template and backend
-	backend.generate( output, defines_output )
+	backend.generate( outputs )
 
 	# Successful Execution
 	sys.exit( 0 )