Changeset 631

Timestamp:

Sep 9, 2011 12:12:01 PM (12 years ago)

Author:

jemian

Message:

begin refactoring into release structure and rebranding with new product name: moxy

Location:

wxmtxy/trunk

Files:

• LICENSE (modified) (1 diff)
• Makefile (modified) (2 diffs)
• README (modified) (2 diffs)
• setup.py (modified) (3 diffs)
• src (added)
• src/moxy (added)
• src/moxy/__init__.py (added)
• src/moxy/example.html (moved) (moved from wxmtxy/trunk/example.html)
• src/moxy/examples (moved) (moved from wxmtxy/trunk/examples)
• src/moxy/graphics (moved) (moved from wxmtxy/trunk/graphics)
• src/moxy/htmlview.py (moved) (moved from wxmtxy/trunk/wxmtxy_htmlview.py)
• src/moxy/index.html (moved) (moved from wxmtxy/trunk/index.html)
• src/moxy/menuLauncher.py (moved) (moved from wxmtxy/trunk/menuLauncher.py)
• src/moxy/moxy (moved) (moved from wxmtxy/trunk/wxmtxy)
• src/moxy/moxy.py (moved) (moved from wxmtxy/trunk/wxmtxy.py)
• src/moxy/moxy_axis.py (moved) (moved from wxmtxy/trunk/wxmtxy_axis.py)
• src/moxy/moxy_xml.py (moved) (moved from wxmtxy/trunk/wxmtxy_xml.py)
• src/moxy/pair.py (moved) (moved from wxmtxy/trunk/wxmtxy_pair.py)
• src/moxy/pvConnect.py (moved) (moved from wxmtxy/trunk/pvConnect.py)
• src/moxy/pvsetup.py (moved) (moved from wxmtxy/trunk/wxmtxy_pvsetup.py)
• src/moxy/root.py (moved) (moved from wxmtxy/trunk/wxmtxy_root.py)
• src/moxy/row.py (moved) (moved from wxmtxy/trunk/wxmtxy_row.py)
• src/moxy/tab.py (moved) (moved from wxmtxy/trunk/wxmtxy_tab.py)
• src/moxy/version.py (moved) (moved from wxmtxy/trunk/wxmtxy_version.py)

wxmtxy/trunk/LICENSE

@@ -1 @@
-Copyright (c) 2009-2010 University of Chicago. All rights reserved.
+Copyright (c) 2009-2011 University of Chicago. All rights reserved.
 
-wxmtxy, pvConnect, and menuLauncher are distributed subject to the following license conditions:
+moxy is distributed subject to the following license conditions:
 
  SOFTWARE LICENSE AGREEMENT
- Software:  wxmtxy, including pvConnect and menuLauncher
+ Software:  moxy
 
- 1. The "Software", below, refers to wxmtxy, pvConnect,
-    and menuLauncher (in either source code, or
+ 1. The "Software", below, refers to moxy (in either source code, or
     binary form and accompanying documentation). Each licensee is
     addressed as "you" or "Licensee."

wxmtxy/trunk/Makefile

@@ -26 +26 @@
   # the python supplied with Cygwin does not have wx
   # wx is a package installed in Enthought Python
-  PYTHON := /cygdrive/c/Python26/python.exe
+  PYTHON := /cygdrive/c/Python27/python.exe
 endif
 ifeq ("$(HOST)", "usaxscontrol.xor.aps.anl.gov")
@@ -51 +51 @@
 
 run ::
-        $(PYTHON) ./wxmtxy.py
+        $(PYTHON) ./moxy.py
 
 pydoc ::
         $(PYDOC) -w ./
-        /bin/mv -f wxmtxy*.html pydoc/
+        /bin/mv -f moxy*.html pydoc/
         /bin/mv -f pvConnect.html pydoc/
         /bin/mv -f setup.html pydoc/

wxmtxy/trunk/README

@@ -9 +9 @@
 ########### SVN repository information ###################
 
-    *wxmtxy* (an EPICS GUI tool) provides support for an X,Y positioner 
+    *moxy* (an EPICS GUI tool) provides support for an X,Y positioner 
     (motor) pair by allowing users to define a table of known positions 
     and providing a one-button click to drive a chosen X,Y pair to a specific
@@ -19 +19 @@
 
 
-    wxmtxy is based on wxPython and relies on CaChannel to communicate 
+    moxy is based on wxPython and relies on CaChannel to communicate 
     with EPICS. 
     

wxmtxy/trunk/setup.py

@@ -29 +29 @@
 '''
 
-import wxmtxy_version
+import version
 import pydoc
 from distutils.core import setup
@@ -54 +54 @@
 packages = []
 scripts = [
-    'wxmtxy.py',
-    'wxmtxy_root.py',
-    'wxmtxy_pair.py',
-    'wxmtxy_tab.py',
-    'wxmtxy_row.py',
-    'wxmtxy_xml.py',
-    'wxmtxy_pvsetup.py',
-    'wxmtxy_axis.py',
-    'wxmtxy_version.py',
-    'wxmtxy_htmlview.py',
+    'moxy.py',
+    'root.py',
+    'pair.py',
+    'tab.py',
+    'row.py',
+    'moxy_xml.py',
+    'pvsetup.py',
+    'moxy_axis.py',
+    'version.py',
+    'htmlview.py',
     'pvConnect.py'
 ]
@@ -79 +79 @@
         self.__dict__.update(kw)
         # for the versioninfo resources
-        self.name = wxmtxy_version.__target_name__
-        self.version = wxmtxy_version.__version__
-        self.company_name = wxmtxy_version.__company_name__
-        self.copyright = wxmtxy_version.__copyright__
-        self.license = wxmtxy_version.__license__
+        self.name         = version.__target_name__
+        self.version      = version.__version__
+        self.company_name = version.__company_name__
+        self.copyright    = version.__copyright__
+        self.license      = version.__license__
 
 
 # see: http://wiki.python.org/moin/Distutils/Tutorial
 setup(
-    name = wxmtxy_version.__target_name__,
-    version = wxmtxy_version.__version__,
-    description = wxmtxy_version.__summary__,
-    long_description = wxmtxy_version.__long_description__,
-    author = wxmtxy_version.__author__,
-    author_email = wxmtxy_version.__author_email__,
-    license = wxmtxy_version.__license__,
-    url = wxmtxy_version.__url__,
-    scripts = scripts,
-    data_files = data_files,
+    name             = version.__target_name__,
+    version          = version.__version__,
+    description      = version.__summary__,
+    long_description = version.__long_description__,
+    author           = version.__author__,
+    author_email     = version.__author_email__,
+    license          = version.__license__,
+    url              = version.__url__,
+    scripts          = scripts,
+    data_files       = data_files,
 )