Fix build Java errors caused by UTF-8 characters in source comments

See issue #534

diff --git a/contrib/packages/deb/ubuntu-precise/debian/rules b/contrib/packages/deb/ubuntu-precise/debian/rules
index f803861ca01118498547402d2463bd5626711167..7d5f4ac6a9b87904e4abfe2a0e94a0d87a819d93 100755 (executable)
--- a/contrib/packages/deb/ubuntu-precise/debian/rules
+++ b/contrib/packages/deb/ubuntu-precise/debian/rules
@@ -144,7 +144,7 @@ build-indep-stamp:
        #  anything for this package.
        #/usr/bin/docbook-to-man debian/vnc.sgml > vnc.1
        (cd media;make)
-       (cd java;cmake -G"Unix Makefiles";JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make)
+       (cd java;cmake -G"Unix Makefiles";make)
 
        touch build-indep-stamp
 

diff --git a/contrib/packages/deb/ubuntu-trusty/debian/rules b/contrib/packages/deb/ubuntu-trusty/debian/rules
index 3811477caa71f2b06027816e83ad43e370dea6b7..08e974c04db98b8db39228e2299be6f7ad6fc656 100755 (executable)
--- a/contrib/packages/deb/ubuntu-trusty/debian/rules
+++ b/contrib/packages/deb/ubuntu-trusty/debian/rules
@@ -151,7 +151,7 @@ build-indep-stamp:
        #  anything for this package.
        #/usr/bin/docbook-to-man debian/vnc.sgml > vnc.1
        (cd media;make)
-       (cd java;cmake -G"Unix Makefiles";JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make)
+       (cd java;cmake -G"Unix Makefiles";make)
 
        touch build-indep-stamp
 

diff --git a/contrib/packages/deb/ubuntu-xenial/debian/rules b/contrib/packages/deb/ubuntu-xenial/debian/rules
index 1a7a20b56d56372157e2d9a5c33fab3bebad8fdc..531a1c44827ed8f69c22bac714435587f7ed748d 100644 (file)
--- a/contrib/packages/deb/ubuntu-xenial/debian/rules
+++ b/contrib/packages/deb/ubuntu-xenial/debian/rules
@@ -138,7 +138,7 @@ build-indep-stamp:
        #  anything for this package.
        #/usr/bin/docbook-to-man debian/vnc.sgml > vnc.1
        (cd media;make)
-       (cd java;cmake -G"Unix Makefiles";JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make)
+       (cd java;cmake -G"Unix Makefiles";make)
 
        touch build-indep-stamp
 

diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
index 447eb7fb48dd9c59d1d9ae65220b862ceea5e102..fce7d2d69e451bfa6a06890551a2db0151be5437 100644 (file)
--- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
@@ -342,7 +342,7 @@ pushd java
        -DJAVA_TSA_URL=http://timestamp.geotrust.com/tsa .
 %endif
 
-JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make
+make
 popd
 
 %install

diff --git a/contrib/packages/rpm/el7/SPECS/tigervnc.spec b/contrib/packages/rpm/el7/SPECS/tigervnc.spec
index 2f74fcbed7fafe776f2f4ea69340094d6c3ada1e..d91c174fab32c0527f64f7e14a2d1cc419941fac 100644 (file)
--- a/contrib/packages/rpm/el7/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el7/SPECS/tigervnc.spec
@@ -262,7 +262,7 @@ pushd java
        -DJAVA_TSA_URL=http://timestamp.geotrust.com/tsa .
 %endif
 
-JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make
+make
 popd
 
 %install

diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index 80e0dd26d74eaa09fb9cd248c048776c3d1e0158..7d6c70a896b67d54831399d56803ebcbdbd0fd98 100644 (file)
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package(Java)
 
 set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
 
-set(DEFAULT_JAVACFLAGS "-source 7 -target 7 -Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes")
+set(DEFAULT_JAVACFLAGS "-source 7 -target 7 -encoding UTF-8 -Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes")
 set(JAVACFLAGS ${DEFAULT_JAVACFLAGS} CACHE STRING
   "Java compiler flags (Default: ${DEFAULT_JAVACFLAGS})")
 message(STATUS "Java compiler flags = ${JAVACFLAGS}")