浏览代码

Changes class-path generation for jvm to multiple lines to fix jars with (#10160)

a lot of libraries.
David Bruce 4 年之前
父节点
当前提交
5d11a324b6
共有 1 个文件被更改,包括 3 次插入4 次删除
  1. 3 4
      src/generators/genjvm.ml

+ 3 - 4
src/generators/genjvm.ml

@@ -2924,7 +2924,7 @@ let generate jvm_flag com =
 			output_string ch_out b;
 			close_in ch_in;
 			close_out ch_out;
-			Some (Printf.sprintf "lib/%s" name)
+			Some (Printf.sprintf "lib/%s \n" name)
 		end
 	) com.native_libs.java_libs in
 	Hashtbl.iter (fun name v ->
@@ -2945,11 +2945,10 @@ let generate jvm_flag com =
 
 	let manifest_content =
 		"Manifest-Version: 1.0\n" ^
-		(match class_paths with [] -> "" | _ -> "Class-Path: " ^ (String.concat " " class_paths ^ "\n")) ^
 		"Created-By: Haxe (Haxe Foundation)" ^
 		(Option.map_default (fun (cl,_) ->  "\nMain-Class: " ^ (s_type_path cl.cl_path)) "" entry_point) ^
-		"\n\n"
+		(match class_paths with [] -> "" | _ -> "\nClass-Path: " ^ (String.concat " " class_paths))
 	in
 	Zip.add_entry ~level:gctx.jar_compression_level manifest_content gctx.jar "META-INF/MANIFEST.MF";
 
-	Zip.close_out gctx.jar
+	Zip.close_out gctx.jar