Browse Source

temporarily disable Java and C# targets

Simon Krajewski 12 years ago
parent
commit
53ac023b50
4 changed files with 24 additions and 21 deletions
  1. 3 3
      Makefile
  2. 9 8
      main.ml
  3. 10 10
      tests/unit/compile.hxml
  4. 2 0
      tests/unit/unit.html

+ 3 - 3
Makefile

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

+ 9 - 8
main.ml

@@ -669,7 +669,7 @@ and do_connect host port args =
 
 and init ctx =
 	let usage = Printf.sprintf
-		"Haxe Compiler %d.%.2d - (c)2005-2012 Haxe Foundation\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 Haxe Foundation\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
@@ -751,12 +751,12 @@ try
 		("-cpp",Arg.String (fun dir ->
 			set_platform Cpp dir;
 		),"<directory> : generate C++ code into target directory");
-		("-cs",Arg.String (fun dir ->
+(* 		("-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");
+		),"<directory> : generate Java code into target directory"); *)
 		("-xml",Arg.String (fun file ->
 			Parser.use_doc := true;
 			xml_out := Some file
@@ -804,7 +804,8 @@ try
 			Genswf.add_swf_lib com file
 		),"<file> : add the SWF library to the compiled SWF");
 		("-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
@@ -1010,10 +1011,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 *)
@@ -1113,10 +1114,10 @@ try
 			Gencpp.generate com;
 		| Cs ->
 			if com.verbose then print_endline ("Generating C# in : " ^ com.file);
-			Gencs.generate com;
+			(* Gencs.generate com; *)
 		| Java ->
 			if com.verbose then print_endline ("Generating Java in : " ^ com.file);
-			Genjava.generate com;
+			(* Genjava.generate com; *)
 		);
 	end;
 	Sys.catch_break false;

+ 10 - 10
tests/unit/compile.hxml

@@ -70,17 +70,17 @@ unit.Test
 -D NO_PRECOMPILED_HEADERS
 
 #java
---next
--main unit.Test
--java java
+#--next
+#-main unit.Test
+#-java java
 
 #cs
---next
--main unit.Test
--cs cs
+#--next
+#-main unit.Test
+#-cs cs
 
 #cs-unsafe
---next
--main unit.Test
--cs cs_unsafe
--D unsafe
+#--next
+#-main unit.Test
+#-cs cs_unsafe
+#-D unsafe

+ 2 - 0
tests/unit/unit.html

@@ -133,6 +133,7 @@ iframe {
   <div class="label">CPP</div>
   <div id="cpp_container" class="cont"><iframe src="runexe.n?cpp/Test-debug"></iframe></div>
 </div>
+<!--
 <div class="window">
   <div class="label">Java</div>
   <div id="java_container" class="cont"><iframe src="runjava.n"></iframe></div>
@@ -145,6 +146,7 @@ iframe {
   <div class="label">C#-unsafe</div>
   <div id="csharp_container" class="cont"><iframe src="runexe.n?cs_unsafe/bin/cs_unsafe"></iframe></div>
 </div>
+-->
 <script type="text/javascript">
 setTimeout('unit.Test.main()', 1000)
 </script>