substitute $target when we actually need it

src/compiler/compiler.ml

@@ -373,7 +373,7 @@ let compile ctx actx callbacks =
 		| None ->
 			()
 		| Some file ->
-			com.hxb_writer_config <- HxbWriterConfig.process_argument (platform_name com.platform) file
+			com.hxb_writer_config <- HxbWriterConfig.process_argument file
 	end;
 	t();
 	enter_stage com CInitialized;

src/compiler/generate.ml

@@ -59,6 +59,7 @@ let check_hxb_output ctx config =
 	in
 	let try_write () =
 		let path = config.HxbWriterConfig.archive_path in
+		let path = Str.global_replace (Str.regexp "\\$target") (platform_name ctx.com.platform) path in
 		let t = Timer.timer ["generate";"hxb"] in
 		Path.mkdir_from_path path;
 		let zip = new Zip_output.zip_output path 6 in

src/compiler/hxb/hxbWriterConfig.ml

@@ -51,15 +51,13 @@ module WriterConfigReader (API : DataReaderApi.DataReaderApi) = struct
 				error (Printf.sprintf "Unknown key for target config: %s" s)
 		) fl
 
-	let read_writer_config config target_name data =
+	let read_writer_config config data =
 		let read data =
 			let fl = API.read_object data in
 			List.iter (fun (s,data) ->
 				match s with
 				| "archivePath" ->
-					let path = API.read_string data in
-					let path = Str.global_replace (Str.regexp "\\$target") target_name path in
-					config.archive_path <- path;
+					config.archive_path <- API.read_string data;
 				| "targetConfig" ->
 					API.read_optional data (fun data -> read_target_config config.target_config (API.read_object data))
 				| "macroConfig" ->
@@ -90,15 +88,15 @@ module WriterConfigWriter (API : DataWriterApi.DataWriterApi) = struct
 		]
 end
 
-let process_json config target_name json =
-	WriterConfigReaderJson.read_writer_config config target_name json
+let process_json config json =
+	WriterConfigReaderJson.read_writer_config config json
 
-let parse config target_name input =
+let parse config input =
 	let lexbuf = Sedlexing.Utf8.from_string input in
 	let json = read_json lexbuf in
-	process_json config target_name json
+	process_json config json
 
-let process_argument target_name file =
+let process_argument file =
 	let config = create () in
 	begin match Path.file_extension file with
 		| "json" ->
@@ -109,7 +107,7 @@ let process_argument target_name file =
 			in
 			let data = Std.input_all file in
 			close_in file;
-			parse config target_name data;
+			parse config data;
 		| _ ->
 			config.archive_path <- file;
 	end;

src/typing/macroContext.ml

@@ -328,7 +328,7 @@ let make_macro_com_api com mcom p =
 						com.hxb_writer_config <- Some config;
 						config
 				in
-				HxbWriterConfigReaderEval.read_writer_config config (platform_name com.platform) v
+				HxbWriterConfigReaderEval.read_writer_config config v
 			end
 		);
 	}