pydev-cvs — CVS checkin log

[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/model Scope.java,1.6,1.7

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1125/src/org/python/pydev/editor/model

Modified Files:
	Scope.java 
Log Message:
New code completion.

Index: Scope.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/model/Scope.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Scope.java	21 May 2004 18:35:30 -0000	1.6
--- Scope.java	13 Sep 2004 17:11:51 -0000	1.7
***************
*** 75,81 ****
  	
  	void addFunctionDefinition(FunctionNode newDef) {
! 		if (functions == null)
! 			functions = new ArrayList();
! 		functions.add(newDef);
  	}
  	
--- 75,81 ----
  	
  	void addFunctionDefinition(FunctionNode newDef) {
! 		if (getFunctions() == null)
! 			setFunctions(new ArrayList());
! 		getFunctions().add(newDef);
  	}
  	
***************
*** 192,194 ****
--- 192,208 ----
  	}
  
+     /**
+      * @param functions The functions to set.
+      */
+     public void setFunctions(ArrayList functions) {
+         this.functions = functions;
+     }
+ 
+     /**
+      * @return Returns the functions.
+      */
+     public ArrayList getFunctions() {
+         return functions;
+     }
+ 
  }

[Pydev-cvs] org.python.pydev/icons .cvsignore,NONE,1.1

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/icons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1125/icons

Added Files:
	.cvsignore 
Log Message:
New code completion.

--- NEW FILE: .cvsignore ---
Thumbs.db

[Pydev-cvs] org.python.pydev/tests/org/python/pydev/editor/codecompletion PythonShellTest.java,NONE,1.1

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/codecompletion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1125/tests/org/python/pydev/editor/codecompletion

Added Files:
	PythonShellTest.java 
Log Message:
New code completion.

--- NEW FILE: PythonShellTest.java ---
/*
 * Created on Sep 13, 2004
 *
 * @author Fabio Zadrozny
 */
package org.python.pydev.editor.codecompletion;

import java.io.File;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;

import org.eclipse.core.runtime.CoreException;

import junit.framework.TestCase;

/**
 * @author Fabio Zadrozny
 */
public class PythonShellTest extends TestCase {

    private PythonShell shell;

    public static void main(String[] args) {
        junit.textui.TestRunner.run(PythonShellTest.class);
    }

    /*
     * @see TestCase#setUp()
     */
    protected void setUp() throws Exception {
        super.setUp();
        File f = new File("PySrc/pycompletionserver.py");
        shell = new PythonShell(f);

        shell.startIt();
    }

    /*
     * @see TestCase#tearDown()
     */
    protected void tearDown() throws Exception {
        super.tearDown();
        shell.endIt();
    }

    public void testGetGlobalCompletions() throws IOException, CoreException {
        String str = "import math\n";
        List list = shell.getGlobalCompletions(str);
        for (Iterator iter = list.iterator(); iter.hasNext();) {
            Object[] element = (Object[]) iter.next();
            assertEquals("math",element[0]);
            assertEquals("This module is always available.  It provides access to the\n"+
                          "mathematical functions defined by the C standard.",element[1]);
            
        }
   }

    public void testGetTokenCompletions() throws IOException, CoreException {
        String str = "\n\n\n\n\nimport math\n\n\n#testetestse\n\n\n\n\n";
        List list = shell.getTokenCompletions("math",str);
        assertEquals(29, list.size());
//        for (Iterator iter = list.iterator(); iter.hasNext();) {
//            Object[] element = (Object[]) iter.next();
//            System.out.println(element[0]);
//            System.out.println(element[1]);
//        }
   }


    public void testErrorOnCompletions() throws IOException, CoreException {
        String str = "import math; class C dsdfas d not valid\n";
        List list = shell.getTokenCompletions("math",str);
        assertEquals(1, list.size());
        Object object[] = (Object[]) list.get(0);
        assertEquals("ERROR_COMPLETING",object[0]);
   }
    
   public void testOther(){
       String str = 
		"class C(object):        \n"+  
		"                        \n"+   
		"    def __init__(self): \n"+          
		"                        \n"+  
		"        print dir(self) \n"+      
		"                        \n"+     
		"    def a(self):        \n"+        
		"        pass            \n"+                 
		"                        \n"+         
		"                        \n"+        
		"    def b(self):        \n"+           
		"        self.a          \n"+          
		"                        \n"+        
		"        pass            \n";
       
       List list = shell.getTokenCompletions("C",str);
       assertEquals(17, list.size());
//       for (Iterator iter = list.iterator(); iter.hasNext();) {
//           Object[] element = (Object[]) iter.next();
//           System.out.println(element[0]);
//           System.out.println(element[1]);
//       }
   }
}

[Pydev-cvs] org.python.pydev/tests/org/python - New directory

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/tests/org/python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1027/tests/org/python

Log Message:
Directory /cvsroot/pydev/org.python.pydev/tests/org/python added to the repository

[Pydev-cvs] org.python.pydev/tests/org - New directory

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/tests/org
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1027/tests/org

Log Message:
Directory /cvsroot/pydev/org.python.pydev/tests/org added to the repository

[Pydev-cvs] org.python.pydev/tests/org/python/pydev - New directory

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/tests/org/python/pydev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1027/tests/org/python/pydev

Log Message:
Directory /cvsroot/pydev/org.python.pydev/tests/org/python/pydev added to the repository

[Pydev-cvs] org.python.pydev/tests/org/python/pydev/editor/codecompletion - New directory

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/codecompletion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1027/tests/org/python/pydev/editor/codecompletion

Log Message:
Directory /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/codecompletion added to the repository

[Pydev-cvs] org.python.pydev/tests/org/python/pydev/editor - New directory

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1027/tests/org/python/pydev/editor

Log Message:
Directory /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor added to the repository

[Pydev-cvs] org.python.pydev/tests - New directory

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1027/tests

Log Message:
Directory /cvsroot/pydev/org.python.pydev/tests added to the repository

[Pydev-cvs] org.python.pydev/PySrc simpleinspect.py,NONE,1.1 test_pyserver.py,NONE,1.1 simpleTipper.py,NONE,1.1 test_simpleTipper.py,NONE,1.1 pycompletionserver.py,1.2,1.3

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/PySrc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19681/PySrc

Modified Files:
	pycompletionserver.py 
Added Files:
	simpleinspect.py test_pyserver.py simpleTipper.py 
	test_simpleTipper.py 
Log Message:
Making server for code completion and making another enviroment,
since iterative console is not really suited for code completion.

--- NEW FILE: test_simpleTipper.py ---
'''
@author Fabio Zadrozny 
'''

import unittest
import simpleTipper
    
class Test(unittest.TestCase):

    def setUp(self):
        unittest.TestCase.setUp(self)

    def tearDown(self):
        unittest.TestCase.tearDown(self)
    
    def getDoc1(self):
        s = \
'''

import math

class C(object):
    \'\'\'
        CDescription
    \'\'\'
    def __init__(self):
        
        print dir(self)
    
    def a(self):
        \'\'\'
        ADescription
        \'\'\'
        pass
        
    def b(self):
        self
'''
    
        return s
        

    def testEnv1(self):
        comps = simpleTipper.GenerateTip(self.getDoc1(), None)
        import math, inspect
        
        checkedMath = False
        checkedC = False
        for tup in comps:
        
            if tup[0] == 'math':
                checkedMath = True
                self.assertEquals(inspect.getdoc(math),tup[1])
        
            elif tup[0] == 'C':
                checkedC = True
                self.assert_('CDescription' in tup[1])

        self.assert_(checkedC and checkedMath)


    def testEnv1CToken(self):
        comps = simpleTipper.GenerateTip(self.getDoc1(), 'C')
        checkedA = False
        for tup in comps:
            if tup[0] == 'a':
                checkedA = True
                self.assert_('ADescription' in tup[1])

        self.assert_(checkedA)
        
if __name__ == '__main__':
    unittest.main()

--- NEW FILE: simpleinspect.py ---
'''
@author Fabio Zadrozny 
'''

def GenerateTip (__eraseThisV):

    exec(__eraseThisV)

--- NEW FILE: simpleTipper.py ---
'''
@author Fabio Zadrozny 
'''

def GenerateTip (theDoc, token):
    '''
    Put in the doc the code so that we get the locals.
    '''

    if token is None:
    
        theDoc+= \
'''

import inspect as __eraseThisinspect
import copy as __eraseThiscopy

__eraseThisf = __eraseThisinspect.currentframe()
__eraseThislocs = __eraseThiscopy.copy(__eraseThisf.f_locals)

for __eraseThisd in __eraseThislocs: 
    if __eraseThisd.startswith('__eraseThis') == False : __eraseThisTips.append([__eraseThisd,None])

l = locals()
for t in __eraseThisTips:
    t[1] = __eraseThisinspect.getdoc(l[t[0]])
'''
    
    else : #just complete for token.
        theDoc+= \
'''

import inspect 

for d in dir(%s):
    __eraseThisTips.append([d,inspect.getdoc(getattr(%s, d))])
''' % (token,token)
    
        
    
    import simpleinspect
    import compiler
    __eraseThis = compiler.compile(theDoc, 'temporary', 'exec')

    simpleinspect.__eraseThisTips = []
    simpleinspect.GenerateTip (__eraseThis)
    toReturn = simpleinspect.__eraseThisTips
    simpleinspect.__eraseThisTips = []
    return toReturn
    

    
--- NEW FILE: test_pyserver.py ---
'''
@author Fabio Zadrozny 
'''

import unittest
import pycompletionserver
import socket

class Test(unittest.TestCase):

    def setUp(self):
        unittest.TestCase.setUp(self)

    def tearDown(self):
        unittest.TestCase.tearDown(self)
    
    def testMessage(self):
        t = pycompletionserver.T(0,0)
        
        l = []
        l.append(('Def','description'  ))
        l.append(('Def1','description1'))
        l.append(('Def2','description2'))
        
        msg = t.formatCompletionMessage(l)
        self.assertEquals('@@COMPLETIONS((Def,description),(Def1,description1),(Def2,description2))END@@', msg)
        
        l = []
        l.append(('Def','desc,,r,,i()ption'  ))
        l.append(('Def(1','descriptio(n1'))
        l.append(('De,f)2','de,s,c,ription2'))
        msg = t.formatCompletionMessage(l)
        self.assertEquals('@@COMPLETIONS((Def,description),(Def1,description1),(Def2,description2))END@@', msg)

    def testSocketsAndMessages(self):
        t = pycompletionserver.T(50002,50003)
        
        t.start()

        sToWrite = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
        sToWrite.connect((pycompletionserver.HOST, 50002))
        
        sToRead = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
        sToRead.bind((pycompletionserver.HOST, 50003))
        sToRead.listen(1) #socket to receive messages.

        connToRead, addr = sToRead.accept()
#        print 'test connected addr', addr
        
        
        #now that we have the connections all set up, check the code completion messages.
        sToWrite.send('@@GLOBALS:import math\nEND@@') #only 1 global should be returned: math itself.
        completions = connToRead.recv(1024)
        self.assertEquals('@@COMPLETIONS((math,This module is always available.  It provides access to the\n'\
                          'mathematical functions defined by the C standard.))END@@',
                          completions)

        
        #check token msg.
        sToWrite.send('@@TOKEN_GLOBALS(math):import math\nEND@@') 
        completions = connToRead.recv(4086)

        self.assert_('@@COMPLETIONS' in completions)
        self.assert_('END@@' in completions)

        
        self.sendKillMsg(sToWrite)
        

        while not hasattr(t, 'ended'):
            pass #wait until it receives the message and quits.

            
        sToRead.close()
        sToWrite.close()
        
    def sendKillMsg(self, socket):
        socket.send(pycompletionserver.MSG_KILL_SERVER)
        
    
if __name__ == '__main__':
    unittest.main()

Index: pycompletionserver.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/PySrc/pycompletionserver.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pycompletionserver.py	9 Sep 2004 16:16:20 -0000	1.2
--- pycompletionserver.py	10 Sep 2004 19:42:23 -0000	1.3
***************
*** 1,13 ****
  '''
! Echoing server.
! 
! TODO: THIS IS ONLY A TEST.
  '''
  import threading
  import time
!         
! from tipper import GenerateTip
  
  class T(threading.Thread):
      
      def run(self):
--- 1,75 ----
  '''
! @author Fabio Zadrozny 
  '''
  import threading
  import time
! import simpleTipper
! 
! HOST = '127.0.0.1'               # Symbolic name meaning the local host
! 
! 
! MSG_KILL_SERVER     = '@@KILL_SERVER_END@@'
! MSG_COMPLETIONS     = '@@COMPLETIONS'
! MSG_END             = 'END@@'
! MSG_GLOBALS         = '@@GLOBALS:'
! MSG_TOKEN_GLOBALS   = '@@TOKEN_GLOBALS('
! MSG_INVALID_REQUEST = '@@INVALID_REQUEST'
! 
! BUFFER_SIZE = 1024
  
  class T(threading.Thread):
+ 
+     def __init__(self, thisPort, serverPort):
+         threading.Thread.__init__(self)
+         self.thisPort   = thisPort
+         self.serverPort = serverPort
+         self.socket = None #socket to send messages.
+         
+ 
+     def connectToServer(self):
+         import socket
+         
+         self.socket = s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+         s.connect((HOST, self.serverPort))
+ 
+     def removeInvalidChars(self, msg):
+         return msg.replace(',','').replace('(','').replace(')','')
+     
+     def formatCompletionMessage(self, completionsList):
+         '''
+         Format the completions suggestions in the following format:
+         @@COMPLETIONS((token,description),(token,description),(token,description))END@@
+         '''
+         compMsg = ''
+         for tup in completionsList:
+             if compMsg != '':
+                 compMsg += ','
+                 
+             compMsg += '(%s,%s)' % (self.removeInvalidChars(tup[0]),self.removeInvalidChars(tup[1]))
+             
+         return '%s(%s)%s'%(MSG_COMPLETIONS, compMsg, MSG_END)
+     
+     def sendCompletionsMessage(self, completionsList):
+         '''
+         Send message with completions.
+         '''
+         self.socket.send(self.formatCompletionMessage(completionsList))
+     
+     def sendReceivedInvalidMessage(self):
+         self.socket.send(MSG_INVALID_REQUEST)
+     
+     def getTokenAndData(self, data):
+         '''
+         When we receive this, we have 'token):data'
+         '''
+         token = ''
+         for c in data:
+             if c != ')':
+                 token += c
+             else:
+                 break;
+         
+         return token, data.lstrip(token+'):')
+ 
      
      def run(self):
***************
*** 15,38 ****
          import socket
          
-         HOST = ''                 # Symbolic name meaning the local host
-         PORT = 50007              # Arbitrary non-privileged port
          s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
!         s.bind((HOST, PORT))
!         s.listen(1)
          conn, addr = s.accept()
          
-         #print 'Connected by', addr
          while 1:
!             data = conn.recv(1024)
!             if not data: 
!                 break
              
!             r = ''
!             for d in GenerateTip(data):
!                 r += d
!                 r += '|'
              
!             #print 'sending data:' , data
!             conn.send(r)
              
          conn.close()
--- 77,123 ----
          import socket
          
          s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
!         s.bind((HOST, self.thisPort))
!         s.listen(1) #socket to receive messages.
!         
! 
!         #we stay here until we are connected.
!         #we only accept 1 client. 
!         #the exit message for the server is @@KILL_SERVER_END@@
          conn, addr = s.accept()
+ 
+         #after being connected, create a socket as a client.
+         self.connectToServer()
+         
+ #        print 'pycompletionserver Connected by', addr
+         
          
          while 1:
!             data = ''
!             while not data.endswith(MSG_END):
!                 data += conn.recv(BUFFER_SIZE)
              
!             if MSG_KILL_SERVER in data:
!                 #break if we received kill message.
!                 break;
!             else:
!                 data = data.rstrip(MSG_END)
              
!             if MSG_GLOBALS in data:
!                 data = data.replace(MSG_GLOBALS, '')
!                 comps = simpleTipper.GenerateTip(data, None)
!                 self.sendCompletionsMessage(comps)
!             
!             elif MSG_TOKEN_GLOBALS in data:
!                 data = data.replace(MSG_TOKEN_GLOBALS, '')
!                 token, data = self.getTokenAndData(data)                
!                 comps = simpleTipper.GenerateTip(data, token)
!                 self.sendCompletionsMessage(comps)
! 
!             else:
!                 self.sendReceivedInvalidMessage()
!             
!             
!             conn.send(data)
              
          conn.close()
***************
*** 40,71 ****
  
  if __name__ == '__main__':
!     t = T()
      t.start()
-  
-     while(hasattr(t, 'ended') == False):
-         time.sleep(1)
  
-         
- #  # Echo client program
- #    import socket
- #    
- #    HOST = '127.0.0.1'    # The remote host
- #    PORT = 50007              # The same port as used by the server
- #    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- #    s.connect((HOST, PORT))
- #    s.send('Hello, world')
- #    data = s.recv(1024)
- #    print 'Received', `data`
- #
- #
- #    s.send('Hello, world again ')
- #    data = s.recv(1024)
- #    print 'Received', `data`
- #
- #    s.send('Hello, world once more')
- #    data = s.recv(1024)
- #    print 'Received', `data`
- #
- #    s.close()
- #    time.sleep(5)
-         
\ No newline at end of file
--- 125,134 ----
  
  if __name__ == '__main__':
!     
!     import sys
!     thisPort = int(sys.argv[1])  #this is from where we want to receive messages.
!     serverPort = int(sys.argv[2])#this is where we want to write messages.
!     
!     t = T(thisPort, serverPort)
      t.start()
  

[Pydev-cvs] org.python.pydev/PySrc pycompletionserver.py,1.1,1.2

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/PySrc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14290/PySrc

Modified Files:
	pycompletionserver.py 
Log Message:


Index: pycompletionserver.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/PySrc/pycompletionserver.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pycompletionserver.py	27 Aug 2004 17:12:02 -0000	1.1
--- pycompletionserver.py	9 Sep 2004 16:16:20 -0000	1.2
***************
*** 7,12 ****
  import time
          
! 
! END_MSG = "@END@"
  
  class T(threading.Thread):
--- 7,11 ----
  import time
          
! from tipper import GenerateTip
  
  class T(threading.Thread):
***************
*** 22,39 ****
          s.listen(1)
          conn, addr = s.accept()
-         data = ''
          
          #print 'Connected by', addr
          while 1:
              data = conn.recv(1024)
-             while not data.endswith(END_MSG):
-                 data += conn.recv(1024)
- 
              if not data: 
                  break
              
!             else:
!                 conn.send('other command')
! 
          conn.close()
          self.ended = True
--- 21,39 ----
          s.listen(1)
          conn, addr = s.accept()
          
          #print 'Connected by', addr
          while 1:
              data = conn.recv(1024)
              if not data: 
                  break
              
!             r = ''
!             for d in GenerateTip(data):
!                 r += d
!                 r += '|'
!             
!             #print 'sending data:' , data
!             conn.send(r)
!             
          conn.close()
          self.ended = True
***************
*** 45,46 ****
--- 45,71 ----
      while(hasattr(t, 'ended') == False):
          time.sleep(1)
+ 
+         
+ #  # Echo client program
+ #    import socket
+ #    
+ #    HOST = '127.0.0.1'    # The remote host
+ #    PORT = 50007              # The same port as used by the server
+ #    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ #    s.connect((HOST, PORT))
+ #    s.send('Hello, world')
+ #    data = s.recv(1024)
+ #    print 'Received', `data`
+ #
+ #
+ #    s.send('Hello, world again ')
+ #    data = s.recv(1024)
+ #    print 'Received', `data`
+ #
+ #    s.send('Hello, world once more')
+ #    data = s.recv(1024)
+ #    print 'Received', `data`
+ #
+ #    s.close()
+ #    time.sleep(5)
+         
\ No newline at end of file

[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion PythonShell.java,NONE,1.1

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19238/src/org/python/pydev/editor/codecompletion

Added Files:
	PythonShell.java 
Log Message:
ONLY TESTING.

--- NEW FILE: PythonShell.java ---
/*
 * Created on Aug 16, 2004
 *
 * @author Fabio Zadrozny
 */
package org.python.pydev.editor.codecompletion;

import java.io.BufferedInputStream;
import java.io.File;
import java.io.IOException;
import java.net.Socket;

import org.eclipse.core.runtime.CoreException;

/**
 * 
 * TODO: THIS IS STILL ONLY A TEST!!
 * 
 * @author Fabio Zadrozny
 */
public class PythonShell {

    public Process p;
    private Socket socket;
    public static final String END_MSG = "@END@";


    public PythonShell() throws IOException, CoreException {
        startIt();
    }

    /**
     * @throws CoreException
     */
    public void startIt() throws IOException, CoreException {

        File serverFile = new File("D:\\dev_programs\\eclipse_3\\eclipse\\workspace\\org.python.pydev\\PySrc\\pycompletionserver.py");
        //PyCodeCompletion.getScriptWithinPySrc("pycompletionserver.py");

        p = Runtime.getRuntime().exec("python "+serverFile.getAbsolutePath());
        
        sleepALittle();
        
        socket = new Socket("127.0.0.1",50007);
        
        write("TESTE"+END_MSG);
        String b = read();
        System.out.println(b);
    }

    
    /**
     * 
     */
    private void sleepALittle() {
        try {
            synchronized(this){
                wait(100);
            }
        } catch (InterruptedException e) {
            e.printStackTrace();
        }
    }

    /**
     * @throws IOException
     */
    private void closeConn() throws IOException {
        if(socket != null){
	        socket.getOutputStream().write("".getBytes());
	        socket.close();
        }
        socket = null;
    }

    /**
     * @return
     * @throws IOException
     */
    public String read() throws IOException {
        String str = "";
        while(str.endsWith(END_MSG)){
	        BufferedInputStream inputStream = new BufferedInputStream(socket.getInputStream(), 3);
	        int size = inputStream.available();
	        byte b[] = new byte[size];
	        inputStream.read(b);
	        str += new String(b);
        }
        return str;
    }

    /**
     * @param str
     * @throws IOException
     */
    public void write(String str) throws IOException {
        socket.getOutputStream().write(str.getBytes());
    }

    /**
     * Kill our sub-process.
     */
    private void endIt() {
        try {
            closeConn();
        } catch (IOException e) {
            e.printStackTrace();
        }
        if (p!= null){
            p.destroy();
            p = null;
        }
        
    }
    
    public static void main(String[] args) throws IOException, CoreException{
        PythonShell shell = new PythonShell();
        shell.endIt();
    }

}

[Pydev-cvs] org.python.pydev/PySrc pycompletionserver.py,NONE,1.1

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/PySrc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19238/PySrc

Added Files:
	pycompletionserver.py 
Log Message:
ONLY TESTING.

--- NEW FILE: pycompletionserver.py ---
'''
Echoing server.

TODO: THIS IS ONLY A TEST.
'''
import threading
import time
        

END_MSG = "@END@"

class T(threading.Thread):
    
    def run(self):
        # Echo server program
        import socket
        
        HOST = ''                 # Symbolic name meaning the local host
        PORT = 50007              # Arbitrary non-privileged port
        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
        s.bind((HOST, PORT))
        s.listen(1)
        conn, addr = s.accept()
        data = ''
        
        #print 'Connected by', addr
        while 1:
            data = conn.recv(1024)
            while not data.endswith(END_MSG):
                data += conn.recv(1024)

            if not data: 
                break
            
            else:
                conn.send('other command')

        conn.close()
        self.ended = True

if __name__ == '__main__':
    t = T()
    t.start()
 
    while(hasattr(t, 'ended') == False):
        time.sleep(1)

[Pydev-cvs] awb/src/Python/ruleEngine/acme_scripting/src/lib/cougaar experiment.rb,1.1,NONE py_society_builder.rb,1.1,NONE scripting.rb,1.1,NONE society_builder.rb,1.1,NONE society_control.rb,1.1,NONE society_model.rb,1.1,NONE society_rule_engine.rb,1.1,NONE society_utils.rb,1.1,NONE

[Dana M. <dan...@us...>]

Update of /cvsroot/pydev/awb/src/Python/ruleEngine/acme_scripting/src/lib/cougaar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32754/src/Python/ruleEngine/acme_scripting/src/lib/cougaar

Removed Files:
	experiment.rb py_society_builder.rb scripting.rb 
	society_builder.rb society_control.rb society_model.rb 
	society_rule_engine.rb society_utils.rb 
Log Message:
remove mis-commited tree

--- society_control.rb DELETED ---

--- society_rule_engine.rb DELETED ---

--- society_model.rb DELETED ---

--- society_builder.rb DELETED ---

--- scripting.rb DELETED ---

--- experiment.rb DELETED ---

--- society_utils.rb DELETED ---

--- py_society_builder.rb DELETED ---

[Pydev-cvs] awb/src/Python/util build-exe.bat,1.1,NONE build.bat,1.1,NONE clean-dist.bat,1.1,NONE copy-files.bat,1.1,NONE setup.py,1.1,NONE setup2.py,1.1,NONE

[Dana M. <dan...@us...>]

Update of /cvsroot/pydev/awb/src/Python/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32754/src/Python/util

Removed Files:
	build-exe.bat build.bat clean-dist.bat copy-files.bat setup.py 
	setup2.py 
Log Message:
remove mis-commited tree

--- build.bat DELETED ---

--- build-exe.bat DELETED ---

--- setup.py DELETED ---

--- setup2.py DELETED ---

--- copy-files.bat DELETED ---

--- clean-dist.bat DELETED ---

[Pydev-cvs] awb/src/Python/data resource.wdr,1.1,NONE resource_wdr.xrc,1.1,NONE showTips,1.1,NONE tips.txt,1.1,NONE

[Dana M. <dan...@us...>]

Update of /cvsroot/pydev/awb/src/Python/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32754/src/Python/data

Removed Files:
	resource.wdr resource_wdr.xrc showTips tips.txt 
Log Message:
remove mis-commited tree

--- resource.wdr DELETED ---

--- tips.txt DELETED ---

--- showTips DELETED ---

--- resource_wdr.xrc DELETED ---

[Pydev-cvs] awb/src/Python/ruleEngine/acme_scripting README,1.1,NONE

[Dana M. <dan...@us...>]

Update of /cvsroot/pydev/awb/src/Python/ruleEngine/acme_scripting
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32754/src/Python/ruleEngine/acme_scripting

Removed Files:
	README 
Log Message:
remove mis-commited tree

--- README DELETED ---

[Pydev-cvs] awb/src/Python/bmp_source 001.png,1.1,NONE 002.png,1.1,NONE 003.png,1.1,NONE 004.png,1.1,NONE 005.png,1.1,NONE 006.png,1.1,NONE 007.png,1.1,NONE 008.png,1.1,NONE 009.png,1.1,NONE 010.png,1.1,NONE 011.png,1.1,NONE 012.png,1.1,NONE 013.png,1.1,NONE 014.png,1.1,NONE 015.png,1.1,NONE 016.png,1.1,NONE 017.png,1.1,NONE 018.png,1.1,NONE 019.png,1.1,NONE 020.png,1.1,NONE 021.png,1.1,NONE 022.png,1.1,NONE 023.png,1.1,NONE 024.png,1.1,NONE 025.png,1.1,NONE 026.png,1.1,NONE 027.png,1.1,NONE 028.png,1.1,NONE 029.png,1.1,NONE 030.png,1.1,NONE GridBG.gif,1.1,NONE Thumbs.db,1.1,NONE agent.bmp,1.1,NONE backgrnd.png,1.1,NONE component.bmp,1.1,NONE gizmoStatic.png,1.1,NONE host.bmp,1.1,NONE mondrian.ico,1.1,NONE node.bmp,1.1,NONE noicon.png,1.1,NONE querymark.bmp,1.1,NONE rest.png,1.1,NONE society.bmp,1.1,NONE

[Dana M. <dan...@us...>]

Update of /cvsroot/pydev/awb/src/Python/bmp_source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32754/src/Python/bmp_source

Removed Files:
	001.png 002.png 003.png 004.png 005.png 006.png 007.png 
	008.png 009.png 010.png 011.png 012.png 013.png 014.png 
	015.png 016.png 017.png 018.png 019.png 020.png 021.png 
	022.png 023.png 024.png 025.png 026.png 027.png 028.png 
	029.png 030.png GridBG.gif Thumbs.db agent.bmp backgrnd.png 
	component.bmp gizmoStatic.png host.bmp mondrian.ico node.bmp 
	noicon.png querymark.bmp rest.png society.bmp 
Log Message:
remove mis-commited tree

--- rest.png DELETED ---

--- 009.png DELETED ---

--- 021.png DELETED ---

--- gizmoStatic.png DELETED ---

--- 026.png DELETED ---

--- 004.png DELETED ---

--- 016.png DELETED ---

--- 014.png DELETED ---

--- backgrnd.png DELETED ---

--- 028.png DELETED ---

--- 029.png DELETED ---

--- host.bmp DELETED ---

--- 027.png DELETED ---

--- Thumbs.db DELETED ---

--- 024.png DELETED ---

--- 012.png DELETED ---

--- 011.png DELETED ---

--- 010.png DELETED ---

--- 030.png DELETED ---

--- 015.png DELETED ---

--- component.bmp DELETED ---

--- agent.bmp DELETED ---

--- 019.png DELETED ---

--- 018.png DELETED ---

--- 020.png DELETED ---

--- 013.png DELETED ---

--- 017.png DELETED ---

--- 005.png DELETED ---

--- 007.png DELETED ---

--- 008.png DELETED ---

--- querymark.bmp DELETED ---

--- node.bmp DELETED ---

--- mondrian.ico DELETED ---

--- society.bmp DELETED ---

--- GridBG.gif DELETED ---

--- 025.png DELETED ---

--- 001.png DELETED ---

--- 002.png DELETED ---

--- 003.png DELETED ---

--- 006.png DELETED ---

--- noicon.png DELETED ---

--- 022.png DELETED ---

--- 023.png DELETED ---

[Pydev-cvs] awb/src/Python/bitmaps ACME2003.gif,1.1,NONE Copy of ACME2003.gif,1.1,NONE Thumbs.db,1.1,NONE Tux.png,1.1,NONE agent.bmp,1.1,NONE component.bmp,1.1,NONE csmarter.ico,1.1,NONE csmarterIcon.bmp,1.1,NONE earth.gif,1.1,NONE host.bmp,1.1,NONE node.bmp,1.1,NONE querymark.bmp,1.1,NONE society.bmp,1.1,NONE

[Dana M. <dan...@us...>]

Update of /cvsroot/pydev/awb/src/Python/bitmaps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32754/src/Python/bitmaps

Removed Files:
	ACME2003.gif Copy of ACME2003.gif Thumbs.db Tux.png agent.bmp 
	component.bmp csmarter.ico csmarterIcon.bmp earth.gif host.bmp 
	node.bmp querymark.bmp society.bmp 
Log Message:
remove mis-commited tree

--- node.bmp DELETED ---

--- host.bmp DELETED ---

--- csmarter.ico DELETED ---

--- Thumbs.db DELETED ---

--- society.bmp DELETED ---

--- component.bmp DELETED ---

--- Copy of ACME2003.gif DELETED ---

--- querymark.bmp DELETED ---

--- Tux.png DELETED ---

--- ACME2003.gif DELETED ---

--- earth.gif DELETED ---

--- agent.bmp DELETED ---

--- csmarterIcon.bmp DELETED ---

[Pydev-cvs] awb/src/Python/Sample-Rules Override.rul,1.1,NONE args.rul,1.1,NONE rule1.rul,1.1,NONE ruleblaah.rul,1.1,NONE

[Dana M. <dan...@us...>]

Update of /cvsroot/pydev/awb/src/Python/Sample-Rules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32754/src/Python/Sample-Rules

Removed Files:
	Override.rul args.rul rule1.rul ruleblaah.rul 
Log Message:
remove mis-commited tree

--- args.rul DELETED ---

--- rule1.rul DELETED ---

--- ruleblaah.rul DELETED ---

--- Override.rul DELETED ---

[Pydev-cvs] awb/src/Python/Sample-Laydowns Host-with-webs.xml,1.1,NONE HostWebs.xml,1.1,NONE TIC-sample.xml,1.1,NONE tiny-tc7-61a65v.plugins.xml,1.1,NONE

[Dana M. <dan...@us...>]

Update of /cvsroot/pydev/awb/src/Python/Sample-Laydowns
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32754/src/Python/Sample-Laydowns

Removed Files:
	Host-with-webs.xml HostWebs.xml TIC-sample.xml 
	tiny-tc7-61a65v.plugins.xml 
Log Message:
remove mis-commited tree

--- HostWebs.xml DELETED ---

--- tiny-tc7-61a65v.plugins.xml DELETED ---

--- TIC-sample.xml DELETED ---

--- Host-with-webs.xml DELETED ---

[Pydev-cvs] awb/src/Python .cvsignore,1.1,NONE AWB.bat,1.1,NONE AWB.log,1.1,NONE AWB.py,1.1,NONE AWBcontroller.bat,1.1,NONE About.py,1.1,NONE AgentDataCollector.py,1.1,NONE ArtHNA.xml,1.1,NONE CS03.py,1.1,NONE CSMARTer.bat,1.1,NONE CSMARTer.log,1.1,NONE Cecom.bat,1.1,NONE __init__.py,1.1,NONE agentCanvas.py,1.1,NONE agentCanvas.pyc,1.1,NONE agentController.py,1.1,NONE agentController.pyc,1.1,NONE agentLaydown.py,1.1,NONE agentLaydown.pyc,1.1,NONE agentsRoot.html,1.1,NONE awb.list.p,1.1,NONE cecomDLG.py,1.1,NONE cougaar_DragAndDrop.py,1.1,NONE cougaar_DragAndDrop.pyc,1.1,NONE csmarter_events.py,1.1,NONE csmarter_events.pyc,1.1,NONE debug.py,1.1,NONE editorTextControl.py,1.1,NONE editorTextControl.pyc,1.1,NONE encode_bitmaps.py,1.1,NONE eventFactory.py,1.1,NONE eventFactory.pyc,1.1,NONE facetProperties.py,1.1,NONE facetProperties.pyc,1.1,NONE gizmo.py,1.1,NONE gizmo.pyc,1.1,NONE gizmoImages.py,1.1,NONE gizmoImages.pyc,1.1,NONE globalConstants.py,1.1,NONE globalConstants.pyc,1.1,NONE hierarchy-small.xml,1.1,NONE hierarchy.xml,1.1,NONE images.py,1.1,NONE images.pyc,1.1,NONE informationPanel.py,1.1,NONE informationPanel.pyc,1.1,NONE insertion_dialog.py,1.1,NONE insertion_dialog.pyc,1.1,NONE mySociety.py,1.1,NONE probeDLG.py,1.1,NONE probeDLG.pyc,1.1,NONE run.py,1.1,NONE run.pyc,1.1,NONE screenScraper.py,1.1,NONE screenScraper.pyc,1.1,NONE screenScraperTest.py,1.1,NONE servletProperties.py,1.1,NONE servletProperties.pyc,1.1,NONE simple.rb,1.1,NONE simpleCanvas.py,1.1,NONE societyBuilder.py,1.1,NONE societyBuilder.pyc,1.1,NONE societyController.py,1.1,NONE societyController.pyc,1.1,NONE societyEditor.py,1.1,NONE societyEditor.pyc,1.1,NONE societyFactoryServer.py,1.1,NONE societyFactoryServer.pyc,1.1,NONE societyReader.py,1.1,NONE societyReader.pyc,1.1,NONE societyViewer.py,1.1,NONE societyViewer.pyc,1.1,NONE societyVisualModel.py,1.1,NONE societyVisualModel.pyc,1.1,NONE urlDlg.py,1.1,NONE urlDlg.pyc,1.1,NONE zoomer.py,1.1,NONE zoomer.pyc,1.1,NONE

[Dana M. <dan...@us...>]

Update of /cvsroot/pydev/awb/src/Python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32754/src/Python

Removed Files:
	.cvsignore AWB.bat AWB.log AWB.py AWBcontroller.bat About.py 
	AgentDataCollector.py ArtHNA.xml CS03.py CSMARTer.bat 
	CSMARTer.log Cecom.bat __init__.py agentCanvas.py 
	agentCanvas.pyc agentController.py agentController.pyc 
	agentLaydown.py agentLaydown.pyc agentsRoot.html awb.list.p 
	cecomDLG.py cougaar_DragAndDrop.py cougaar_DragAndDrop.pyc 
	csmarter_events.py csmarter_events.pyc debug.py 
	editorTextControl.py editorTextControl.pyc encode_bitmaps.py 
	eventFactory.py eventFactory.pyc facetProperties.py 
	facetProperties.pyc gizmo.py gizmo.pyc gizmoImages.py 
	gizmoImages.pyc globalConstants.py globalConstants.pyc 
	hierarchy-small.xml hierarchy.xml images.py images.pyc 
	informationPanel.py informationPanel.pyc insertion_dialog.py 
	insertion_dialog.pyc mySociety.py probeDLG.py probeDLG.pyc 
	run.py run.pyc screenScraper.py screenScraper.pyc 
	screenScraperTest.py servletProperties.py 
	servletProperties.pyc simple.rb simpleCanvas.py 
	societyBuilder.py societyBuilder.pyc societyController.py 
	societyController.pyc societyEditor.py societyEditor.pyc 
	societyFactoryServer.py societyFactoryServer.pyc 
	societyReader.py societyReader.pyc societyViewer.py 
	societyViewer.pyc societyVisualModel.py societyVisualModel.pyc 
	urlDlg.py urlDlg.pyc zoomer.py zoomer.pyc 
Log Message:
remove mis-commited tree

--- societyController.pyc DELETED ---

--- societyFactoryServer.pyc DELETED ---

--- urlDlg.py DELETED ---

--- gizmo.py DELETED ---

--- csmarter_events.py DELETED ---

--- AWB.bat DELETED ---

--- urlDlg.pyc DELETED ---

--- societyViewer.pyc DELETED ---

--- cougaar_DragAndDrop.pyc DELETED ---

--- hierarchy.xml DELETED ---

--- insertion_dialog.pyc DELETED ---

--- societyEditor.pyc DELETED ---

--- mySociety.py DELETED ---

--- gizmoImages.py DELETED ---

--- AWB.py DELETED ---

--- AgentDataCollector.py DELETED ---

--- .cvsignore DELETED ---

--- societyReader.py DELETED ---

--- zoomer.pyc DELETED ---

--- screenScraper.py DELETED ---

--- zoomer.py DELETED ---

--- societyVisualModel.py DELETED ---

--- editorTextControl.pyc DELETED ---

--- societyController.py DELETED ---

--- encode_bitmaps.py DELETED ---

--- screenScraper.pyc DELETED ---

--- societyViewer.py DELETED ---

--- gizmo.pyc DELETED ---

--- agentsRoot.html DELETED ---

--- About.py DELETED ---

--- awb.list.p DELETED ---

--- Cecom.bat DELETED ---

--- societyBuilder.pyc DELETED ---

--- csmarter_events.pyc DELETED ---

--- images.py DELETED ---

--- probeDLG.py DELETED ---

--- run.py DELETED ---

--- cecomDLG.py DELETED ---

--- societyFactoryServer.py DELETED ---

--- debug.py DELETED ---

--- editorTextControl.py DELETED ---

--- agentLaydown.py DELETED ---

--- simpleCanvas.py DELETED ---

--- CSMARTer.log DELETED ---

--- run.pyc DELETED ---

--- agentController.pyc DELETED ---

--- facetProperties.pyc DELETED ---

--- agentController.py DELETED ---

--- societyBuilder.py DELETED ---

--- screenScraperTest.py DELETED ---

--- globalConstants.pyc DELETED ---

--- ArtHNA.xml DELETED ---

--- agentLaydown.pyc DELETED ---

--- cougaar_DragAndDrop.py DELETED ---

--- AWBcontroller.bat DELETED ---

--- societyEditor.py DELETED ---

--- facetProperties.py DELETED ---

--- images.pyc DELETED ---

--- eventFactory.pyc DELETED ---

--- agentCanvas.py DELETED ---

--- servletProperties.pyc DELETED ---

--- societyReader.pyc DELETED ---

--- globalConstants.py DELETED ---

--- simple.rb DELETED ---

--- gizmoImages.pyc DELETED ---

--- __init__.py DELETED ---

--- insertion_dialog.py DELETED ---

--- CS03.py DELETED ---

--- societyVisualModel.pyc DELETED ---

--- eventFactory.py DELETED ---

--- informationPanel.pyc DELETED ---

--- informationPanel.py DELETED ---

--- CSMARTer.bat DELETED ---

--- agentCanvas.pyc DELETED ---

--- servletProperties.py DELETED ---

--- AWB.log DELETED ---

--- hierarchy-small.xml DELETED ---

--- probeDLG.pyc DELETED ---

[Pydev-cvs] awb/docs Using-CECOM-AgentView V0.1.ppt,1.1,NONE

[Dana M. <dan...@us...>]

Update of /cvsroot/pydev/awb/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32754/docs

Removed Files:
	Using-CECOM-AgentView V0.1.ppt 
Log Message:
remove mis-commited tree

--- Using-CECOM-AgentView V0.1.ppt DELETED ---

[Pydev-cvs] awb ChangeLog,1.1,NONE README.txt,1.1,NONE ReleaseNotes,1.1,NONE __init__.py,1.1,NONE tasks-PlannerAgent.xml,1.1,NONE tasks-PlannerAgent2.htm,1.1,NONE test.txt,1.1,NONE

[Dana M. <dan...@us...>]

Update of /cvsroot/pydev/awb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32754

Removed Files:
	ChangeLog README.txt ReleaseNotes __init__.py 
	tasks-PlannerAgent.xml tasks-PlannerAgent2.htm test.txt 
Log Message:
remove mis-commited tree

--- tasks-PlannerAgent.xml DELETED ---

--- __init__.py DELETED ---

--- ChangeLog DELETED ---

--- ReleaseNotes DELETED ---

--- tasks-PlannerAgent2.htm DELETED ---

--- test.txt DELETED ---

--- README.txt DELETED ---

[Pydev-cvs] awb/src/Python/util build-exe.bat,NONE,1.1 build.bat,NONE,1.1 clean-dist.bat,NONE,1.1 copy-files.bat,NONE,1.1 setup.py,NONE,1.1 setup2.py,NONE,1.1

[Dana M. <dan...@us...>]

Update of /cvsroot/pydev/awb/src/Python/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30772/src/Python/util

Added Files:
	build-exe.bat build.bat clean-dist.bat copy-files.bat setup.py 
	setup2.py 
Log Message:
wholesale commit

--- NEW FILE: build.bat ---
@ echo off

REM Automates the building of a CSMARTer distutils 
REM installer for Windows.
REM Results in a self-extracting zip file which, when
REM executed, unzips and installs itself in an existing
REM Python\Lib\site-packages directory.


REM First collect the files needed into the correct build directories:

cd \csmarter\CSMARTer
copy c:\csmarter\csmart\src\python\CSMARTer\CSMARTer.bat .

cd \csmarter
call copy-files.bat


REM Now build the installer:

python setup.py bdist_wininst


REM Sock away the installer just created

move/Y C:\csmarter\dist\csmarter*.exe .

REM Cleanup

call clean-dist.bat

--- NEW FILE: build-exe.bat ---
@ echo off

REM Automates the building of a CSMARTer executable and
REM an installer for Windows.
REM Results in a directory that contains an executable
REM file with supporting files; does not require user to
REM have Python, wxPython, or 4Suite installed.


REM First collect the files needed into the correct build 
REM directories:

call copy-files.bat


REM Now build the executable:

cd \csmarter\CSMARTer
python setup2.py py2exe --packages encodings --icon csmarter.ico


REM Sock away the executable directory just created

cd \csmarter
rd /S /Q CS03
move C:\csmarter\CSMARTer\dist\CS03 .


REM Cleanup

call clean-dist.bat
cd C:\csmarter\CS03
mkdir CSMARTer
cd CSMARTer


REM When this script is done, go to C:\csmarter\CS03 using
REM Windows Explorer, copy all files and dirs (except 
REM CSMARTer) into dir CSMARTer.  Then right-click
REM on the CSMARTer dir, and select "Add to CSMARTer.zip".  This
REM creates a zip file named CSMARTer.zip in the C:\csmarter\CS03
REM dir.  This is the file you will distribute.
--- NEW FILE: setup.py ---
# Name:  setup.py
# Purpose:  Build a distribution file for CSMARTer
#
# Author:       ISAT (P. Gardella)
#
# RCS-ID:       $Id: setup.py,v 1.1 2004/08/25 21:03:46 dana_virtual Exp $
#  <copyright>
#  Copyright 2002 BBN Technologies, LLC
#  under sponsorship of the Defense Advanced Research Projects Agency (DARPA).
#
#  This program is free software; you can redistribute it and/or modify
#  it under the terms of the Cougaar Open Source License as published by
#  DARPA on the Cougaar Open Source Website (www.cougaar.org).
#
#  THE COUGAAR SOFTWARE AND ANY DERIVATIVE SUPPLIED BY LICENSOR IS
#  PROVIDED 'AS IS' WITHOUT WARRANTIES OF ANY KIND, WHETHER EXPRESS OR
#  IMPLIED, INCLUDING (BUT NOT LIMITED TO) ALL IMPLIED WARRANTIES OF
#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND WITHOUT
#  ANY WARRANTIES AS TO NON-INFRINGEMENT.  IN NO EVENT SHALL COPYRIGHT
#  HOLDER BE LIABLE FOR ANY DIRECT, SPECIAL, INDIRECT OR CONSEQUENTIAL
#  DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE OF DATA OR PROFITS,
#  TORTIOUS CONDUCT, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
#  PERFORMANCE OF THE COUGAAR SOFTWARE.
# </copyright>
#

from distutils.core import setup
import py2exe

setup(name = "CSMARTer", version = "1.2",
         description="CSMARTer Society Editing Tool for Cougaar",
         author="Dana Moore & Paul Gardella, BBN Technologies",
         author_email="pga...@bb...",
         url="http://www.cougaar.org",
         packages = ["CSMARTer", "CSMARTer.ACMEPy"],
         data_files=[("Lib/site-packages/CSMARTer", 
                                  ["CSMARTer/CSMARTer.bat", 
                                   "CSMARTer/csmarter.ico"]),
                          ("Lib/site-packages/CSMARTer/bitmaps", 
                                  ["CSMARTer/bitmaps/ACME2003.gif"]),
                          ("Lib/site-packages/CSMARTer/data", 
                                  ["CSMARTer/data/tiny.xml",
                                   "CSMARTer/data/tiny_laydownTest.xml",
                                   "CSMARTer/data/showTips",
                                   "CSMARTer/data/tips.txt"]),
                          ("Lib/site-packages/CSMARTer/docs", 
                                  ["CSMARTer/docs/README.txt"]),
                          ("Lib/site-packages/CSMARTer/Sample-Rules", 
                                  ["CSMARTer/Sample-Rules/Override.rul",
                                   "CSMARTer/Sample-Rules/rule1.rul",
                                   "CSMARTer/Sample-Rules/ruleblaah.rul",
                                   "CSMARTer/Sample-Rules/args.rul"])]
         )


--- NEW FILE: setup2.py ---
# Name:  setup2.py
# Purpose:  Build an executable for CSMARTer that permits CSMARTer to
#                 run without requiring Python, wxPython, or 4Suite.
#
# Author:       ISAT (P. Gardella)
#
# RCS-ID:       $Id: setup2.py,v 1.1 2004/08/25 21:03:46 dana_virtual Exp $
#  <copyright>
#  Copyright 2002 BBN Technologies, LLC
#  under sponsorship of the Defense Advanced Research Projects Agency (DARPA).
#
#  This program is free software; you can redistribute it and/or modify
#  it under the terms of the Cougaar Open Source License as published by
#  DARPA on the Cougaar Open Source Website (www.cougaar.org).
#
#  THE COUGAAR SOFTWARE AND ANY DERIVATIVE SUPPLIED BY LICENSOR IS
#  PROVIDED 'AS IS' WITHOUT WARRANTIES OF ANY KIND, WHETHER EXPRESS OR
#  IMPLIED, INCLUDING (BUT NOT LIMITED TO) ALL IMPLIED WARRANTIES OF
#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND WITHOUT
#  ANY WARRANTIES AS TO NON-INFRINGEMENT.  IN NO EVENT SHALL COPYRIGHT
#  HOLDER BE LIABLE FOR ANY DIRECT, SPECIAL, INDIRECT OR CONSEQUENTIAL
#  DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE OF DATA OR PROFITS,
#  TORTIOUS CONDUCT, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
#  PERFORMANCE OF THE COUGAAR SOFTWARE.
# </copyright>
#

from distutils.core import setup
import py2exe

setup(name = "CSMARTer", version = "1.2",
         description="CSMARTer Society Editing Tool for Cougaar",
         author="Dana Moore & Paul Gardella, BBN Technologies",
         author_email="pga...@bb...",
         url="http://www.cougaar.org",
         scripts=["CS03.py"],
         data_files=[("", 
                                  ["CSMARTer.bat", 
                                   "csmarter.ico"]),
                          ("bitmaps", 
                                  ["bitmaps/ACME2003.gif"]),
                          ("data", 
                                  ["data/tiny.xml",
                                   "data/tiny_laydownTest.xml",
                                   "data/showTips",
                                   "data/tips.txt"]),
                          ("docs", 
                                  ["docs/ReleaseNotes",
                                   "docs/README.txt"]),
                          ("Sample-Rules", 
                                  ["Sample-Rules/Override.rul",
                                   "Sample-Rules/rule1.rul",
                                   "Sample-Rules/ruleblaah.rul",
                                   "Sample-Rules/args.rul"])]
         )


--- NEW FILE: copy-files.bat ---
@ echo off

REM Assembles CSMARTer files into build directories in
REM preparation for building a distribution installer
REM or an executable.

cd \csmarter\CSMARTer
copy c:\csmarter\csmart\src\python\CSMARTer\_*.py .
copy c:\csmarter\csmart\src\python\CSMARTer\a*.py .
copy c:\csmarter\csmart\src\python\CSMARTer\c*.py .
copy c:\csmarter\csmart\src\python\CSMARTer\e*.py .
copy c:\csmarter\csmart\src\python\CSMARTer\g*.py .
copy c:\csmarter\csmart\src\python\CSMARTer\i*.py .
copy c:\csmarter\csmart\src\python\CSMARTer\s*.py .
copy c:\csmarter\csmart\src\python\CSMARTer\bitmaps\csmarter.ico .

cd ACMEPy
copy c:\csmarter\csmart\src\python\ACMEPy\_*.py .
copy c:\csmarter\csmart\src\python\ACMEPy\a*.py .
copy c:\csmarter\csmart\src\python\ACMEPy\c*.py .
copy c:\csmarter\csmart\src\python\ACMEPy\f*.py .
copy c:\csmarter\csmart\src\python\ACMEPy\h*.py .
copy c:\csmarter\csmart\src\python\ACMEPy\n*.py .
copy c:\csmarter\csmart\src\python\ACMEPy\p*.py .
copy c:\csmarter\csmart\src\python\ACMEPy\r*.py .
copy c:\csmarter\csmart\src\python\ACMEPy\society.py .
copy c:\csmarter\csmart\src\python\ACMEPy\society_factory2.py .

cd ..\bitmaps
copy c:\csmarter\csmart\src\python\CSMARTer\bitmaps\ACME2003.gif .

cd ..\data
copy C:\csmarter\csmart\src\python\CSMARTer\data\*tips* .
copy c:\csmarter\csmart\src\python\ACMEPy\tiny.xml .
copy c:\csmarter\csmart\src\python\ACMEPy\tiny_laydownTest.xml .

cd ..\docs
copy C:\csmarter\csmart\src\python\README.txt .
copy C:\csmarter\csmart\src\python\ReleaseNotes .

cd ..\Sample-Rules
copy C:\csmarter\csmart\src\python\CSMARTer\Sample-Rules\ruleblaah.rul .
copy C:\csmarter\csmart\src\python\CSMARTer\Sample-Rules\args.rul .
copy C:\csmarter\csmart\src\python\CSMARTer\Sample-Rules\Override.rul .
copy C:\csmarter\csmart\src\python\CSMARTer\Sample-Rules\rule1.rul .

cd \csmarter

--- NEW FILE: clean-dist.bat ---
@echo off

REM Cleanup directories left over after building
REM our distribution installer or executable.

rmdir /S /Q C:\csmarter\dist
rmdir /S /Q C:\csmarter\build
rmdir /S /Q C:\csmarter\CSMARTer\dist
rmdir /S /Q C:\csmarter\CSMARTer\build