瀏覽代碼

disable java/cs target until TField is patched

Nicolas Cannasse 12 年之前
父節點
當前提交
36f2cbb4c6
共有 2 個文件被更改,包括 12 次插入11 次删除
  1. 4 4
      Makefile
  2. 8 7
      main.ml

+ 4 - 4
Makefile

@@ -29,8 +29,8 @@ RELDIR=../../..
 EXPORT=../../../projects/motionTools/haxe
 
 MODULES=ast type lexer common genxml parser typecore optimizer typeload \
-	codegen gencommon genas3 gencpp genjs genneko genphp genswf8 \
-	genswf9 genswf genjava gencs interp typer matcher dce main
+	codegen genas3 gencpp genjs genneko genphp genswf8 \
+	genswf9 genswf interp typer matcher dce main
 
 HAXE_LIBRARY_PATH=$(CURDIR)/std
 
@@ -95,8 +95,8 @@ genxml.cmx: type.cmx lexer.cmx common.cmx ast.cmx
 interp.cmx: typecore.cmx type.cmx lexer.cmx genneko.cmx common.cmx codegen.cmx ast.cmx genswf.cmx parser.cmx
 
 matcher.cmx: codegen.cmx typecore.cmx type.cmx typer.cmx common.cmx ast.cmx
-
-main.cmx: dce.cmx matcher.cmx typer.cmx typeload.cmx typecore.cmx type.cmx parser.cmx optimizer.cmx lexer.cmx interp.cmx genxml.cmx genswf.cmx genphp.cmx genneko.cmx genjs.cmx genjava.cmx gencs.cmx gencpp.cmx genas3.cmx common.cmx codegen.cmx ast.cmx
+
+main.cmx: dce.cmx matcher.cmx typer.cmx typeload.cmx typecore.cmx type.cmx parser.cmx optimizer.cmx lexer.cmx interp.cmx genxml.cmx genswf.cmx genphp.cmx genneko.cmx genjs.cmx gencpp.cmx genas3.cmx common.cmx codegen.cmx ast.cmx
 
 optimizer.cmx: typecore.cmx type.cmx parser.cmx common.cmx ast.cmx
 

+ 8 - 7
main.ml

@@ -840,7 +840,8 @@ try
 			Genswf.add_swf_lib com file true
 		),"<file> : use the SWF library for type checking");
 		("-java-lib",Arg.String (fun file ->
-			Genjava.add_java_lib com file
+			()
+			(* Genjava.add_java_lib com file *)
 		),"<file> : add an external JAR or class directory library");
 		("-x", Arg.String (fun file ->
 			let neko_file = file ^ ".n" in
@@ -1053,10 +1054,10 @@ try
 			add_std "cpp";
 			"cpp"
 		| Cs ->
-			Gencs.before_generate com;
+			(*Gencs.before_generate com;*)
 			add_std "cs"; "cs"
 		| Java ->
-			Genjava.before_generate com;
+			(*Genjava.before_generate com;*)
 			add_std "java"; "java"
 	) in
 	(* if we are at the last compilation step, allow all packages accesses - in case of macros or opening another project file *)
@@ -1156,11 +1157,11 @@ try
 			Common.log com ("Generating Cpp in : " ^ com.file);
 			Gencpp.generate com;
 		| Cs ->
-      Common.log com ("Generating Cs in : " ^ com.file);
-			Gencs.generate com;
+			Common.log com ("Generating Cs in : " ^ com.file);
+			(* Gencs.generate com; *)
 		| Java ->
-      Common.log com ("Generating Cs in : " ^ com.file);
-			Genjava.generate com;
+			Common.log com ("Generating Cs in : " ^ com.file);
+			(* Genjava.generate com; *)
 		);
 	end;
 	Sys.catch_break false;