Skip to content

Commit

Permalink
Merge pull request novnc#31 from SlapOS/master
Browse files Browse the repository at this point in the history
Eggify websockify
  • Loading branch information
kanaka committed Feb 18, 2012
2 parents db17151 + 301f3ae commit 31716a7
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 1 deletion.
8 changes: 8 additions & 0 deletions CHANGES.txt
@@ -0,0 +1,8 @@
Changes
=======

0.1 (not yet released)
-----------------

* No change yet.

1 change: 1 addition & 0 deletions MANIFEST.in
@@ -0,0 +1 @@
include CHANGES.txt *.py README.md LICENSE.txt
30 changes: 30 additions & 0 deletions 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',
]
},
)
5 changes: 4 additions & 1 deletion websockify
Expand Up @@ -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]"
Expand Down Expand Up @@ -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()

0 comments on commit 31716a7

Please sign in to comment.