From: Brian Hinz Date: Sat, 1 Sep 2012 20:54:12 +0000 (+0000) Subject: Updated copyright notice, fixed build string X-Git-Tag: v1.2.90~96 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5c98b211e3dfdfb4433267095742d83b7925cdca;p=tigervnc.git Updated copyright notice, fixed build string git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4989 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index a157226d..f3215945 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -1,7 +1,9 @@ cmake_minimum_required(VERSION 2.8) project(tigervnc-java Java) -set(VERSION 1.2.80) +if(NOT VERSION) + set(VERSION 1.2.80) +endif() find_package(Java) @@ -14,10 +16,14 @@ set(CLASSPATH com/tigervnc/vncviewer) set(JAVA_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/${CLASSPATH}) set(JAVA_BINDIR ${CMAKE_CURRENT_BINARY_DIR}/${CLASSPATH}) +if(NOT BUILD) + execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE BUILD) +endif() execute_process(COMMAND "date" "+%b %d %Y" OUTPUT_VARIABLE JAVA_DATE) execute_process(COMMAND "date" "+%H:%M:%S" OUTPUT_VARIABLE JAVA_TIME) string(REGEX REPLACE "\n" "" JAVA_DATE ${JAVA_DATE}) string(REGEX REPLACE "\n" "" JAVA_TIME ${JAVA_TIME}) +string(REGEX REPLACE "\n" "" BUILD ${BUILD}) set(JAVA_CLASSNAMES CConn diff --git a/java/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java index b35464d7..8cc9fc63 100644 --- a/java/com/tigervnc/vncviewer/VncViewer.java +++ b/java/com/tigervnc/vncviewer/VncViewer.java @@ -54,7 +54,7 @@ public class VncViewer extends java.applet.Applet implements Runnable { public static final String aboutText = new String("TigerVNC Java Viewer v%s (%s)%n"+ "Built on %s at %s%n"+ - "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)%n"+ + "Copyright (C) 1999-2012 TigerVNC Team and many others (see README.txt)%n"+ "See http://www.tigervnc.org for information on TigerVNC."); public static String version = null;