Author: damjan
Date: Sun Jan 22 08:13:07 2017
New Revision: 1779780
URL: http://svn.apache.org/viewvc?rev=1779780&view=rev
Log:
Pass "-encoding UTF8" to javac, as some Java sources, particularly those
used in subsequent tests, contain special characters that are encoded
in UTF-8, and fail to compile without this option.
Patch by: me
Modified:
openoffice/trunk/main/solenv/gbuild/JavaClassSet.mk
Modified: openoffice/trunk/main/solenv/gbuild/JavaClassSet.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/JavaClassSet.mk?rev=1779780&r1=1779779&r2=1779780&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/JavaClassSet.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/JavaClassSet.mk Sun Jan 22 08:13:07 2017
@@ -27,7 +27,8 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACO
define gb_JavaClassSet__command
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
- $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call
gb_JavaClassSet_get_classdir,$(2)) $(if $(filter-out $(JARDEPS),$(3)),\
+ $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -encoding UTF8 \
+ -d $(call gb_JavaClassSet_get_classdir,$(2)) $(if
$(filter-out $(JARDEPS),$(3)),\
$(filter-out $(JARDEPS),$(3)),\
$(filter-out $(JARDEPS),$(4))) &&\
touch $(1))
