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

@@ -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

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

java/src/CMakeLists.txt → 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)