Mercurial > hg > Members > you > TreeVNC

changeset 26:cbbdabc7645f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove Makefile dir
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Mon, 23 Jan 2012 20:49:46 +0900
parents 3fca497f5f5b
children 41b2e2ebcff2
files Makefile/MANIFEST.MF Makefile/MANIFEST.MF~ Makefile/MANIFEST2.MF Makefile/MANIFEST3.MF Makefile/Makefile build.xml src/CuiMyVncClient.MF src/TreeVnc.MF src/treeVnc/GetBroadCastClient.java src/treeVnc/GetBroadCastProxy.java src/treeVnc/MyVncClient.java src/treeVnc/SelectType.java src/treeVnc/TextBoxClient.java
diffstat 13 files changed, 25 insertions(+), 87 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile/MANIFEST.MF	Mon Jan 23 20:28:44 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.8.2
-Created-By: 1.6.0_24-b07-334-10M3326 (Apple Inc.)
-Main-Class: treeVnc.TreeVnc
--- a/Makefile/MANIFEST.MF~	Mon Jan 23 20:28:44 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.8.2
-Created-By: 1.6.0_24-b07-334-10M3326 (Apple Inc.)
-Main-Class: myVncClient.MyVncClient
--- a/Makefile/MANIFEST2.MF	Mon Jan 23 20:28:44 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.8.2
-Created-By: 1.6.0_24-b07-334-10M3326 (Apple Inc.)
-Main-Class: myVncClient.VncViewer
--- a/Makefile/MANIFEST3.MF	Mon Jan 23 20:28:44 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.8.2
-Created-By: 1.6.0_24-b07-334-10M3326 (Apple Inc.)
-Main-Class: myVncClient.CuiMyVncClient
--- a/Makefile/Makefile	Mon Jan 23 20:28:44 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-# Making the VNC applet.
-#
-
-CP = cp
-JC = javac
-JCFLAGS = -target 1.5 -source 5 -J-Dfile.encoding=UTF8
-JAR = jar
-ARCHIVE = VncViewer.jar
-MANIFEST = MANIFEST.MF
-PAGES = index.vnc
-INSTALL_DIR = /usr/local/vnc/classes
-
-CLASSES = VncViewer.class RfbProto.class AuthPanel.class VncCanvas.class \
-	  VncCanvas2.class \
-	  OptionsFrame.class ClipboardFrame.class ButtonPanel.class \
-	  DesCipher.class CapabilityInfo.class CapsContainer.class \
-	  RecordingFrame.class SessionRecorder.class \
-	  SocketFactory.class HTTPConnectSocketFactory.class \
-	  HTTPConnectSocket.class ReloginPanel.class \
-	  InStream.class MemInStream.class ZlibInStream.class \
-      MyRfbProto.class acceptThread.class 
-
-SOURCES = VncViewer.java RfbProto.java AuthPanel.java VncCanvas.java \
-	  VncCanvas2.java \
-	  OptionsFrame.java ClipboardFrame.java ButtonPanel.java \
-	  DesCipher.java CapabilityInfo.java CapsContainer.java \
-	  RecordingFrame.java SessionRecorder.java \
-	  SocketFactory.java HTTPConnectSocketFactory.java \
-	  HTTPConnectSocket.java ReloginPanel.java \
-	  InStream.java MemInStream.java ZlibInStream.java \
-      MyRfbProto.java acceptThread.java 
-
-
-all: $(CLASSES) $(ARCHIVE)
-
-$(CLASSES): $(SOURCES)
-	$(JC) $(JCFLAGS) -O $(SOURCES)
-
-$(ARCHIVE): $(CLASSES) $(MANIFEST)
-	$(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES)
-
-install: $(CLASSES) $(ARCHIVE)
-	$(CP) $(CLASSES) $(ARCHIVE) $(PAGES) $(INSTALL_DIR)
-
-export:: $(CLASSES) $(ARCHIVE) $(PAGES)
-	@$(ExportJavaClasses)
-
-clean::
-	$(RM) *.class *.jar
--- a/build.xml	Mon Jan 23 20:28:44 2012 +0900
+++ b/build.xml	Mon Jan 23 20:49:46 2012 +0900
@@ -5,24 +5,27 @@
 	<property name="dir" value="./bin/" />
 	<property name="mfdir" value="./Makefile/" />
 
-	<target name="all" depends="init,compile,mkjar" />
-
-	<target name="init">
-		<mkdir dir="${dir}" />
-	</target>
+	<target name="all" depends="compile,jar" />
 
 
-	<target name="compile">
-		<javac srcdir="${source}" destdir="${dir}" />
-	</target>
+      <target name="compile">
+        <mkdir dir="${dir}" />
+        <javac encoding="UTF-8" srcdir="src" destdir="${dir}" fork="yes" includeantruntime="false">
+            <compilerarg value="-J-Dfile.encoding=UTF8"/>
+            <sourcepath>
+             <pathelement path="src"/>
+            </sourcepath>
+        </javac>
+      </target>
 
-	<target name="mkjar">
-		<jar jarfile="TreeVnc.jar" basedir="${dir}" manifest="${mfdir}MANIFEST.MF">
+
+	<target name="jar">
+		<jar jarfile="TreeVnc.jar" basedir="${dir}" manifest="${source}TreeVnc.MF">
 		</jar>
-		<jar jarfile="VncViewer.jar" basedir="${dir}" manifest="${mfdir}MANIFEST2.MF">
-		</jar>
-        <jar jarfile="CuiMyVncClient.jar" basedir="${dir}" manifest="${mfdir}MANIFEST3.MF">
-	</jar>
+	</target>
+	<target name="cui-jar">
+                <jar jarfile="CuiMyVncClient.jar" basedir="${dir}" manifest="${source}CuiMyVncClient.MF">
+                </jar>
 	</target>
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/CuiMyVncClient.MF	Mon Jan 23 20:49:46 2012 +0900
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.8.2
+Created-By: 1.6.0_24-b07-334-10M3326 (Apple Inc.)
+Main-Class: myVncClient.CuiMyVncClient
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/TreeVnc.MF	Mon Jan 23 20:49:46 2012 +0900
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.8.2
+Created-By: 1.6.0_24-b07-334-10M3326 (Apple Inc.)
+Main-Class: treeVnc.TreeVnc
--- a/src/treeVnc/GetBroadCastClient.java	Mon Jan 23 20:28:44 2012 +0900
+++ b/src/treeVnc/GetBroadCastClient.java	Mon Jan 23 20:49:46 2012 +0900
@@ -66,7 +66,6 @@
 	}
 	*/
 	
-	@Override
 	public void run() {
 		getData();
 	}
--- a/src/treeVnc/GetBroadCastProxy.java	Mon Jan 23 20:28:44 2012 +0900
+++ b/src/treeVnc/GetBroadCastProxy.java	Mon Jan 23 20:49:46 2012 +0900
@@ -74,7 +74,6 @@
 	}
 	
 	
-	@Override
 	public void run() {
 		getData();
 	}
--- a/src/treeVnc/MyVncClient.java	Mon Jan 23 20:28:44 2012 +0900
+++ b/src/treeVnc/MyVncClient.java	Mon Jan 23 20:49:46 2012 +0900
@@ -1239,9 +1239,7 @@
 		vncFrame.dispose();
 	}
 
-	@Override
 	public Image getScreenImage() {
-//		return vc.memImage;
 		return vc.rawPixelsImage;
 	}
 	
--- a/src/treeVnc/SelectType.java	Mon Jan 23 20:28:44 2012 +0900
+++ b/src/treeVnc/SelectType.java	Mon Jan 23 20:49:46 2012 +0900
@@ -76,8 +76,6 @@
         setButton();
 	}
 	
-	
-	@Override
 	public void actionPerformed(ActionEvent e) {
 		if(check[0].getState()){
 			System.out.println("Client");
--- a/src/treeVnc/TextBoxClient.java	Mon Jan 23 20:28:44 2012 +0900
+++ b/src/treeVnc/TextBoxClient.java	Mon Jan 23 20:49:46 2012 +0900
@@ -191,7 +191,6 @@
 		return null;
 	}
 
-	@Override
 	public void itemStateChanged(ItemEvent e) {
 	}
 }