Просмотр исходного кода

clean old code, add validation cli function

mikymod 12 лет назад
Родитель
Сommit
658f5b39b3
1 измененных файлов с 25 добавлено и 11 удалено
  1. 25 11
      utils/crown-android.rb

+ 25 - 11
utils/crown-android.rb

@@ -13,28 +13,42 @@ $engine_src 		= "../engine/."
 $android_src		= "../engine/os/android/*.java"
 $android_src		= "../engine/os/android/*.java"
 $manifest			= "../engine/os/android/AndroidManifest.xml"
 $manifest			= "../engine/os/android/AndroidManifest.xml"
 
 
-$path 				= ""
-$engine_dest		= ""
-$android_dest		= ""
-
 $luajit				= "../engine/third/ARMv7/luajit"
 $luajit				= "../engine/third/ARMv7/luajit"
 
 
+#------------------------------------------------------------------------------
+def validate_command_line(args)
+
+	if args.length != 6
+		return false
+	end
+
+	if args[0] != "--target"
+		return false
+	end
+
+	if args[2] != "--name"
+		return false
+	end
+
+	if args[4] != "--path"
+		return false
+	end
+
+	return true
+end
+
 #------------------------------------------------------------------------------
 #------------------------------------------------------------------------------
 def parse_command_line(args)
 def parse_command_line(args)
+
 	banner = "Usage: crown-android.rb --target <android-target> --name <project-name> --path <project-path>\n"
 	banner = "Usage: crown-android.rb --target <android-target> --name <project-name> --path <project-path>\n"
-	if args.length != 6
+
+	if not validate_command_line(args)
 		print banner
 		print banner
 		exit
 		exit
 	end
 	end
 
 
 	options = OpenStruct.new
 	options = OpenStruct.new
 
 
-    options.library = []
-    options.inplace = false
-    options.encoding = "utf8"
-    options.transfer_type = :auto
-    options.verbose = false
-
 	OptionParser.new do |opts|
 	OptionParser.new do |opts|
 		opts.banner = banner
 		opts.banner = banner