Commit 632d2f05 authored by cjerdonek@webkit.org's avatar cjerdonek@webkit.org

Moved pywebsocket into the webkitpy/thirdparty directory and added

an associated README.webkit file to the pywebsocket directory.
This makes pywebsocket more consistent with the other third-party
Python code in our repository.

Reviewed by David Levin.

https://bugs.webkit.org/show_bug.cgi?id=35198

* Scripts/run-webkit-tests:
  - Updated paths to pywebsocket.

* Scripts/run-webkit-websocketserver:
  - Updated paths to pywebsocket.

* Scripts/webkitpy/layout_tests/port/websocket_server.py:
  - Updated paths to pywebsocket.

* Scripts/webkitpy/thirdparty/pywebsocket: Copied from WebKitTools/pywebsocket.
* Scripts/webkitpy/thirdparty/pywebsocket/README.webkit: Added.
  - Added a file containing information about the contents
    of the pywebsocket directory. This will make it easier to
    understand where the third-party code came from and what
    local changes have been made.

* pywebsocket: Removed.
* pywebsocket/COPYING: Removed.
* pywebsocket/MANIFEST.in: Removed.
* pywebsocket/README: Removed.
* pywebsocket/example: Removed.
* pywebsocket/example/echo_client.py: Removed.
* pywebsocket/example/echo_wsh.py: Removed.
* pywebsocket/mod_pywebsocket: Removed.
* pywebsocket/mod_pywebsocket/__init__.py: Removed.
* pywebsocket/mod_pywebsocket/dispatch.py: Removed.
* pywebsocket/mod_pywebsocket/handshake.py: Removed.
* pywebsocket/mod_pywebsocket/headerparserhandler.py: Removed.
* pywebsocket/mod_pywebsocket/memorizingfile.py: Removed.
* pywebsocket/mod_pywebsocket/msgutil.py: Removed.
* pywebsocket/mod_pywebsocket/standalone.py: Removed.
* pywebsocket/mod_pywebsocket/util.py: Removed.
* pywebsocket/setup.py: Removed.
* pywebsocket/test: Removed.
* pywebsocket/test/config.py: Removed.
* pywebsocket/test/mock.py: Removed.
* pywebsocket/test/run_all.py: Removed.
* pywebsocket/test/test_dispatch.py: Removed.
* pywebsocket/test/test_handshake.py: Removed.
* pywebsocket/test/test_memorizingfile.py: Removed.
* pywebsocket/test/test_mock.py: Removed.
* pywebsocket/test/test_msgutil.py: Removed.
* pywebsocket/test/test_util.py: Removed.
* pywebsocket/test/testdata: Removed.
* pywebsocket/test/testdata/handlers: Removed.
* pywebsocket/test/testdata/handlers/blank_wsh.py: Removed.
* pywebsocket/test/testdata/handlers/origin_check_wsh.py: Removed.
* pywebsocket/test/testdata/handlers/sub: Removed.
* pywebsocket/test/testdata/handlers/sub/exception_in_transfer_wsh.py: Removed.
* pywebsocket/test/testdata/handlers/sub/no_wsh_at_the_end.py: Removed.
* pywebsocket/test/testdata/handlers/sub/non_callable_wsh.py: Removed.
* pywebsocket/test/testdata/handlers/sub/plain_wsh.py: Removed.
* pywebsocket/test/testdata/handlers/sub/wrong_handshake_sig_wsh.py: Removed.
* pywebsocket/test/testdata/handlers/sub/wrong_transfer_sig_wsh.py: Removed.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55286 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 89a24868
2010-02-26 Chris Jerdonek <cjerdonek@webkit.org>
Reviewed by David Levin.
Moved pywebsocket into the webkitpy/thirdparty directory and added
an associated README.webkit file to the pywebsocket directory.
This makes pywebsocket more consistent with the other third-party
Python code in our repository.
https://bugs.webkit.org/show_bug.cgi?id=35198
* Scripts/run-webkit-tests:
- Updated paths to pywebsocket.
* Scripts/run-webkit-websocketserver:
- Updated paths to pywebsocket.
* Scripts/webkitpy/layout_tests/port/websocket_server.py:
- Updated paths to pywebsocket.
* Scripts/webkitpy/thirdparty/pywebsocket: Copied from WebKitTools/pywebsocket.
* Scripts/webkitpy/thirdparty/pywebsocket/README.webkit: Added.
- Added a file containing information about the contents
of the pywebsocket directory. This will make it easier to
understand where the third-party code came from and what
local changes have been made.
* pywebsocket: Removed.
* pywebsocket/COPYING: Removed.
* pywebsocket/MANIFEST.in: Removed.
* pywebsocket/README: Removed.
* pywebsocket/example: Removed.
* pywebsocket/example/echo_client.py: Removed.
* pywebsocket/example/echo_wsh.py: Removed.
* pywebsocket/mod_pywebsocket: Removed.
* pywebsocket/mod_pywebsocket/__init__.py: Removed.
* pywebsocket/mod_pywebsocket/dispatch.py: Removed.
* pywebsocket/mod_pywebsocket/handshake.py: Removed.
* pywebsocket/mod_pywebsocket/headerparserhandler.py: Removed.
* pywebsocket/mod_pywebsocket/memorizingfile.py: Removed.
* pywebsocket/mod_pywebsocket/msgutil.py: Removed.
* pywebsocket/mod_pywebsocket/standalone.py: Removed.
* pywebsocket/mod_pywebsocket/util.py: Removed.
* pywebsocket/setup.py: Removed.
* pywebsocket/test: Removed.
* pywebsocket/test/config.py: Removed.
* pywebsocket/test/mock.py: Removed.
* pywebsocket/test/run_all.py: Removed.
* pywebsocket/test/test_dispatch.py: Removed.
* pywebsocket/test/test_handshake.py: Removed.
* pywebsocket/test/test_memorizingfile.py: Removed.
* pywebsocket/test/test_mock.py: Removed.
* pywebsocket/test/test_msgutil.py: Removed.
* pywebsocket/test/test_util.py: Removed.
* pywebsocket/test/testdata: Removed.
* pywebsocket/test/testdata/handlers: Removed.
* pywebsocket/test/testdata/handlers/blank_wsh.py: Removed.
* pywebsocket/test/testdata/handlers/origin_check_wsh.py: Removed.
* pywebsocket/test/testdata/handlers/sub: Removed.
* pywebsocket/test/testdata/handlers/sub/exception_in_transfer_wsh.py: Removed.
* pywebsocket/test/testdata/handlers/sub/no_wsh_at_the_end.py: Removed.
* pywebsocket/test/testdata/handlers/sub/non_callable_wsh.py: Removed.
* pywebsocket/test/testdata/handlers/sub/plain_wsh.py: Removed.
* pywebsocket/test/testdata/handlers/sub/wrong_handshake_sig_wsh.py: Removed.
* pywebsocket/test/testdata/handlers/sub/wrong_transfer_sig_wsh.py: Removed.
2010-02-26 Chris Jerdonek <cjerdonek@webkit.org>
Reviewed by Eric Seidel.
......
......@@ -1394,7 +1394,7 @@ sub openWebSocketServerIfNeeded()
return 0 if $failedToStartWebSocketServer;
my $webSocketServerPath = "/usr/bin/python";
my $webSocketPythonPath = "WebKitTools/pywebsocket";
my $webSocketPythonPath = "WebKitTools/Scripts/webkitpy/thirdparty/pywebsocket";
my $webSocketHandlerDir = "$testDirectory";
my $webSocketHandlerScanDir = "$testDirectory/websocket/tests";
my $webSocketHandlerMapFile = "$webSocketHandlerScanDir/handler_map.txt";
......@@ -1403,7 +1403,7 @@ sub openWebSocketServerIfNeeded()
my $logFile = "$absTestResultsDirectory/pywebsocket_log.txt";
my @args = (
"WebKitTools/pywebsocket/mod_pywebsocket/standalone.py",
"WebKitTools/Scripts/webkitpy/thirdparty/pywebsocket/mod_pywebsocket/standalone.py",
"-p", "$webSocketPort",
"-d", "$webSocketHandlerDir",
"-s", "$webSocketHandlerScanDir",
......@@ -1414,7 +1414,7 @@ sub openWebSocketServerIfNeeded()
);
# wss is disabled until all platforms support pyOpenSSL.
# my @argsSecure = (
# "WebKitTools/pywebsocket/mod_pywebsocket/standalone.py",
# "WebKitTools/Scripts/webkitpy/thirdparty/pywebsocket/mod_pywebsocket/standalone.py",
# "-p", "$webSocketSecurePort",
# "-d", "$webSocketHandlerDir",
# "-t",
......
......@@ -64,13 +64,13 @@ exit 0;
sub openWebSocketServer()
{
my $webSocketServerPath = "/usr/bin/python";
my $webSocketPythonPath = "$srcDir/WebKitTools/pywebsocket";
my $webSocketPythonPath = "$srcDir/WebKitTools/Scripts/webkitpy/thirdparty/pywebsocket";
my $webSocketHandlerDir = "$testDirectory";
my $webSocketHandlerScanDir = "$testDirectory/websocket/tests";
my $webSocketHandlerMapFile = "$webSocketHandlerScanDir/handler_map.txt";
my @args = (
"$srcDir/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py",
"$srcDir/WebKitTools/Scripts/webkitpy/thirdparty/pywebsocket/mod_pywebsocket/standalone.py",
"-p", "$webSocketPort",
"-d", "$webSocketHandlerDir",
"-s", "$webSocketHandlerScanDir",
......
......@@ -151,8 +151,7 @@ class PyWebSocket(http_server.Lighttpd):
python_interp = sys.executable
pywebsocket_base = os.path.join(
os.path.dirname(os.path.dirname(os.path.dirname(
os.path.dirname(os.path.dirname(
os.path.abspath(__file__)))))), 'pywebsocket')
os.path.abspath(__file__)))))), 'thirdparty', 'pywebsocket')
pywebsocket_script = os.path.join(pywebsocket_base, 'mod_pywebsocket',
'standalone.py')
start_cmd = [
......
This directory contains a copy of the pywebsocket Python module obtained
from the following location:
http://code.google.com/p/pywebsocket/
This directory currently contains the following version:
FIXME: Fill in the current version here.
The following modifications have been made to this local version:
FIXME: Fill in local modifications.
More information on these local modifications can be found here:
http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/thirdparty/pywebsocket
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment