diff options
| author | Brian P. Hinz <bphinz@users.sf.net> | 2017-11-13 19:00:01 -0500 |
|---|---|---|
| committer | Brian P. Hinz <bphinz@users.sf.net> | 2017-11-13 21:10:06 -0500 |
| commit | 335446d164fc96a08c119171d696ffea030f71ff (patch) | |
| tree | 5c2990246155d1ae00e35c3f755d5e690f7caa8d | |
| parent | bce950b70a310ff4614807aa2f0904a826b6b30a (diff) | |
| download | tigervnc-335446d164fc96a08c119171d696ffea030f71ff.tar.gz tigervnc-335446d164fc96a08c119171d696ffea030f71ff.zip | |
Fix build Java errors caused by UTF-8 characters in source comments
See issue #534
| -rwxr-xr-x | contrib/packages/deb/ubuntu-precise/debian/rules | 2 | ||||
| -rwxr-xr-x | contrib/packages/deb/ubuntu-trusty/debian/rules | 2 | ||||
| -rw-r--r-- | contrib/packages/deb/ubuntu-xenial/debian/rules | 2 | ||||
| -rw-r--r-- | contrib/packages/rpm/el6/SPECS/tigervnc.spec | 2 | ||||
| -rw-r--r-- | contrib/packages/rpm/el7/SPECS/tigervnc.spec | 2 | ||||
| -rw-r--r-- | java/CMakeLists.txt | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/contrib/packages/deb/ubuntu-precise/debian/rules b/contrib/packages/deb/ubuntu-precise/debian/rules index f803861c..7d5f4ac6 100755 --- 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 3811477c..08e974c0 100755 --- 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 1a7a20b5..531a1c44 100644 --- 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 447eb7fb..fce7d2d6 100644 --- 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 2f74fcbe..d91c174f 100644 --- 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 80e0dd26..7d6c70a8 100644 --- 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}") |