diff options
| author | DRC <dcommander@users.sourceforge.net> | 2010-08-03 04:33:42 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2010-08-03 04:33:42 +0000 |
| commit | 2d9536dbe2fb95dd4370a26325db3af16c833734 (patch) | |
| tree | a1f639040a1bc3ddbf7a58e9b34c7eb43ebe84bc | |
| parent | 2436a05c2c7d164589332a8bdc62f3c191b3a0ed (diff) | |
| download | tigervnc-2d9536dbe2fb95dd4370a26325db3af16c833734.tar.gz tigervnc-2d9536dbe2fb95dd4370a26325db3af16c833734.zip | |
Fix JAR file so that Java viewer can be run without a web server1.0-branch
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_0@4114 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | java/src/com/tigervnc/vncviewer/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | java/src/com/tigervnc/vncviewer/Makefile | 9 | ||||
| -rw-r--r-- | java/src/com/tigervnc/vncviewer/index.html | 2 | ||||
| -rw-r--r-- | java/src/com/tigervnc/vncviewer/index.vnc | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/java/src/com/tigervnc/vncviewer/MANIFEST.MF b/java/src/com/tigervnc/vncviewer/MANIFEST.MF index 9ddbfbcc..b3574fe2 100644 --- 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 01cf48b1..46752ab1 100644 --- 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 96805dc5..a582b2d0 100644 --- 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 f24df7c5..ba9e57c9 100644 --- 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 |