Revision: 4414
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4414&view=rev
Author: bphinz
Date: 2011-05-13 23:33:34 +0000 (Fri, 13 May 2011)
Log Message:
-----------
Update location of resource used to store build timestamp.
Modified Paths:
--------------
trunk/java/src/com/tigervnc/vncviewer/CConn.java
trunk/java/src/com/tigervnc/vncviewer/Makefile
Modified: trunk/java/src/com/tigervnc/vncviewer/CConn.java
===================================================================
--- trunk/java/src/com/tigervnc/vncviewer/CConn.java 2011-05-13 21:42:14 UTC
(rev 4413)
+++ trunk/java/src/com/tigervnc/vncviewer/CConn.java 2011-05-13 23:33:34 UTC
(rev 4414)
@@ -583,14 +583,12 @@
}
void showAbout() {
- InputStream stream = cl.getResourceAsStream("manifest");
- String pkgVersion = "";
+ InputStream stream =
cl.getResourceAsStream("com/tigervnc/vncviewer/timestamp");
String pkgDate = "";
String pkgTime = "";
try {
Manifest manifest = new Manifest(stream);
Attributes attributes = manifest.getMainAttributes();
- pkgVersion = attributes.getValue("Package-Version");
pkgDate = attributes.getValue("Package-Date");
pkgTime = attributes.getValue("Package-Time");
} catch (IOException e) { }
Modified: trunk/java/src/com/tigervnc/vncviewer/Makefile
===================================================================
--- trunk/java/src/com/tigervnc/vncviewer/Makefile 2011-05-13 21:42:14 UTC
(rev 4413)
+++ trunk/java/src/com/tigervnc/vncviewer/Makefile 2011-05-13 23:33:34 UTC
(rev 4414)
@@ -8,8 +8,11 @@
JAR = jar
ARCHIVE = VncViewer.jar
MANIFEST = MANIFEST.MF
+TIMESTAMP = timestamp
PAGES = index.vnc
INSTALL_DIR = /usr/local/vnc/classes
+DATE = $(shell date -u "+%b %d %Y")
+TIME = $(shell date -u "+%H:%M:%S")
CLASSES = CConn.class OptionsDialogCallback.class ClipboardDialog.class \
PasswdDialog.class DesktopWindow.class PixelBufferImage.class \
@@ -26,16 +29,22 @@
$(CLASSES): $(SOURCES)
$(JC) $(JCFLAGS) -O $(SOURCES)
-$(ARCHIVE): $(CLASSES) $(MANIFEST)
+$(ARCHIVE): $(CLASSES) $(MANIFEST) $(TIMESTAMP)
cd ../../..; \
$(JAR) cfm com/tigervnc/vncviewer/$(ARCHIVE) \
com/tigervnc/vncviewer/$(MANIFEST) \
+ com/tigervnc/vncviewer/$(TIMESTAMP) \
com/tigervnc/vncviewer/*.class \
com/tigervnc/rfb/*.class \
com/tigervnc/rdr/*.class \
com/tigervnc/vncviewer/tigervnc.png \
com/tigervnc/vncviewer/tigervnc.ico
+$(TIMESTAMP):
+ $(shell cat $(MANIFEST) >> $(TIMESTAMP))
+ $(shell echo "Package-Date: $(DATE)" >> $(TIMESTAMP))
+ $(shell echo "Package-Time: $(TIME)" >> $(TIMESTAMP))
+
install: $(CLASSES) $(ARCHIVE)
$(CP) $(CLASSES) $(ARCHIVE) $(PAGES) $(INSTALL_DIR)
@@ -43,4 +52,4 @@
@$(ExportJavaClasses)
clean::
- $(RM) *.class *.jar ../rfb/*.class ../rdr/*.class
+ $(RM) *.class *.jar timestamp ../rfb/*.class ../rdr/*.class
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
