Fix JAR file so that Java viewer can be run without a web server

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_0@4114 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/java/src/com/tigervnc/vncviewer/MANIFEST.MF b/java/src/com/tigervnc/vncviewer/MANIFEST.MF
index 9ddbfbcc23580d79253ea1eab0204c7483b263eb..b3574fe210a0b1c540916b29d433769ba7e2f2db 100644 (file)
--- a/java/src/com/tigervnc/vncviewer/MANIFEST.MF
+++ b/java/src/com/tigervnc/vncviewer/MANIFEST.MF
@@ -1,2 +1,2 @@
 Manifest-Version: 1.0
-Main-Class: VncViewer
+Main-Class: com.tigervnc.vncviewer.VncViewer

diff --git a/java/src/com/tigervnc/vncviewer/Makefile b/java/src/com/tigervnc/vncviewer/Makefile
index 01cf48b1d1c21875a2e73bdc6e100a67a340cffc..46752ab17f630765548a7b9cf269aa50ad6cff62 100644 (file)
--- a/java/src/com/tigervnc/vncviewer/Makefile
+++ b/java/src/com/tigervnc/vncviewer/Makefile
@@ -35,7 +35,12 @@ $(CLASSES): $(SOURCES)
        $(JC) $(JCFLAGS) -O $(SOURCES)
 
 $(ARCHIVE): $(CLASSES) $(MANIFEST)
-       $(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES)
+       cd ../../..; \
+       $(JAR) cfm com/tigervnc/vncviewer/$(ARCHIVE) \
+               com/tigervnc/vncviewer/$(MANIFEST) \
+               com/tigervnc/vncviewer/*.class \
+               com/tigervnc/decoder/*.class \
+               com/tigervnc/decoder/common/*.class
 
 install: $(CLASSES) $(ARCHIVE)
        $(CP) $(CLASSES) $(ARCHIVE) $(PAGES) $(INSTALL_DIR)
@@ -44,4 +49,4 @@ export:: $(CLASSES) $(ARCHIVE) $(PAGES)
        @$(ExportJavaClasses)
 
 clean::
-       $(RM) *.class *.jar
+       $(RM) *.class *.jar ../decoder/*.class ../decoder/common/*.class

diff --git a/java/src/com/tigervnc/vncviewer/index.html b/java/src/com/tigervnc/vncviewer/index.html
index 96805dc57f6f19ed5124a2408fe2f0c861d76539..a582b2d044db03770fda98acf4af8d3e032f9460 100644 (file)
--- a/java/src/com/tigervnc/vncviewer/index.html
+++ b/java/src/com/tigervnc/vncviewer/index.html
@@ -20,7 +20,7 @@
 <TITLE>
 TigerVNC desktop
 </TITLE>
-<APPLET CODE="VncViewer.class" ARCHIVE="VncViewer.jar"
+<APPLET CODE="com.tigervnc.vncviewer.VncViewer" ARCHIVE="VncViewer.jar"
         WIDTH="800" HEIGHT="632">
 <PARAM NAME="PORT" VALUE="5901">
 </APPLET>

diff --git a/java/src/com/tigervnc/vncviewer/index.vnc b/java/src/com/tigervnc/vncviewer/index.vnc
index f24df7c5576e32ed98f1df2f0b0308beaed34525..ba9e57c993d9229c75fcd26155f08b38d9118aae 100644 (file)
--- a/java/src/com/tigervnc/vncviewer/index.vnc
+++ b/java/src/com/tigervnc/vncviewer/index.vnc
@@ -15,7 +15,7 @@
 <TITLE>
 $USER's $DESKTOP desktop ($DISPLAY)
 </TITLE>
-<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar
+<APPLET CODE=com.tigervnc.vncviewer.VncViewer ARCHIVE=VncViewer.jar
         WIDTH=$APPLETWIDTH HEIGHT=$APPLETHEIGHT>
 <param name=PORT value=$PORT>
 $PARAMS