From 82510061125427f594824f484b8dd7e2850b8ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Bla=C5=BEek?= Date: Tue, 11 Jul 2023 11:25:37 +0200 Subject: [PATCH 1/2] Use UTF-8 encoding during compilation --- build-jar.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-jar.sh b/build-jar.sh index e072edfb..99aefdf8 100755 --- a/build-jar.sh +++ b/build-jar.sh @@ -1,7 +1,7 @@ #!/bin/bash if git submodule status | grep \( > /dev/null ; then mkdir -p build - find src -name "*.java" | xargs javac -d build + find src -name "*.java" | xargs javac -encoding utf-8 -d build if [[ "$OSTYPE" == "darwin"* ]]; then find src -type f -not -name "*.java" -exec rsync -R {} build \; else From 37b937b98f080937ab005e217b0769a0245277e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Bla=C5=BEek?= Date: Tue, 11 Jul 2023 22:44:18 +0200 Subject: [PATCH 2/2] Use UTF-8 encoding in test.sh, fix test.sh for mingw and cygwin --- test.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test.sh b/test.sh index fe1fd0cd..7b74adc7 100755 --- a/test.sh +++ b/test.sh @@ -1,4 +1,8 @@ #!/bin/bash -javac -cp rars.jar test/Test.java -java -cp test:rars.jar Test +javac -encoding utf-8 -cp rars.jar test/Test.java +if [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "cygwin" ]]; then + java -Dfile.encoding=UTF8 -cp "test;rars.jar" Test +else + java -Dfile.encoding=UTF8 -cp test:rars.jar Test +fi rm test/Test.class