瀏覽代碼

temporary disabled C# & Java targets for 2.09 update

Nicolas Cannasse 13 年之前
父節點
當前提交
a0b21a6112
共有 2 個文件被更改,包括 6 次插入20 次删除
  1. 1 1
      doc/ImportAll.hx
  2. 5 19
      main.ml

+ 1 - 1
doc/ImportAll.hx

@@ -48,7 +48,7 @@ class ImportAll {
 			return;
 		case "sys":
 			if( !Context.defined("neko") && !Context.defined("php") && !Context.defined("cpp") ) return;
-		case "tools":
+		case "tools", "jvm", "cs":
 			return;
 		}
 		for( p in Context.getClassPath() ) {

+ 5 - 19
main.ml

@@ -623,7 +623,7 @@ and do_connect host port args =
 
 and init ctx =
 	let usage = Printf.sprintf
-		"haXe Compiler %d.%.2d - (c)2005-2012 Motion-Twin\n Usage : haxe%s -main <class> [-swf|-js|-neko|-php|-cpp|-cs|-java|-as3] <output> [options]\n Options :"
+		"haXe Compiler %d.%.2d - (c)2005-2012 Motion-Twin\n Usage : haxe%s -main <class> [-swf|-js|-neko|-php|-cpp|-as3] <output> [options]\n Options :"
 		(version / 100) (version mod 100) (if Sys.os_type = "Win32" then ".exe" else "")
 	in
 	let com = ctx.com in
@@ -695,12 +695,6 @@ try
 		("-cpp",Arg.String (fun dir ->
 			set_platform Cpp dir;
 		),"<directory> : generate C++ code into target directory");
-		("-cs",Arg.String (fun dir ->
-			set_platform Cs dir;
-		),"<directory> : generate C# code into target directory");
-		("-java",Arg.String (fun dir ->
-			set_platform Java dir;
-		),"<directory> : generate Java code into target directory");
 		("-xml",Arg.String (fun file ->
 			Parser.use_doc := true;
 			xml_out := Some file
@@ -926,12 +920,8 @@ try
 		| Cpp ->
 			add_std "cpp";
 			"cpp"
-		| Cs -> 
-			Gencs.before_generate com;
-			add_std "cs"; "cs"
-		| Java -> 
-			Genjava.before_generate com;
-			add_std "jvm"; "jvm"
+		| Cs | Java -> 
+			assert false
 	) in
 	(* if we are at the last compilation step, allow all packages accesses - in case of macros or opening another project file *)
 	if com.display && not ctx.has_next then com.package_rules <- PMap.foldi (fun p r acc -> match r with Forbidden -> acc | _ -> PMap.add p r acc) com.package_rules PMap.empty;
@@ -1007,12 +997,8 @@ try
 		| Cpp ->
 			Common.log com ("Generating Cpp in : " ^ com.file);
 			Gencpp.generate com;
-		| Cs ->
-			if com.verbose then print_endline ("Generating C# in : " ^ com.file);
-			Gencs.generate com;
-		| Java ->
-			if com.verbose then print_endline ("Generating Java in : " ^ com.file);
-			Genjava.generate com;
+		| Cs | Java ->
+			assert false
 		);
 	end;
 	Sys.catch_break false;