Merge 0618331f0e into db17151941

CHANGES.txt

@@ -0,0 +1,8 @@
+Changes
+=======
+
+0.1 (not yet released)
+-----------------
+
+ * No change yet.
+

MANIFEST.in

@@ -0,0 +1 @@
+include CHANGES.txt *.py README.md LICENSE.txt

Windows/noVNC Websocket Service Project/obj/x86/Debug/MELT Command Websocket.csproj.FileListAbsolute.txt

@@ -0,0 +1,8 @@
+c:\users\gordoncj\documents\visual studio 2010\Projects\MELT Command Websocket\MELT Command Websocket\bin\Debug\MELT Command Websocket.exe
+c:\users\gordoncj\documents\visual studio 2010\Projects\MELT Command Websocket\MELT Command Websocket\bin\Debug\MELT Command Websocket.pdb
+c:\users\gordoncj\documents\visual studio 2010\Projects\MELT Command Websocket\MELT Command Websocket\obj\x86\Debug\ResolveAssemblyReference.cache
+c:\users\gordoncj\documents\visual studio 2010\Projects\MELT Command Websocket\MELT Command Websocket\obj\x86\Debug\MELT_Command_Websocket.ProjectInstaller.resources
+c:\users\gordoncj\documents\visual studio 2010\Projects\MELT Command Websocket\MELT Command Websocket\obj\x86\Debug\ResGen.read.1.tlog
+c:\users\gordoncj\documents\visual studio 2010\Projects\MELT Command Websocket\MELT Command Websocket\obj\x86\Debug\ResGen.write.1.tlog
+c:\users\gordoncj\documents\visual studio 2010\Projects\MELT Command Websocket\MELT Command Websocket\obj\x86\Debug\MELT Command Websocket.exe
+c:\users\gordoncj\documents\visual studio 2010\Projects\MELT Command Websocket\MELT Command Websocket\obj\x86\Debug\MELT Command Websocket.pdb

setup.py

@@ -0,0 +1,30 @@
+from setuptools import setup, find_packages
+
+version = '0.1-dev'
+name = 'websockify'
+long_description = open("README.md").read() + "\n" + \
+    open("CHANGES.txt").read() + "\n"
+
+setup(name=name,
+      version=version,
+      description="Websockify.",
+      long_description=long_description,
+      classifiers=[
+          "Programming Language :: Python",
+        ],
+      keywords='noVNC websockify',
+      license='LGPLv3',
+      url="https://github.com/kanaka/websockify",
+      author="Joel Martin",
+      author_email="github@martintribe.org",
+
+      packages=find_packages(),
+      include_package_data=True,
+      install_requires=['numpy'],
+      zip_safe=False,
+      entry_points={
+        'console_scripts': [
+          'websockify = websockify:websockify_init',
+        ]
+      },
+    )

websockify

@@ -213,7 +213,7 @@ Traffic Legend:
                     self.send_close()
                     raise self.EClose(closed)
 
-if __name__ == '__main__':
+def websockify_init():
     usage = "\n    %prog [options]"
     usage += " [source_addr:]source_port target_addr:target_port"
     usage += "\n    %prog [options]"
@@ -280,3 +280,6 @@ if __name__ == '__main__':
     # Create and start the WebSockets proxy
     server = WebSocketProxy(**opts.__dict__)
     server.start_server()
+
+if __name__ == '__main__':
+    websockify_init()