diff options
| author | Sverker Eriksson <sverker@erlang.org> | 2022-02-06 22:50:23 +0100 |
|---|---|---|
| committer | Jérôme de Bretagne <jerome.debretagne@gmail.com> | 2022-03-03 17:40:39 +0100 |
| commit | 6bcfd5aaa66c208251357db3d5e8a2927a7af4d1 (patch) | |
| tree | c43cacf15a40cdb40eda68dbbaf8cca32f0238c9 | |
| parent | c4f24d6718ac56c431f0fccf240c5b15482792ed (diff) | |
| download | erlang-6bcfd5aaa66c208251357db3d5e8a2927a7af4d1.tar.gz | |
jinterface: Pass -encoding UTF-8 to java compiler
Option passed to avoid being dependent on machine-specific locale
which could assume pure ASCII source code for example.
| -rw-r--r-- | lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile | 8 | ||||
| -rw-r--r-- | lib/jinterface/test/jinterface_SUITE_data/Makefile.src | 2 | ||||
| -rw-r--r-- | lib/jinterface/test/nc_SUITE_data/Makefile.src | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile index b6df7c53a5..089cf4ab1a 100644 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile @@ -2,9 +2,9 @@ # # %CopyrightBegin% -# +# # Copyright Ericsson AB 2000-2022. All Rights Reserved. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -16,7 +16,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# +# # %CopyrightEnd% # include $(ERL_TOP)/make/target.mk @@ -82,7 +82,7 @@ ifneq ($(V),0) JARFLAGS=-cfv endif -JAVA_OPTIONS = -Xlint +JAVA_OPTIONS = -Xlint -encoding UTF-8 ifeq ($(TESTROOT),) RELEASE_PATH="$(ERL_TOP)/release/$(TARGET)" diff --git a/lib/jinterface/test/jinterface_SUITE_data/Makefile.src b/lib/jinterface/test/jinterface_SUITE_data/Makefile.src index f16849bf99..eac9189536 100644 --- a/lib/jinterface/test/jinterface_SUITE_data/Makefile.src +++ b/lib/jinterface/test/jinterface_SUITE_data/Makefile.src @@ -59,6 +59,6 @@ clean: -del /F /Q $(CLASS_FILES) $(CLASS_FILES) : $(JAVA_FILES) - $(JAVAC) -classpath $(CLASSPATH) $(JAVA_FILES) + $(JAVAC) -encoding UTF-8 -classpath $(CLASSPATH) $(JAVA_FILES) # diff --git a/lib/jinterface/test/nc_SUITE_data/Makefile.src b/lib/jinterface/test/nc_SUITE_data/Makefile.src index 6402f5349a..a278683477 100644 --- a/lib/jinterface/test/nc_SUITE_data/Makefile.src +++ b/lib/jinterface/test/nc_SUITE_data/Makefile.src @@ -46,6 +46,6 @@ clean: -del /F /Q $(CLASS_FILES) $(CLASS_FILES) : $(JAVA_FILES) - $(JAVAC) -classpath $(CLASSPATH) $(JAVA_FILES) + $(JAVAC) -encoding UTF-8 -classpath $(CLASSPATH) $(JAVA_FILES) # |