[4.3.6] Fix --java out -D jvm deprecation warning (#11739)

* Fix detection of --java out -D jvm * [tests] add test for 11737
HaxeFoundation · Jul 29, 2024 · 7290013 · 7290013
1 parent bd79571
commit 7290013
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 3 deletions.
diff --git a/src/compiler/compiler.ml b/src/compiler/compiler.ml
@@ -129,6 +129,7 @@ module Setup = struct
 			| Java ->
 				Java.before_generate com;
 				if defined com Define.Jvm then begin
+					if not actx.jvm_flag then com.warning WDeprecated com.warning_options ("--java out.jar -D jvm is deprecated; use --jvm out.jar directly") null_pos;
 					add_std "jvm";
 					com.package_rules <- PMap.remove "jvm" com.package_rules;
 				end;

diff --git a/src/compiler/generate.ml b/src/compiler/generate.ml
@@ -81,10 +81,9 @@ let generate ctx tctx ext actx =
 		| Cs ->
 			Gencs.generate,"cs"
 		| Java ->
-			if Common.defined com Jvm then begin
-				com.warning WDeprecated com.warning_options ("--java out.jar -D jvm is deprecated; use --jvm out.jar directly") null_pos;
+			if Common.defined com Jvm then
 				Genjvm.generate actx.jvm_flag,"java"
-			end else
+			else
 				Genjava.generate,"java"
 		| Python ->
 			Genpy.generate,"python"

diff --git a/tests/misc/projects/Issue11737/Main.hx b/tests/misc/projects/Issue11737/Main.hx
@@ -0,0 +1 @@
+function main() {}
diff --git a/tests/misc/projects/Issue11737/_setup.hxml b/tests/misc/projects/Issue11737/_setup.hxml
@@ -0,0 +1 @@
+--cmd haxelib install --quiet hxjava
diff --git a/tests/misc/projects/Issue11737/compile.hxml b/tests/misc/projects/Issue11737/compile.hxml
@@ -0,0 +1,3 @@
+--main Main
+--java bin
+-D jvm
diff --git a/tests/misc/projects/Issue11737/compile.hxml.stderr b/tests/misc/projects/Issue11737/compile.hxml.stderr
@@ -0,0 +1 @@
+Warning : (WDeprecated) --java out.jar -D jvm is deprecated; use --jvm out.jar directly
diff --git a/tests/misc/projects/Issue11737/compile1.hxml b/tests/misc/projects/Issue11737/compile1.hxml
@@ -0,0 +1,2 @@
+--main Main
+--jvm bin/jvm.jar
diff --git a/tests/misc/projects/Issue11737/compile1.hxml.stderr b/tests/misc/projects/Issue11737/compile1.hxml.stderr
diff --git a/tests/misc/projects/Issue11737/compile2.hxml b/tests/misc/projects/Issue11737/compile2.hxml
@@ -0,0 +1,2 @@
+--main Main
+--java bin
diff --git a/tests/misc/projects/Issue11737/compile2.hxml.stderr b/tests/misc/projects/Issue11737/compile2.hxml.stderr
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Warning : (WDeprecated) --java out.jar -D jvm is deprecated; use --jvm out.jar directly