Commit 4a18cfa8 authored by Arpad Lovassy's avatar Arpad Lovassy

Merge branch 'issue408' into 'master'

UTF-8 encoding for Java #408

See merge request !630
parents 5bfd8da5 8258a00d
......@@ -64,11 +64,11 @@ public final class CliScriptGenerator {
+ "\tfi\n"
+ "\techo \"Starting the Host Controller...\"\n"
+ "\techo \"Connecting to ${localaddress}:${tcpport}...\"\n"
+ "\tjava -cp ${exe_file} org.eclipse.titan.${project}.generated.Parallel_main ${localaddress} ${tcpport}\n"
+ "\tjava -Dfile.encoding=UTF-8 -cp ${exe_file} org.eclipse.titan.${project}.generated.Parallel_main ${localaddress} ${tcpport}\n"
+ "}\n\n"
+ "function start_mc() {\n"
+ "\techo \"Starting the Main Controller...\"\n"
+ "\tjava -cp ${exe_file} org.eclipse.titan.runtime.core.mctr.CliMain ${cfg_file}\n"
+ "\tjava -Dfile.encoding=UTF-8 -cp ${exe_file} org.eclipse.titan.runtime.core.mctr.CliMain ${cfg_file}\n"
+ "}\n\n"
+ "function start_parallel() {\n"
+ "\techo \"Starting automatic execution in Parallel mode...\"\n"
......@@ -80,7 +80,7 @@ public final class CliScriptGenerator {
+ "}\n\n"
+ "function start_single() {\n"
+ "\techo \"Starting execution in Single mode...\"\n"
+ "\tjava -cp ${exe_file} org.eclipse.titan.${project}.generated.Single_main ${cfg_file}\n"
+ "\tjava -Dfile.encoding=UTF-8 -cp ${exe_file} org.eclipse.titan.${project}.generated.Single_main ${cfg_file}\n"
+ "}\n\n"
+ "if [ ! -e \"$(which java)\" ]; then\n"
+ "\techo \"java is not found.\"\n"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment