From c19ab9ec7f3ac4823802388ac953e9494c613575 Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 7 Oct 2011 05:38:00 +0000 Subject: [PATCH] Move Java source up one level and allow Java viewer to be built as a standalone project (per community request) git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4715 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- CMakeLists.txt | 2 +- doc/dev/version_numbers | 1 + java/{src => }/CMakeLists.txt | 7 ++++++- {cmake => java/cmake}/SignJar.cmake | 0 java/{src => }/com/jcraft/jzlib/Adler32.java | 0 java/{src => }/com/jcraft/jzlib/ChangeLog | 0 java/{src => }/com/jcraft/jzlib/Deflate.java | 0 java/{src => }/com/jcraft/jzlib/InfBlocks.java | 0 java/{src => }/com/jcraft/jzlib/InfCodes.java | 0 java/{src => }/com/jcraft/jzlib/InfTree.java | 0 java/{src => }/com/jcraft/jzlib/Inflate.java | 0 java/{src => }/com/jcraft/jzlib/JZlib.java | 0 java/{src => }/com/jcraft/jzlib/LICENSE.txt | 0 java/{src => }/com/jcraft/jzlib/README | 0 java/{src => }/com/jcraft/jzlib/StaticTree.java | 0 java/{src => }/com/jcraft/jzlib/Tree.java | 0 java/{src => }/com/jcraft/jzlib/ZInputStream.java | 0 java/{src => }/com/jcraft/jzlib/ZOutputStream.java | 0 java/{src => }/com/jcraft/jzlib/ZStream.java | 0 .../com/jcraft/jzlib/ZStreamException.java | 0 java/{src => }/com/tigervnc/rdr/EndOfStream.java | 0 java/{src => }/com/tigervnc/rdr/Exception.java | 0 java/{src => }/com/tigervnc/rdr/IOException.java | 0 java/{src => }/com/tigervnc/rdr/InStream.java | 0 java/{src => }/com/tigervnc/rdr/JavaInStream.java | 0 java/{src => }/com/tigervnc/rdr/JavaOutStream.java | 0 java/{src => }/com/tigervnc/rdr/MemInStream.java | 0 java/{src => }/com/tigervnc/rdr/MemOutStream.java | 0 java/{src => }/com/tigervnc/rdr/OutStream.java | 0 java/{src => }/com/tigervnc/rdr/ZlibInStream.java | 0 java/{src => }/com/tigervnc/rfb/AliasParameter.java | 0 .../com/tigervnc/rfb/AuthFailureException.java | 0 java/{src => }/com/tigervnc/rfb/BoolParameter.java | 0 java/{src => }/com/tigervnc/rfb/CConnection.java | 0 java/{src => }/com/tigervnc/rfb/CMsgHandler.java | 0 java/{src => }/com/tigervnc/rfb/CMsgReader.java | 0 java/{src => }/com/tigervnc/rfb/CMsgReaderV3.java | 0 java/{src => }/com/tigervnc/rfb/CMsgWriter.java | 0 java/{src => }/com/tigervnc/rfb/CMsgWriterV3.java | 0 java/{src => }/com/tigervnc/rfb/CSecurity.java | 0 java/{src => }/com/tigervnc/rfb/CSecurityIdent.java | 0 .../com/tigervnc/rfb/CSecurityManaged.java | 0 java/{src => }/com/tigervnc/rfb/CSecurityNone.java | 0 java/{src => }/com/tigervnc/rfb/CSecurityPlain.java | 0 java/{src => }/com/tigervnc/rfb/CSecurityStack.java | 0 java/{src => }/com/tigervnc/rfb/CSecurityTLS.java | 0 .../com/tigervnc/rfb/CSecurityVeNCrypt.java | 0 .../com/tigervnc/rfb/CSecurityVncAuth.java | 0 java/{src => }/com/tigervnc/rfb/Configuration.java | 0 .../com/tigervnc/rfb/ConnFailedException.java | 0 java/{src => }/com/tigervnc/rfb/ConnParams.java | 0 java/{src => }/com/tigervnc/rfb/Cursor.java | 0 java/{src => }/com/tigervnc/rfb/Decoder.java | 0 java/{src => }/com/tigervnc/rfb/DesCipher.java | 0 java/{src => }/com/tigervnc/rfb/Encoder.java | 0 java/{src => }/com/tigervnc/rfb/Encodings.java | 0 java/{src => }/com/tigervnc/rfb/Exception.java | 0 java/{src => }/com/tigervnc/rfb/Hextile.java | 0 java/{src => }/com/tigervnc/rfb/HextileDecoder.java | 0 java/{src => }/com/tigervnc/rfb/Hostname.java | 0 java/{src => }/com/tigervnc/rfb/IntParameter.java | 0 java/{src => }/com/tigervnc/rfb/Keysyms.java | 0 java/{src => }/com/tigervnc/rfb/LogWriter.java | 0 .../com/tigervnc/rfb/ManagedPixelBuffer.java | 0 java/{src => }/com/tigervnc/rfb/MsgTypes.java | 0 java/{src => }/com/tigervnc/rfb/PixelBuffer.java | 0 java/{src => }/com/tigervnc/rfb/PixelFormat.java | 0 java/{src => }/com/tigervnc/rfb/Point.java | 0 java/{src => }/com/tigervnc/rfb/RREDecoder.java | 0 java/{src => }/com/tigervnc/rfb/RawDecoder.java | 0 java/{src => }/com/tigervnc/rfb/Rect.java | 0 java/{src => }/com/tigervnc/rfb/Screen.java | 0 java/{src => }/com/tigervnc/rfb/ScreenSet.java | 0 java/{src => }/com/tigervnc/rfb/Security.java | 0 java/{src => }/com/tigervnc/rfb/SecurityClient.java | 0 .../{src => }/com/tigervnc/rfb/StringParameter.java | 0 java/{src => }/com/tigervnc/rfb/TightDecoder.java | 0 .../{src => }/com/tigervnc/rfb/UnicodeToKeysym.java | 0 java/{src => }/com/tigervnc/rfb/UserMsgBox.java | 0 .../com/tigervnc/rfb/UserPasswdGetter.java | 0 java/{src => }/com/tigervnc/rfb/VncAuth.java | 0 java/{src => }/com/tigervnc/rfb/VoidParameter.java | 0 java/{src => }/com/tigervnc/rfb/ZRLEDecoder.java | 0 java/{src => }/com/tigervnc/rfb/screenTypes.java | 0 java/{src => }/com/tigervnc/vncviewer/CConn.java | 0 .../com/tigervnc/vncviewer/ClipboardDialog.java | 0 .../com/tigervnc/vncviewer/DesktopWindow.java | 0 java/{src => }/com/tigervnc/vncviewer/Dialog.java | 0 java/{src => }/com/tigervnc/vncviewer/F8Menu.java | 0 java/{src => }/com/tigervnc/vncviewer/LICENCE.TXT | 0 java/{src => }/com/tigervnc/vncviewer/MANIFEST.MF | 0 .../com/tigervnc/vncviewer/OptionsDialog.java | 0 .../tigervnc/vncviewer/OptionsDialogCallback.java | 0 .../com/tigervnc/vncviewer/PasswdDialog.java | 0 .../com/tigervnc/vncviewer/PixelBufferImage.java | 0 java/{src => }/com/tigervnc/vncviewer/README | 0 .../com/tigervnc/vncviewer/ServerDialog.java | 0 .../{src => }/com/tigervnc/vncviewer/UserPrefs.java | 0 .../{src => }/com/tigervnc/vncviewer/VncViewer.java | 0 java/{src => }/com/tigervnc/vncviewer/index.html | 0 java/{src => }/com/tigervnc/vncviewer/index.vnc | 0 java/{src => }/com/tigervnc/vncviewer/tigervnc.ico | Bin java/{src => }/com/tigervnc/vncviewer/tigervnc.png | Bin java/{src => }/com/tigervnc/vncviewer/timestamp.in | 0 win/winvnc/CMakeLists.txt | 2 +- win/winvnc/winvnc.rc.in | 2 +- 106 files changed, 10 insertions(+), 4 deletions(-) rename java/{src => }/CMakeLists.txt (96%) rename {cmake => java/cmake}/SignJar.cmake (100%) rename java/{src => }/com/jcraft/jzlib/Adler32.java (100%) rename java/{src => }/com/jcraft/jzlib/ChangeLog (100%) rename java/{src => }/com/jcraft/jzlib/Deflate.java (100%) rename java/{src => }/com/jcraft/jzlib/InfBlocks.java (100%) rename java/{src => }/com/jcraft/jzlib/InfCodes.java (100%) rename java/{src => }/com/jcraft/jzlib/InfTree.java (100%) rename java/{src => }/com/jcraft/jzlib/Inflate.java (100%) rename java/{src => }/com/jcraft/jzlib/JZlib.java (100%) rename java/{src => }/com/jcraft/jzlib/LICENSE.txt (100%) rename java/{src => }/com/jcraft/jzlib/README (100%) rename java/{src => }/com/jcraft/jzlib/StaticTree.java (100%) rename java/{src => }/com/jcraft/jzlib/Tree.java (100%) rename java/{src => }/com/jcraft/jzlib/ZInputStream.java (100%) rename java/{src => }/com/jcraft/jzlib/ZOutputStream.java (100%) rename java/{src => }/com/jcraft/jzlib/ZStream.java (100%) rename java/{src => }/com/jcraft/jzlib/ZStreamException.java (100%) rename java/{src => }/com/tigervnc/rdr/EndOfStream.java (100%) rename java/{src => }/com/tigervnc/rdr/Exception.java (100%) rename java/{src => }/com/tigervnc/rdr/IOException.java (100%) rename java/{src => }/com/tigervnc/rdr/InStream.java (100%) rename java/{src => }/com/tigervnc/rdr/JavaInStream.java (100%) rename java/{src => }/com/tigervnc/rdr/JavaOutStream.java (100%) rename java/{src => }/com/tigervnc/rdr/MemInStream.java (100%) rename java/{src => }/com/tigervnc/rdr/MemOutStream.java (100%) rename java/{src => }/com/tigervnc/rdr/OutStream.java (100%) rename java/{src => }/com/tigervnc/rdr/ZlibInStream.java (100%) rename java/{src => }/com/tigervnc/rfb/AliasParameter.java (100%) rename java/{src => }/com/tigervnc/rfb/AuthFailureException.java (100%) rename java/{src => }/com/tigervnc/rfb/BoolParameter.java (100%) rename java/{src => }/com/tigervnc/rfb/CConnection.java (100%) rename java/{src => }/com/tigervnc/rfb/CMsgHandler.java (100%) rename java/{src => }/com/tigervnc/rfb/CMsgReader.java (100%) rename java/{src => }/com/tigervnc/rfb/CMsgReaderV3.java (100%) rename java/{src => }/com/tigervnc/rfb/CMsgWriter.java (100%) rename java/{src => }/com/tigervnc/rfb/CMsgWriterV3.java (100%) rename java/{src => }/com/tigervnc/rfb/CSecurity.java (100%) rename java/{src => }/com/tigervnc/rfb/CSecurityIdent.java (100%) rename java/{src => }/com/tigervnc/rfb/CSecurityManaged.java (100%) rename java/{src => }/com/tigervnc/rfb/CSecurityNone.java (100%) rename java/{src => }/com/tigervnc/rfb/CSecurityPlain.java (100%) rename java/{src => }/com/tigervnc/rfb/CSecurityStack.java (100%) rename java/{src => }/com/tigervnc/rfb/CSecurityTLS.java (100%) rename java/{src => }/com/tigervnc/rfb/CSecurityVeNCrypt.java (100%) rename java/{src => }/com/tigervnc/rfb/CSecurityVncAuth.java (100%) rename java/{src => }/com/tigervnc/rfb/Configuration.java (100%) rename java/{src => }/com/tigervnc/rfb/ConnFailedException.java (100%) rename java/{src => }/com/tigervnc/rfb/ConnParams.java (100%) rename java/{src => }/com/tigervnc/rfb/Cursor.java (100%) rename java/{src => }/com/tigervnc/rfb/Decoder.java (100%) rename java/{src => }/com/tigervnc/rfb/DesCipher.java (100%) rename java/{src => }/com/tigervnc/rfb/Encoder.java (100%) rename java/{src => }/com/tigervnc/rfb/Encodings.java (100%) rename java/{src => }/com/tigervnc/rfb/Exception.java (100%) rename java/{src => }/com/tigervnc/rfb/Hextile.java (100%) rename java/{src => }/com/tigervnc/rfb/HextileDecoder.java (100%) rename java/{src => }/com/tigervnc/rfb/Hostname.java (100%) rename java/{src => }/com/tigervnc/rfb/IntParameter.java (100%) rename java/{src => }/com/tigervnc/rfb/Keysyms.java (100%) rename java/{src => }/com/tigervnc/rfb/LogWriter.java (100%) rename java/{src => }/com/tigervnc/rfb/ManagedPixelBuffer.java (100%) rename java/{src => }/com/tigervnc/rfb/MsgTypes.java (100%) rename java/{src => }/com/tigervnc/rfb/PixelBuffer.java (100%) rename java/{src => }/com/tigervnc/rfb/PixelFormat.java (100%) rename java/{src => }/com/tigervnc/rfb/Point.java (100%) rename java/{src => }/com/tigervnc/rfb/RREDecoder.java (100%) rename java/{src => }/com/tigervnc/rfb/RawDecoder.java (100%) rename java/{src => }/com/tigervnc/rfb/Rect.java (100%) rename java/{src => }/com/tigervnc/rfb/Screen.java (100%) rename java/{src => }/com/tigervnc/rfb/ScreenSet.java (100%) rename java/{src => }/com/tigervnc/rfb/Security.java (100%) rename java/{src => }/com/tigervnc/rfb/SecurityClient.java (100%) rename java/{src => }/com/tigervnc/rfb/StringParameter.java (100%) rename java/{src => }/com/tigervnc/rfb/TightDecoder.java (100%) rename java/{src => }/com/tigervnc/rfb/UnicodeToKeysym.java (100%) rename java/{src => }/com/tigervnc/rfb/UserMsgBox.java (100%) rename java/{src => }/com/tigervnc/rfb/UserPasswdGetter.java (100%) rename java/{src => }/com/tigervnc/rfb/VncAuth.java (100%) rename java/{src => }/com/tigervnc/rfb/VoidParameter.java (100%) rename java/{src => }/com/tigervnc/rfb/ZRLEDecoder.java (100%) rename java/{src => }/com/tigervnc/rfb/screenTypes.java (100%) rename java/{src => }/com/tigervnc/vncviewer/CConn.java (100%) rename java/{src => }/com/tigervnc/vncviewer/ClipboardDialog.java (100%) rename java/{src => }/com/tigervnc/vncviewer/DesktopWindow.java (100%) rename java/{src => }/com/tigervnc/vncviewer/Dialog.java (100%) rename java/{src => }/com/tigervnc/vncviewer/F8Menu.java (100%) rename java/{src => }/com/tigervnc/vncviewer/LICENCE.TXT (100%) rename java/{src => }/com/tigervnc/vncviewer/MANIFEST.MF (100%) rename java/{src => }/com/tigervnc/vncviewer/OptionsDialog.java (100%) rename java/{src => }/com/tigervnc/vncviewer/OptionsDialogCallback.java (100%) rename java/{src => }/com/tigervnc/vncviewer/PasswdDialog.java (100%) rename java/{src => }/com/tigervnc/vncviewer/PixelBufferImage.java (100%) rename java/{src => }/com/tigervnc/vncviewer/README (100%) rename java/{src => }/com/tigervnc/vncviewer/ServerDialog.java (100%) rename java/{src => }/com/tigervnc/vncviewer/UserPrefs.java (100%) rename java/{src => }/com/tigervnc/vncviewer/VncViewer.java (100%) rename java/{src => }/com/tigervnc/vncviewer/index.html (100%) rename java/{src => }/com/tigervnc/vncviewer/index.vnc (100%) rename java/{src => }/com/tigervnc/vncviewer/tigervnc.ico (100%) rename java/{src => }/com/tigervnc/vncviewer/tigervnc.png (100%) rename java/{src => }/com/tigervnc/vncviewer/timestamp.in (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bba01f1..ebf2e539 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,7 +262,7 @@ endif() option(BUILD_JAVA "Build Java version of the TigerVNC Viewer" FALSE) if(BUILD_JAVA) - add_subdirectory(java/src) + add_subdirectory(java) endif() # Check for FLTK diff --git a/doc/dev/version_numbers b/doc/dev/version_numbers index e6678370..543aba0a 100644 --- a/doc/dev/version_numbers +++ b/doc/dev/version_numbers @@ -2,4 +2,5 @@ Files written below contain release numbers which should be changed during release process. CMakeLists.txt +java/CMakeLists.txt unix/xserver/hw/vnc/xvnc.cc diff --git a/java/src/CMakeLists.txt b/java/CMakeLists.txt similarity index 96% rename from java/src/CMakeLists.txt rename to java/CMakeLists.txt index a6b4ec8a..a6ca8000 100644 --- a/java/src/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -1,3 +1,8 @@ +cmake_minimum_required(VERSION 2.8) + +project(tigervnc-java Java) +set(VERSION 1.1.80) + find_package(Java) set(DEFAULT_JAVACFLAGS "-source 1.5 -target 1.5 -Xlint:all,-serial,-cast") @@ -94,7 +99,7 @@ add_custom_command(OUTPUT VncViewer.jar COMMAND ${CMAKE_COMMAND} ARGS -DJava_PATH=${Java_PATH} -DJAR_FILE=${CMAKE_CURRENT_BINARY_DIR}/VncViewer.jar - -P ${CMAKE_SOURCE_DIR}/cmake/SignJar.cmake + -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/SignJar.cmake WORKING_DIRECTORY ${OBJDIR}) add_custom_target(java ALL DEPENDS VncViewer.jar) diff --git a/cmake/SignJar.cmake b/java/cmake/SignJar.cmake similarity index 100% rename from cmake/SignJar.cmake rename to java/cmake/SignJar.cmake diff --git a/java/src/com/jcraft/jzlib/Adler32.java b/java/com/jcraft/jzlib/Adler32.java similarity index 100% rename from java/src/com/jcraft/jzlib/Adler32.java rename to java/com/jcraft/jzlib/Adler32.java diff --git a/java/src/com/jcraft/jzlib/ChangeLog b/java/com/jcraft/jzlib/ChangeLog similarity index 100% rename from java/src/com/jcraft/jzlib/ChangeLog rename to java/com/jcraft/jzlib/ChangeLog diff --git a/java/src/com/jcraft/jzlib/Deflate.java b/java/com/jcraft/jzlib/Deflate.java similarity index 100% rename from java/src/com/jcraft/jzlib/Deflate.java rename to java/com/jcraft/jzlib/Deflate.java diff --git a/java/src/com/jcraft/jzlib/InfBlocks.java b/java/com/jcraft/jzlib/InfBlocks.java similarity index 100% rename from java/src/com/jcraft/jzlib/InfBlocks.java rename to java/com/jcraft/jzlib/InfBlocks.java diff --git a/java/src/com/jcraft/jzlib/InfCodes.java b/java/com/jcraft/jzlib/InfCodes.java similarity index 100% rename from java/src/com/jcraft/jzlib/InfCodes.java rename to java/com/jcraft/jzlib/InfCodes.java diff --git a/java/src/com/jcraft/jzlib/InfTree.java b/java/com/jcraft/jzlib/InfTree.java similarity index 100% rename from java/src/com/jcraft/jzlib/InfTree.java rename to java/com/jcraft/jzlib/InfTree.java diff --git a/java/src/com/jcraft/jzlib/Inflate.java b/java/com/jcraft/jzlib/Inflate.java similarity index 100% rename from java/src/com/jcraft/jzlib/Inflate.java rename to java/com/jcraft/jzlib/Inflate.java diff --git a/java/src/com/jcraft/jzlib/JZlib.java b/java/com/jcraft/jzlib/JZlib.java similarity index 100% rename from java/src/com/jcraft/jzlib/JZlib.java rename to java/com/jcraft/jzlib/JZlib.java diff --git a/java/src/com/jcraft/jzlib/LICENSE.txt b/java/com/jcraft/jzlib/LICENSE.txt similarity index 100% rename from java/src/com/jcraft/jzlib/LICENSE.txt rename to java/com/jcraft/jzlib/LICENSE.txt diff --git a/java/src/com/jcraft/jzlib/README b/java/com/jcraft/jzlib/README similarity index 100% rename from java/src/com/jcraft/jzlib/README rename to java/com/jcraft/jzlib/README diff --git a/java/src/com/jcraft/jzlib/StaticTree.java b/java/com/jcraft/jzlib/StaticTree.java similarity index 100% rename from java/src/com/jcraft/jzlib/StaticTree.java rename to java/com/jcraft/jzlib/StaticTree.java diff --git a/java/src/com/jcraft/jzlib/Tree.java b/java/com/jcraft/jzlib/Tree.java similarity index 100% rename from java/src/com/jcraft/jzlib/Tree.java rename to java/com/jcraft/jzlib/Tree.java diff --git a/java/src/com/jcraft/jzlib/ZInputStream.java b/java/com/jcraft/jzlib/ZInputStream.java similarity index 100% rename from java/src/com/jcraft/jzlib/ZInputStream.java rename to java/com/jcraft/jzlib/ZInputStream.java diff --git a/java/src/com/jcraft/jzlib/ZOutputStream.java b/java/com/jcraft/jzlib/ZOutputStream.java similarity index 100% rename from java/src/com/jcraft/jzlib/ZOutputStream.java rename to java/com/jcraft/jzlib/ZOutputStream.java diff --git a/java/src/com/jcraft/jzlib/ZStream.java b/java/com/jcraft/jzlib/ZStream.java similarity index 100% rename from java/src/com/jcraft/jzlib/ZStream.java rename to java/com/jcraft/jzlib/ZStream.java diff --git a/java/src/com/jcraft/jzlib/ZStreamException.java b/java/com/jcraft/jzlib/ZStreamException.java similarity index 100% rename from java/src/com/jcraft/jzlib/ZStreamException.java rename to java/com/jcraft/jzlib/ZStreamException.java diff --git a/java/src/com/tigervnc/rdr/EndOfStream.java b/java/com/tigervnc/rdr/EndOfStream.java similarity index 100% rename from java/src/com/tigervnc/rdr/EndOfStream.java rename to java/com/tigervnc/rdr/EndOfStream.java diff --git a/java/src/com/tigervnc/rdr/Exception.java b/java/com/tigervnc/rdr/Exception.java similarity index 100% rename from java/src/com/tigervnc/rdr/Exception.java rename to java/com/tigervnc/rdr/Exception.java diff --git a/java/src/com/tigervnc/rdr/IOException.java b/java/com/tigervnc/rdr/IOException.java similarity index 100% rename from java/src/com/tigervnc/rdr/IOException.java rename to java/com/tigervnc/rdr/IOException.java diff --git a/java/src/com/tigervnc/rdr/InStream.java b/java/com/tigervnc/rdr/InStream.java similarity index 100% rename from java/src/com/tigervnc/rdr/InStream.java rename to java/com/tigervnc/rdr/InStream.java diff --git a/java/src/com/tigervnc/rdr/JavaInStream.java b/java/com/tigervnc/rdr/JavaInStream.java similarity index 100% rename from java/src/com/tigervnc/rdr/JavaInStream.java rename to java/com/tigervnc/rdr/JavaInStream.java diff --git a/java/src/com/tigervnc/rdr/JavaOutStream.java b/java/com/tigervnc/rdr/JavaOutStream.java similarity index 100% rename from java/src/com/tigervnc/rdr/JavaOutStream.java rename to java/com/tigervnc/rdr/JavaOutStream.java diff --git a/java/src/com/tigervnc/rdr/MemInStream.java b/java/com/tigervnc/rdr/MemInStream.java similarity index 100% rename from java/src/com/tigervnc/rdr/MemInStream.java rename to java/com/tigervnc/rdr/MemInStream.java diff --git a/java/src/com/tigervnc/rdr/MemOutStream.java b/java/com/tigervnc/rdr/MemOutStream.java similarity index 100% rename from java/src/com/tigervnc/rdr/MemOutStream.java rename to java/com/tigervnc/rdr/MemOutStream.java diff --git a/java/src/com/tigervnc/rdr/OutStream.java b/java/com/tigervnc/rdr/OutStream.java similarity index 100% rename from java/src/com/tigervnc/rdr/OutStream.java rename to java/com/tigervnc/rdr/OutStream.java diff --git a/java/src/com/tigervnc/rdr/ZlibInStream.java b/java/com/tigervnc/rdr/ZlibInStream.java similarity index 100% rename from java/src/com/tigervnc/rdr/ZlibInStream.java rename to java/com/tigervnc/rdr/ZlibInStream.java diff --git a/java/src/com/tigervnc/rfb/AliasParameter.java b/java/com/tigervnc/rfb/AliasParameter.java similarity index 100% rename from java/src/com/tigervnc/rfb/AliasParameter.java rename to java/com/tigervnc/rfb/AliasParameter.java diff --git a/java/src/com/tigervnc/rfb/AuthFailureException.java b/java/com/tigervnc/rfb/AuthFailureException.java similarity index 100% rename from java/src/com/tigervnc/rfb/AuthFailureException.java rename to java/com/tigervnc/rfb/AuthFailureException.java diff --git a/java/src/com/tigervnc/rfb/BoolParameter.java b/java/com/tigervnc/rfb/BoolParameter.java similarity index 100% rename from java/src/com/tigervnc/rfb/BoolParameter.java rename to java/com/tigervnc/rfb/BoolParameter.java diff --git a/java/src/com/tigervnc/rfb/CConnection.java b/java/com/tigervnc/rfb/CConnection.java similarity index 100% rename from java/src/com/tigervnc/rfb/CConnection.java rename to java/com/tigervnc/rfb/CConnection.java diff --git a/java/src/com/tigervnc/rfb/CMsgHandler.java b/java/com/tigervnc/rfb/CMsgHandler.java similarity index 100% rename from java/src/com/tigervnc/rfb/CMsgHandler.java rename to java/com/tigervnc/rfb/CMsgHandler.java diff --git a/java/src/com/tigervnc/rfb/CMsgReader.java b/java/com/tigervnc/rfb/CMsgReader.java similarity index 100% rename from java/src/com/tigervnc/rfb/CMsgReader.java rename to java/com/tigervnc/rfb/CMsgReader.java diff --git a/java/src/com/tigervnc/rfb/CMsgReaderV3.java b/java/com/tigervnc/rfb/CMsgReaderV3.java similarity index 100% rename from java/src/com/tigervnc/rfb/CMsgReaderV3.java rename to java/com/tigervnc/rfb/CMsgReaderV3.java diff --git a/java/src/com/tigervnc/rfb/CMsgWriter.java b/java/com/tigervnc/rfb/CMsgWriter.java similarity index 100% rename from java/src/com/tigervnc/rfb/CMsgWriter.java rename to java/com/tigervnc/rfb/CMsgWriter.java diff --git a/java/src/com/tigervnc/rfb/CMsgWriterV3.java b/java/com/tigervnc/rfb/CMsgWriterV3.java similarity index 100% rename from java/src/com/tigervnc/rfb/CMsgWriterV3.java rename to java/com/tigervnc/rfb/CMsgWriterV3.java diff --git a/java/src/com/tigervnc/rfb/CSecurity.java b/java/com/tigervnc/rfb/CSecurity.java similarity index 100% rename from java/src/com/tigervnc/rfb/CSecurity.java rename to java/com/tigervnc/rfb/CSecurity.java diff --git a/java/src/com/tigervnc/rfb/CSecurityIdent.java b/java/com/tigervnc/rfb/CSecurityIdent.java similarity index 100% rename from java/src/com/tigervnc/rfb/CSecurityIdent.java rename to java/com/tigervnc/rfb/CSecurityIdent.java diff --git a/java/src/com/tigervnc/rfb/CSecurityManaged.java b/java/com/tigervnc/rfb/CSecurityManaged.java similarity index 100% rename from java/src/com/tigervnc/rfb/CSecurityManaged.java rename to java/com/tigervnc/rfb/CSecurityManaged.java diff --git a/java/src/com/tigervnc/rfb/CSecurityNone.java b/java/com/tigervnc/rfb/CSecurityNone.java similarity index 100% rename from java/src/com/tigervnc/rfb/CSecurityNone.java rename to java/com/tigervnc/rfb/CSecurityNone.java diff --git a/java/src/com/tigervnc/rfb/CSecurityPlain.java b/java/com/tigervnc/rfb/CSecurityPlain.java similarity index 100% rename from java/src/com/tigervnc/rfb/CSecurityPlain.java rename to java/com/tigervnc/rfb/CSecurityPlain.java diff --git a/java/src/com/tigervnc/rfb/CSecurityStack.java b/java/com/tigervnc/rfb/CSecurityStack.java similarity index 100% rename from java/src/com/tigervnc/rfb/CSecurityStack.java rename to java/com/tigervnc/rfb/CSecurityStack.java diff --git a/java/src/com/tigervnc/rfb/CSecurityTLS.java b/java/com/tigervnc/rfb/CSecurityTLS.java similarity index 100% rename from java/src/com/tigervnc/rfb/CSecurityTLS.java rename to java/com/tigervnc/rfb/CSecurityTLS.java diff --git a/java/src/com/tigervnc/rfb/CSecurityVeNCrypt.java b/java/com/tigervnc/rfb/CSecurityVeNCrypt.java similarity index 100% rename from java/src/com/tigervnc/rfb/CSecurityVeNCrypt.java rename to java/com/tigervnc/rfb/CSecurityVeNCrypt.java diff --git a/java/src/com/tigervnc/rfb/CSecurityVncAuth.java b/java/com/tigervnc/rfb/CSecurityVncAuth.java similarity index 100% rename from java/src/com/tigervnc/rfb/CSecurityVncAuth.java rename to java/com/tigervnc/rfb/CSecurityVncAuth.java diff --git a/java/src/com/tigervnc/rfb/Configuration.java b/java/com/tigervnc/rfb/Configuration.java similarity index 100% rename from java/src/com/tigervnc/rfb/Configuration.java rename to java/com/tigervnc/rfb/Configuration.java diff --git a/java/src/com/tigervnc/rfb/ConnFailedException.java b/java/com/tigervnc/rfb/ConnFailedException.java similarity index 100% rename from java/src/com/tigervnc/rfb/ConnFailedException.java rename to java/com/tigervnc/rfb/ConnFailedException.java diff --git a/java/src/com/tigervnc/rfb/ConnParams.java b/java/com/tigervnc/rfb/ConnParams.java similarity index 100% rename from java/src/com/tigervnc/rfb/ConnParams.java rename to java/com/tigervnc/rfb/ConnParams.java diff --git a/java/src/com/tigervnc/rfb/Cursor.java b/java/com/tigervnc/rfb/Cursor.java similarity index 100% rename from java/src/com/tigervnc/rfb/Cursor.java rename to java/com/tigervnc/rfb/Cursor.java diff --git a/java/src/com/tigervnc/rfb/Decoder.java b/java/com/tigervnc/rfb/Decoder.java similarity index 100% rename from java/src/com/tigervnc/rfb/Decoder.java rename to java/com/tigervnc/rfb/Decoder.java diff --git a/java/src/com/tigervnc/rfb/DesCipher.java b/java/com/tigervnc/rfb/DesCipher.java similarity index 100% rename from java/src/com/tigervnc/rfb/DesCipher.java rename to java/com/tigervnc/rfb/DesCipher.java diff --git a/java/src/com/tigervnc/rfb/Encoder.java b/java/com/tigervnc/rfb/Encoder.java similarity index 100% rename from java/src/com/tigervnc/rfb/Encoder.java rename to java/com/tigervnc/rfb/Encoder.java diff --git a/java/src/com/tigervnc/rfb/Encodings.java b/java/com/tigervnc/rfb/Encodings.java similarity index 100% rename from java/src/com/tigervnc/rfb/Encodings.java rename to java/com/tigervnc/rfb/Encodings.java diff --git a/java/src/com/tigervnc/rfb/Exception.java b/java/com/tigervnc/rfb/Exception.java similarity index 100% rename from java/src/com/tigervnc/rfb/Exception.java rename to java/com/tigervnc/rfb/Exception.java diff --git a/java/src/com/tigervnc/rfb/Hextile.java b/java/com/tigervnc/rfb/Hextile.java similarity index 100% rename from java/src/com/tigervnc/rfb/Hextile.java rename to java/com/tigervnc/rfb/Hextile.java diff --git a/java/src/com/tigervnc/rfb/HextileDecoder.java b/java/com/tigervnc/rfb/HextileDecoder.java similarity index 100% rename from java/src/com/tigervnc/rfb/HextileDecoder.java rename to java/com/tigervnc/rfb/HextileDecoder.java diff --git a/java/src/com/tigervnc/rfb/Hostname.java b/java/com/tigervnc/rfb/Hostname.java similarity index 100% rename from java/src/com/tigervnc/rfb/Hostname.java rename to java/com/tigervnc/rfb/Hostname.java diff --git a/java/src/com/tigervnc/rfb/IntParameter.java b/java/com/tigervnc/rfb/IntParameter.java similarity index 100% rename from java/src/com/tigervnc/rfb/IntParameter.java rename to java/com/tigervnc/rfb/IntParameter.java diff --git a/java/src/com/tigervnc/rfb/Keysyms.java b/java/com/tigervnc/rfb/Keysyms.java similarity index 100% rename from java/src/com/tigervnc/rfb/Keysyms.java rename to java/com/tigervnc/rfb/Keysyms.java diff --git a/java/src/com/tigervnc/rfb/LogWriter.java b/java/com/tigervnc/rfb/LogWriter.java similarity index 100% rename from java/src/com/tigervnc/rfb/LogWriter.java rename to java/com/tigervnc/rfb/LogWriter.java diff --git a/java/src/com/tigervnc/rfb/ManagedPixelBuffer.java b/java/com/tigervnc/rfb/ManagedPixelBuffer.java similarity index 100% rename from java/src/com/tigervnc/rfb/ManagedPixelBuffer.java rename to java/com/tigervnc/rfb/ManagedPixelBuffer.java diff --git a/java/src/com/tigervnc/rfb/MsgTypes.java b/java/com/tigervnc/rfb/MsgTypes.java similarity index 100% rename from java/src/com/tigervnc/rfb/MsgTypes.java rename to java/com/tigervnc/rfb/MsgTypes.java diff --git a/java/src/com/tigervnc/rfb/PixelBuffer.java b/java/com/tigervnc/rfb/PixelBuffer.java similarity index 100% rename from java/src/com/tigervnc/rfb/PixelBuffer.java rename to java/com/tigervnc/rfb/PixelBuffer.java diff --git a/java/src/com/tigervnc/rfb/PixelFormat.java b/java/com/tigervnc/rfb/PixelFormat.java similarity index 100% rename from java/src/com/tigervnc/rfb/PixelFormat.java rename to java/com/tigervnc/rfb/PixelFormat.java diff --git a/java/src/com/tigervnc/rfb/Point.java b/java/com/tigervnc/rfb/Point.java similarity index 100% rename from java/src/com/tigervnc/rfb/Point.java rename to java/com/tigervnc/rfb/Point.java diff --git a/java/src/com/tigervnc/rfb/RREDecoder.java b/java/com/tigervnc/rfb/RREDecoder.java similarity index 100% rename from java/src/com/tigervnc/rfb/RREDecoder.java rename to java/com/tigervnc/rfb/RREDecoder.java diff --git a/java/src/com/tigervnc/rfb/RawDecoder.java b/java/com/tigervnc/rfb/RawDecoder.java similarity index 100% rename from java/src/com/tigervnc/rfb/RawDecoder.java rename to java/com/tigervnc/rfb/RawDecoder.java diff --git a/java/src/com/tigervnc/rfb/Rect.java b/java/com/tigervnc/rfb/Rect.java similarity index 100% rename from java/src/com/tigervnc/rfb/Rect.java rename to java/com/tigervnc/rfb/Rect.java diff --git a/java/src/com/tigervnc/rfb/Screen.java b/java/com/tigervnc/rfb/Screen.java similarity index 100% rename from java/src/com/tigervnc/rfb/Screen.java rename to java/com/tigervnc/rfb/Screen.java diff --git a/java/src/com/tigervnc/rfb/ScreenSet.java b/java/com/tigervnc/rfb/ScreenSet.java similarity index 100% rename from java/src/com/tigervnc/rfb/ScreenSet.java rename to java/com/tigervnc/rfb/ScreenSet.java diff --git a/java/src/com/tigervnc/rfb/Security.java b/java/com/tigervnc/rfb/Security.java similarity index 100% rename from java/src/com/tigervnc/rfb/Security.java rename to java/com/tigervnc/rfb/Security.java diff --git a/java/src/com/tigervnc/rfb/SecurityClient.java b/java/com/tigervnc/rfb/SecurityClient.java similarity index 100% rename from java/src/com/tigervnc/rfb/SecurityClient.java rename to java/com/tigervnc/rfb/SecurityClient.java diff --git a/java/src/com/tigervnc/rfb/StringParameter.java b/java/com/tigervnc/rfb/StringParameter.java similarity index 100% rename from java/src/com/tigervnc/rfb/StringParameter.java rename to java/com/tigervnc/rfb/StringParameter.java diff --git a/java/src/com/tigervnc/rfb/TightDecoder.java b/java/com/tigervnc/rfb/TightDecoder.java similarity index 100% rename from java/src/com/tigervnc/rfb/TightDecoder.java rename to java/com/tigervnc/rfb/TightDecoder.java diff --git a/java/src/com/tigervnc/rfb/UnicodeToKeysym.java b/java/com/tigervnc/rfb/UnicodeToKeysym.java similarity index 100% rename from java/src/com/tigervnc/rfb/UnicodeToKeysym.java rename to java/com/tigervnc/rfb/UnicodeToKeysym.java diff --git a/java/src/com/tigervnc/rfb/UserMsgBox.java b/java/com/tigervnc/rfb/UserMsgBox.java similarity index 100% rename from java/src/com/tigervnc/rfb/UserMsgBox.java rename to java/com/tigervnc/rfb/UserMsgBox.java diff --git a/java/src/com/tigervnc/rfb/UserPasswdGetter.java b/java/com/tigervnc/rfb/UserPasswdGetter.java similarity index 100% rename from java/src/com/tigervnc/rfb/UserPasswdGetter.java rename to java/com/tigervnc/rfb/UserPasswdGetter.java diff --git a/java/src/com/tigervnc/rfb/VncAuth.java b/java/com/tigervnc/rfb/VncAuth.java similarity index 100% rename from java/src/com/tigervnc/rfb/VncAuth.java rename to java/com/tigervnc/rfb/VncAuth.java diff --git a/java/src/com/tigervnc/rfb/VoidParameter.java b/java/com/tigervnc/rfb/VoidParameter.java similarity index 100% rename from java/src/com/tigervnc/rfb/VoidParameter.java rename to java/com/tigervnc/rfb/VoidParameter.java diff --git a/java/src/com/tigervnc/rfb/ZRLEDecoder.java b/java/com/tigervnc/rfb/ZRLEDecoder.java similarity index 100% rename from java/src/com/tigervnc/rfb/ZRLEDecoder.java rename to java/com/tigervnc/rfb/ZRLEDecoder.java diff --git a/java/src/com/tigervnc/rfb/screenTypes.java b/java/com/tigervnc/rfb/screenTypes.java similarity index 100% rename from java/src/com/tigervnc/rfb/screenTypes.java rename to java/com/tigervnc/rfb/screenTypes.java diff --git a/java/src/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java similarity index 100% rename from java/src/com/tigervnc/vncviewer/CConn.java rename to java/com/tigervnc/vncviewer/CConn.java diff --git a/java/src/com/tigervnc/vncviewer/ClipboardDialog.java b/java/com/tigervnc/vncviewer/ClipboardDialog.java similarity index 100% rename from java/src/com/tigervnc/vncviewer/ClipboardDialog.java rename to java/com/tigervnc/vncviewer/ClipboardDialog.java diff --git a/java/src/com/tigervnc/vncviewer/DesktopWindow.java b/java/com/tigervnc/vncviewer/DesktopWindow.java similarity index 100% rename from java/src/com/tigervnc/vncviewer/DesktopWindow.java rename to java/com/tigervnc/vncviewer/DesktopWindow.java diff --git a/java/src/com/tigervnc/vncviewer/Dialog.java b/java/com/tigervnc/vncviewer/Dialog.java similarity index 100% rename from java/src/com/tigervnc/vncviewer/Dialog.java rename to java/com/tigervnc/vncviewer/Dialog.java diff --git a/java/src/com/tigervnc/vncviewer/F8Menu.java b/java/com/tigervnc/vncviewer/F8Menu.java similarity index 100% rename from java/src/com/tigervnc/vncviewer/F8Menu.java rename to java/com/tigervnc/vncviewer/F8Menu.java diff --git a/java/src/com/tigervnc/vncviewer/LICENCE.TXT b/java/com/tigervnc/vncviewer/LICENCE.TXT similarity index 100% rename from java/src/com/tigervnc/vncviewer/LICENCE.TXT rename to java/com/tigervnc/vncviewer/LICENCE.TXT diff --git a/java/src/com/tigervnc/vncviewer/MANIFEST.MF b/java/com/tigervnc/vncviewer/MANIFEST.MF similarity index 100% rename from java/src/com/tigervnc/vncviewer/MANIFEST.MF rename to java/com/tigervnc/vncviewer/MANIFEST.MF diff --git a/java/src/com/tigervnc/vncviewer/OptionsDialog.java b/java/com/tigervnc/vncviewer/OptionsDialog.java similarity index 100% rename from java/src/com/tigervnc/vncviewer/OptionsDialog.java rename to java/com/tigervnc/vncviewer/OptionsDialog.java diff --git a/java/src/com/tigervnc/vncviewer/OptionsDialogCallback.java b/java/com/tigervnc/vncviewer/OptionsDialogCallback.java similarity index 100% rename from java/src/com/tigervnc/vncviewer/OptionsDialogCallback.java rename to java/com/tigervnc/vncviewer/OptionsDialogCallback.java diff --git a/java/src/com/tigervnc/vncviewer/PasswdDialog.java b/java/com/tigervnc/vncviewer/PasswdDialog.java similarity index 100% rename from java/src/com/tigervnc/vncviewer/PasswdDialog.java rename to java/com/tigervnc/vncviewer/PasswdDialog.java diff --git a/java/src/com/tigervnc/vncviewer/PixelBufferImage.java b/java/com/tigervnc/vncviewer/PixelBufferImage.java similarity index 100% rename from java/src/com/tigervnc/vncviewer/PixelBufferImage.java rename to java/com/tigervnc/vncviewer/PixelBufferImage.java diff --git a/java/src/com/tigervnc/vncviewer/README b/java/com/tigervnc/vncviewer/README similarity index 100% rename from java/src/com/tigervnc/vncviewer/README rename to java/com/tigervnc/vncviewer/README diff --git a/java/src/com/tigervnc/vncviewer/ServerDialog.java b/java/com/tigervnc/vncviewer/ServerDialog.java similarity index 100% rename from java/src/com/tigervnc/vncviewer/ServerDialog.java rename to java/com/tigervnc/vncviewer/ServerDialog.java diff --git a/java/src/com/tigervnc/vncviewer/UserPrefs.java b/java/com/tigervnc/vncviewer/UserPrefs.java similarity index 100% rename from java/src/com/tigervnc/vncviewer/UserPrefs.java rename to java/com/tigervnc/vncviewer/UserPrefs.java diff --git a/java/src/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java similarity index 100% rename from java/src/com/tigervnc/vncviewer/VncViewer.java rename to java/com/tigervnc/vncviewer/VncViewer.java diff --git a/java/src/com/tigervnc/vncviewer/index.html b/java/com/tigervnc/vncviewer/index.html similarity index 100% rename from java/src/com/tigervnc/vncviewer/index.html rename to java/com/tigervnc/vncviewer/index.html diff --git a/java/src/com/tigervnc/vncviewer/index.vnc b/java/com/tigervnc/vncviewer/index.vnc similarity index 100% rename from java/src/com/tigervnc/vncviewer/index.vnc rename to java/com/tigervnc/vncviewer/index.vnc diff --git a/java/src/com/tigervnc/vncviewer/tigervnc.ico b/java/com/tigervnc/vncviewer/tigervnc.ico similarity index 100% rename from java/src/com/tigervnc/vncviewer/tigervnc.ico rename to java/com/tigervnc/vncviewer/tigervnc.ico diff --git a/java/src/com/tigervnc/vncviewer/tigervnc.png b/java/com/tigervnc/vncviewer/tigervnc.png similarity index 100% rename from java/src/com/tigervnc/vncviewer/tigervnc.png rename to java/com/tigervnc/vncviewer/tigervnc.png diff --git a/java/src/com/tigervnc/vncviewer/timestamp.in b/java/com/tigervnc/vncviewer/timestamp.in similarity index 100% rename from java/src/com/tigervnc/vncviewer/timestamp.in rename to java/com/tigervnc/vncviewer/timestamp.in diff --git a/win/winvnc/CMakeLists.txt b/win/winvnc/CMakeLists.txt index 6b873c71..3b576a7b 100644 --- a/win/winvnc/CMakeLists.txt +++ b/win/winvnc/CMakeLists.txt @@ -31,7 +31,7 @@ target_link_libraries(winvnc4 rfb rfb_win32 Xregion network rdr ws2_32.lib) if(BUILD_JAVA) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/winvnc.rc - PROPERTIES OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/java/src/VncViewer.jar) + PROPERTIES OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/java/VncViewer.jar) endif() install(TARGETS winvnc4 diff --git a/win/winvnc/winvnc.rc.in b/win/winvnc/winvnc.rc.in index 857f077a..3c484ed7 100644 --- a/win/winvnc/winvnc.rc.in +++ b/win/winvnc/winvnc.rc.in @@ -223,7 +223,7 @@ END #cmakedefine BUILD_JAVA #ifdef BUILD_JAVA -/VNCVIEWER.JAR HTTPFILE DISCARDABLE "@CMAKE_WIN_BINARY_DIR@\\java\\src\\VncViewer.jar" +/VNCVIEWER.JAR HTTPFILE DISCARDABLE "@CMAKE_WIN_BINARY_DIR@\\java\\VncViewer.jar" /INDEX.VNC HTTPFILE DISCARDABLE "@CMAKE_WIN_SOURCE_DIR@\\win\\winvnc\\index.vnc" #endif -- 2.39.5