Auto-compile ssl in-place as part of pylibs.

tav · May 26, 2010 · a6202c3 · a6202c3
1 parent fcecf8c
commit a6202c3
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 3 deletions.
diff --git a/ssl/MANIFEST → pyssl/MANIFEST b/ssl/MANIFEST → pyssl/MANIFEST
diff --git a/ssl/Makefile → pyssl/Makefile b/ssl/Makefile → pyssl/Makefile
diff --git a/ssl/PKG-INFO → pyssl/PKG-INFO b/ssl/PKG-INFO → pyssl/PKG-INFO
diff --git a/ssl/setup.py → pyssl/setup.py b/ssl/setup.py → pyssl/setup.py
diff --git a/ssl/ssl/2.5.1/socketmodule.h → pyssl/ssl/2.5.1/socketmodule.h b/ssl/ssl/2.5.1/socketmodule.h → pyssl/ssl/2.5.1/socketmodule.h
diff --git a/ssl/ssl/__init__.py → pyssl/ssl/__init__.py b/ssl/ssl/__init__.py → pyssl/ssl/__init__.py
diff --git a/ssl/ssl/_ssl2.c → pyssl/ssl/_ssl2.c b/ssl/ssl/_ssl2.c → pyssl/ssl/_ssl2.c
diff --git a/ssl/test/badcert.pem → pyssl/test/badcert.pem b/ssl/test/badcert.pem → pyssl/test/badcert.pem
diff --git a/ssl/test/badkey.pem → pyssl/test/badkey.pem b/ssl/test/badkey.pem → pyssl/test/badkey.pem
diff --git a/ssl/test/https_svn_python_org_root.pem → pyssl/test/https_svn_python_org_root.pem b/ssl/test/https_svn_python_org_root.pem → pyssl/test/https_svn_python_org_root.pem
diff --git a/ssl/test/keycert.pem → pyssl/test/keycert.pem b/ssl/test/keycert.pem → pyssl/test/keycert.pem
diff --git a/ssl/test/nullcert.pem → pyssl/test/nullcert.pem b/ssl/test/nullcert.pem → pyssl/test/nullcert.pem
diff --git a/ssl/test/test_ssl.py → pyssl/test/test_ssl.py b/ssl/test/test_ssl.py → pyssl/test/test_ssl.py
diff --git a/setup.py b/setup.py
@@ -13,6 +13,7 @@
 
 extensions = [
     Extension("simplejson._speedups", ["simplejson/_speedups.c"]),
+    Extension('greenlet', ['greenlet/greenlet.c'], include_dirs=['greenlet'])
     ]
 
 # ------------------------------------------------------------------------------
@@ -29,10 +30,12 @@
     ext_modules=extensions,
     )
 
-pycrypto_path = join_path(dirname(realpath(__file__)), 'pycrypto')
+pylibs_path = dirname(realpath(__file__))
+
+ssl_path = join_path(pylibs_path, 'ssl')
 
 run_command(
-    [sys.executable, join_path(pycrypto_path, 'setup.py'), 'build_ext', '-i'],
-    exit_on_error=True, cwd=join_path(pycrypto_path), redirect_stdout=False,
+    [sys.executable, join_path(ssl_path, 'setup.py'), 'build_ext', '-i'],
+    exit_on_error=True, cwd=join_path(ssl_path), redirect_stdout=False,
     redirect_stderr=False
     )
diff --git a/ssl b/ssl
@@ -0,0 +1 @@
+pyssl/ssl