Ignore:
Timestamp:
11/06/07 15:59:54 (14 years ago)
Author:
pjkersha
Message:

Clean up ready for submission as M2Crypto patch:

  • conditional import of setuptools
  • move self.include_dirs and self.library_dirs initialisation into

finalize_options method otherwise they get overwritten if a config file
containing their equivalent is set

Location:
TI12-security/branches/Dependencies/m2crypto
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • TI12-security/branches/Dependencies/m2crypto/SWIG/_m2crypto.py

    r2172 r2574  
    1 # This file was created automatically by SWIG 1.3.29. 
     1# This file was created automatically by SWIG 1.3.30. 
    22# Don't modify this file, modify the SWIG interface instead. 
    33# This file is compatible with both classic and new-style classes. 
    … …  
    66import new 
    77new_instancemethod = new.instancemethod 
     8try: 
     9    _swig_property = property 
     10except NameError: 
     11    pass # Python < 2.2 doesn't have 'property'. 
    812def _swig_setattr_nondynamic(self,class_type,name,value,static=1): 
    913    if (name == "thisown"): return self.this.own(value) 

  • TI12-security/branches/Dependencies/m2crypto/SWIG/_m2crypto_wrap.c

    r2172 r2574  
    11/* ---------------------------------------------------------------------------- 
    22 * This file was automatically generated by SWIG (http://www.swig.org). 
    3  * Version 1.3.29 
     3 * Version 1.3.30 
    44 *  
    55 * This file is not intended to be easily readable and contains a number of  
    … …  
    104104 
    105105/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ 
    106 #if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) 
     106#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) 
    107107# define _CRT_SECURE_NO_DEPRECATE 
    108108#endif 
    … …  
    121121/* This should only be incremented when either the layout of swig_type_info changes, 
    122122   or for whatever reason, the runtime changes incompatibly */ 
    123 #define SWIG_RUNTIME_VERSION "2" 
     123#define SWIG_RUNTIME_VERSION "3" 
    124124 
    125125/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */ 
    … …  
    698698 
    699699 
    700 /* Python.h has to appear first */ 
    701 #include <Python.h> 
    702700 
    703701/* Add PyOS_snprintf for old Pythons */ 
    … …  
    778776  return result; 
    779777} 
     778#endif 
     779 
     780/* Py_ssize_t for old Pythons */ 
     781#if PY_VERSION_HEX < 0x02050000 
     782typedef int Py_ssize_t; 
    780783#endif 
    781784 
    … …  
    11731176_SWIG_Py_None(void) 
    11741177{ 
    1175   PyObject *none = Py_BuildValue(""); 
     1178  PyObject *none = Py_BuildValue((char*)""); 
    11761179  Py_DECREF(none); 
    11771180  return none; 
    … …  
    20322035     
    20332036    /* here we get the method pointer for callbacks */ 
    2034     char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); 
     2037    const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); 
    20352038    const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0; 
    20362039    if (desc) { 
    … …  
    21532156 } 
    21542157#endif 
    2155  dict = PyObject_GetAttrString(inst, "__dict__"); 
     2158 dict = PyObject_GetAttrString(inst, (char*)"__dict__"); 
    21562159 PyDict_SetItem(dict, SWIG_This(), swig_this); 
    21572160 Py_DECREF(dict); 
    … …  
    22942297/* The python cached type query */ 
    22952298SWIGRUNTIME PyObject * 
    2296 SWIG_Python_TypeCache() { 
     2299SWIG_Python_TypeCache(void) { 
    22972300  static PyObject *SWIG_STATIC_POINTER(cache) = PyDict_New(); 
    22982301  return cache; 
    … …  
    25022505#if (PY_VERSION_HEX <= 0x02000000) 
    25032506# if !defined(SWIG_PYTHON_CLASSIC) 
    2504 #  error "This python version requires to use swig with the '-classic' option" 
     2507#  error "This python version requires swig to be run with the '-classic' option" 
    25052508# endif 
    25062509#endif 
    … …  
    25132516#define SWIG_name    "__m2crypto" 
    25142517 
    2515 #define SWIGVERSION 0x010329  
     2518#define SWIGVERSION 0x010330  
     2519#define SWIG_VERSION SWIGVERSION 
    25162520 
    25172521 
    … …  
    25362540 
    25372541SWIGINTERN swig_type_info* 
    2538 SWIG_pchar_descriptor() 
     2542SWIG_pchar_descriptor(void) 
    25392543{ 
    25402544  static int init = 0; 
    … …  
    31803184{ 
    31813185  if (PyString_Check(obj)) { 
    3182     char *cstr; int len; 
     3186    char *cstr; Py_ssize_t len; 
    31833187    PyString_AsStringAndSize(obj, &cstr, &len); 
    31843188    if (cptr)  { 
    … …  
    63346338  arg1 = (unsigned long)(val1); 
    63356339  result = (char *)ERR_lib_error_string(arg1); 
    6336   resultobj = SWIG_FromCharPtr(result); 
     6340  resultobj = SWIG_FromCharPtr((const char *)result); 
    63376341  return resultobj; 
    63386342fail: 
    … …  
    63566360  arg1 = (unsigned long)(val1); 
    63576361  result = (char *)ERR_func_error_string(arg1); 
    6358   resultobj = SWIG_FromCharPtr(result); 
     6362  resultobj = SWIG_FromCharPtr((const char *)result); 
    63596363  return resultobj; 
    63606364fail: 
    … …  
    63786382  arg1 = (unsigned long)(val1); 
    63796383  result = (char *)ERR_reason_error_string(arg1); 
    6380   resultobj = SWIG_FromCharPtr(result); 
     6384  resultobj = SWIG_FromCharPtr((const char *)result); 
    63816385  return resultobj; 
    63826386fail: 
    … …  
    66026606    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bio_new_file" "', argument " "1"" of type '" "char const *""'"); 
    66036607  } 
    6604   arg1 = buf1; 
     6608  arg1 = (char *)(buf1); 
    66056609  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); 
    66066610  if (!SWIG_IsOK(res2)) { 
    66076611    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bio_new_file" "', argument " "2"" of type '" "char const *""'"); 
    66086612  } 
    6609   arg2 = buf2; 
     6613  arg2 = (char *)(buf2); 
    66106614  result = (BIO *)BIO_new_file((char const *)arg1,(char const *)arg2); 
    66116615  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BIO, 0 |  0 ); 
    … …  
    75857589    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "rand_load_file" "', argument " "1"" of type '" "char const *""'"); 
    75867590  } 
    7587   arg1 = buf1; 
     7591  arg1 = (char *)(buf1); 
    75887592  ecode2 = SWIG_AsVal_long(obj1, &val2); 
    75897593  if (!SWIG_IsOK(ecode2)) { 
    … …  
    76187622    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "rand_save_file" "', argument " "1"" of type '" "char const *""'"); 
    76197623  } 
    7620   arg1 = buf1; 
     7624  arg1 = (char *)(buf1); 
    76217625  result = (int)RAND_write_file((char const *)arg1); 
    76227626  { 
    … …  
    85168520    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "pkey_assign" "', argument " "3"" of type '" "char *""'"); 
    85178521  } 
    8518   arg3 = buf3; 
     8522  arg3 = (char *)(buf3); 
    85198523  { 
    85208524    if (!arg1) { 
    … …  
    1238112385  } 
    1238212386  result = (char *)SSL_get_version((SSL const *)arg1); 
    12383   resultobj = SWIG_FromCharPtr(result); 
     12387  resultobj = SWIG_FromCharPtr((const char *)result); 
    1238412388  return resultobj; 
    1238512389fail: 
    … …  
    1244712451  } 
    1244812452  result = (char *)SSL_state_string((SSL const *)arg1); 
    12449   resultobj = SWIG_FromCharPtr(result); 
     12453  resultobj = SWIG_FromCharPtr((const char *)result); 
    1245012454  return resultobj; 
    1245112455fail: 
    … …  
    1247412478  } 
    1247512479  result = (char *)SSL_state_string_long((SSL const *)arg1); 
    12476   resultobj = SWIG_FromCharPtr(result); 
     12480  resultobj = SWIG_FromCharPtr((const char *)result); 
    1247712481  return resultobj; 
    1247812482fail: 
    … …  
    1249612500  arg1 = (int)(val1); 
    1249712501  result = (char *)SSL_alert_type_string(arg1); 
    12498   resultobj = SWIG_FromCharPtr(result); 
     12502  resultobj = SWIG_FromCharPtr((const char *)result); 
    1249912503  return resultobj; 
    1250012504fail: 
    … …  
    1251812522  arg1 = (int)(val1); 
    1251912523  result = (char *)SSL_alert_type_string_long(arg1); 
    12520   resultobj = SWIG_FromCharPtr(result); 
     12524  resultobj = SWIG_FromCharPtr((const char *)result); 
    1252112525  return resultobj; 
    1252212526fail: 
    … …  
    1254012544  arg1 = (int)(val1); 
    1254112545  result = (char *)SSL_alert_desc_string(arg1); 
    12542   resultobj = SWIG_FromCharPtr(result); 
     12546  resultobj = SWIG_FromCharPtr((const char *)result); 
    1254312547  return resultobj; 
    1254412548fail: 
    … …  
    1256212566  arg1 = (int)(val1); 
    1256312567  result = (char *)SSL_alert_desc_string_long(arg1); 
    12564   resultobj = SWIG_FromCharPtr(result); 
     12568  resultobj = SWIG_FromCharPtr((const char *)result); 
    1256512569  return resultobj; 
    1256612570fail: 
    … …  
    1278712791    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ssl_ctx_set_cipher_list" "', argument " "2"" of type '" "char const *""'"); 
    1278812792  } 
    12789   arg2 = buf2; 
     12793  arg2 = (char *)(buf2); 
    1279012794  { 
    1279112795    if (!arg1) { 
    … …  
    1362913633    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ssl_set_cipher_list" "', argument " "2"" of type '" "char const *""'"); 
    1363013634  } 
    13631   arg2 = buf2; 
     13635  arg2 = (char *)(buf2); 
    1363213636  { 
    1363313637    if (!arg1) { 
    … …  
    1367713681  } 
    1367813682  result = (char *)SSL_get_cipher_list((SSL const *)arg1,arg2); 
    13679   resultobj = SWIG_FromCharPtr(result); 
     13683  resultobj = SWIG_FromCharPtr((const char *)result); 
    1368013684  return resultobj; 
    1368113685fail: 
    … …  
    1370413708  } 
    1370513709  result = (char *)SSL_CIPHER_get_name((SSL_CIPHER const *)arg1); 
    13706   resultobj = SWIG_FromCharPtr(result); 
     13710  resultobj = SWIG_FromCharPtr((const char *)result); 
    1370713711  return resultobj; 
    1370813712fail: 
    … …  
    1373113735  } 
    1373213736  result = (char *)SSL_CIPHER_get_version((SSL_CIPHER const *)arg1); 
    13733   resultobj = SWIG_FromCharPtr(result); 
     13737  resultobj = SWIG_FromCharPtr((const char *)result); 
    1373413738  return resultobj; 
    1373513739fail: 
    … …  
    1404714051    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ssl_ctx_use_cert" "', argument " "2"" of type '" "char *""'"); 
    1404814052  } 
    14049   arg2 = buf2; 
     14053  arg2 = (char *)(buf2); 
    1405014054  { 
    1405114055    if (!arg1) { 
    … …  
    1408914093    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ssl_ctx_use_cert_chain" "', argument " "2"" of type '" "char *""'"); 
    1409014094  } 
    14091   arg2 = buf2; 
     14095  arg2 = (char *)(buf2); 
    1409214096  { 
    1409314097    if (!arg1) { 
    … …  
    1413114135    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ssl_ctx_use_privkey" "', argument " "2"" of type '" "char *""'"); 
    1413214136  } 
    14133   arg2 = buf2; 
     14137  arg2 = (char *)(buf2); 
    1413414138  { 
    1413514139    if (!arg1) { 
    … …  
    1420214206    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ssl_ctx_set_client_CA_list_from_file" "', argument " "2"" of type '" "char const *""'"); 
    1420314207  } 
    14204   arg2 = buf2; 
     14208  arg2 = (char *)(buf2); 
    1420514209  { 
    1420614210    if (!arg1) { 
    … …  
    1456714571    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ssl_ctx_load_verify_locations" "', argument " "2"" of type '" "char const *""'"); 
    1456814572  } 
    14569   arg2 = buf2; 
     14573  arg2 = (char *)(buf2); 
    1457014574  res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3); 
    1457114575  if (!SWIG_IsOK(res3)) { 
    1457214576    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ssl_ctx_load_verify_locations" "', argument " "3"" of type '" "char const *""'"); 
    1457314577  } 
    14574   arg3 = buf3; 
     14578  arg3 = (char *)(buf3); 
    1457514579  { 
    1457614580    if (!arg1) { 
    … …  
    1476714771    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ssl_set_client_CA_list_from_file" "', argument " "2"" of type '" "char const *""'"); 
    1476814772  } 
    14769   arg2 = buf2; 
     14773  arg2 = (char *)(buf2); 
    1477014774  { 
    1477114775    if (!arg1) { 
    … …  
    1621916223  arg1 = (long)(val1); 
    1622016224  result = (char *)X509_verify_cert_error_string(arg1); 
    16221   resultobj = SWIG_FromCharPtr(result); 
     16225  resultobj = SWIG_FromCharPtr((const char *)result); 
    1622216226  return resultobj; 
    1622316227fail: 
    … …  
    1840518409    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "x509_name_add_entry_by_txt" "', argument " "2"" of type '" "char *""'"); 
    1840618410  } 
    18407   arg2 = buf2; 
     18411  arg2 = (char *)(buf2); 
    1840818412  ecode3 = SWIG_AsVal_int(obj2, &val3); 
    1840918413  if (!SWIG_IsOK(ecode3)) { 
    … …  
    1841518419    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "x509_name_add_entry_by_txt" "', argument " "4"" of type '" "char *""'"); 
    1841618420  } 
    18417   arg4 = buf4; 
     18421  arg4 = (char *)(buf4); 
    1841818422  ecode5 = SWIG_AsVal_int(obj4, &val5); 
    1841918423  if (!SWIG_IsOK(ecode5)) { 
    … …  
    1858418588    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "x509_store_load_locations" "', argument " "2"" of type '" "char const *""'"); 
    1858518589  } 
    18586   arg2 = buf2; 
     18590  arg2 = (char *)(buf2); 
    1858718591  result = (int)x509_store_load_locations(arg1,(char const *)arg2); 
    1858818592  { 
    … …  
    1883018834    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "x509_name_entry_create_by_txt" "', argument " "2"" of type '" "char *""'"); 
    1883118835  } 
    18832   arg2 = buf2; 
     18836  arg2 = (char *)(buf2); 
    1883318837  ecode3 = SWIG_AsVal_int(obj2, &val3); 
    1883418838  if (!SWIG_IsOK(ecode3)) { 
    … …  
    1892818932    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "x509v3_ext_conf" "', argument " "3"" of type '" "char *""'"); 
    1892918933  } 
    18930   arg3 = buf3; 
     18934  arg3 = (char *)(buf3); 
    1893118935  res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4); 
    1893218936  if (!SWIG_IsOK(res4)) { 
    1893318937    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "x509v3_ext_conf" "', argument " "4"" of type '" "char *""'"); 
    1893418938  } 
    18935   arg4 = buf4; 
     18939  arg4 = (char *)(buf4); 
    1893618940  result = (X509_EXTENSION *)x509v3_ext_conf(arg1,arg2,arg3,arg4); 
    1893718941  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_X509_EXTENSION, 0 |  0 ); 
    … …  
    1925119255  } 
    1925219256  result = (char *)x509_name_oneline(arg1); 
    19253   resultobj = SWIG_FromCharPtr(result); 
     19257  resultobj = SWIG_FromCharPtr((const char *)result); 
    1925419258  { 
    1925519259    if (result != NULL) 
    … …  
    1932119325    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "asn1_object_create" "', argument " "4"" of type '" "char const *""'"); 
    1932219326  } 
    19323   arg4 = buf4; 
     19327  arg4 = (char *)(buf4); 
    1932419328  res5 = SWIG_AsCharPtrAndSize(obj4, &buf5, NULL, &alloc5); 
    1932519329  if (!SWIG_IsOK(res5)) { 
    1932619330    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "asn1_object_create" "', argument " "5"" of type '" "char const *""'"); 
    1932719331  } 
    19328   arg5 = buf5; 
     19332  arg5 = (char *)(buf5); 
    1932919333  result = (ASN1_OBJECT *)ASN1_OBJECT_create(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5); 
    1933019334  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ASN1_OBJECT, 0 |  0 ); 
    … …  
    1980419808    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "asn1_utctime_set_string" "', argument " "2"" of type '" "char const *""'"); 
    1980519809  } 
    19806   arg2 = buf2; 
     19810  arg2 = (char *)(buf2); 
    1980719811  { 
    1980819812    if (!arg1) { 
    … …  
    2091420918  } 
    2091520919  result = (char *)pkcs7_type_sn(arg1); 
    20916   resultobj = SWIG_FromCharPtr(result); 
     20920  resultobj = SWIG_FromCharPtr((const char *)result); 
    2091720921  return resultobj; 
    2091820922fail: 
    … …  
    2255022554 * 
    2255122555 * The generated swig_type_info structures are assigned staticly to an initial  
    22552  * array. We just loop though that array, and handle each type individually. 
     22556 * array. We just loop through that array, and handle each type individually. 
    2255322557 * First we lookup if this type has been already loaded, and if so, use the 
    2255422558 * loaded structure instead of the generated one. Then we have to fill in the 
    … …  
    2258822592#endif 
    2258922593 
     22594 
    2259022595SWIGRUNTIME void 
    2259122596SWIG_InitializeModule(void *clientdata) { 
    2259222597  size_t i; 
    22593   swig_module_info *module_head; 
    22594   static int init_run = 0; 
     22598  swig_module_info *module_head, *iter; 
     22599  int found; 
    2259522600   
    2259622601  clientdata = clientdata; 
    2259722602   
    22598   if (init_run) return; 
    22599   init_run = 1; 
    22600    
    22601   /* Initialize the swig_module */ 
    22602   swig_module.type_initial = swig_type_initial; 
    22603   swig_module.cast_initial = swig_cast_initial; 
     22603  /* check to see if the circular list has been setup, if not, set it up */ 
     22604  if (swig_module.next==0) { 
     22605    /* Initialize the swig_module */ 
     22606    swig_module.type_initial = swig_type_initial; 
     22607    swig_module.cast_initial = swig_cast_initial; 
     22608    swig_module.next = &swig_module; 
     22609  } 
    2260422610   
    2260522611  /* Try and load any already created modules */ 
    2260622612  module_head = SWIG_GetModule(clientdata); 
    22607   if (module_head) { 
     22613  if (!module_head) { 
     22614    /* This is the first module loaded for this interpreter */ 
     22615    /* so set the swig module into the interpreter */ 
     22616    SWIG_SetModule(clientdata, &swig_module); 
     22617    module_head = &swig_module; 
     22618  } else { 
     22619    /* the interpreter has loaded a SWIG module, but has it loaded this one? */ 
     22620    found=0; 
     22621    iter=module_head; 
     22622    do { 
     22623      if (iter==&swig_module) { 
     22624        found=1; 
     22625        break; 
     22626      } 
     22627      iter=iter->next; 
     22628    } while (iter!= module_head); 
     22629     
     22630    /* if the is found in the list, then all is done and we may leave */ 
     22631    if (found) return; 
     22632    /* otherwise we must add out module into the list */ 
    2260822633    swig_module.next = module_head->next; 
    2260922634    module_head->next = &swig_module; 
    22610   } else { 
    22611     /* This is the first module loaded */ 
    22612     swig_module.next = &swig_module; 
    22613     SWIG_SetModule(clientdata, &swig_module); 
    2261422635  } 
    2261522636   
    … …  
    2292422945   
    2292522946  SWIGINTERN PyObject * 
    22926   SWIG_globals() { 
     22947  SWIG_globals(void) { 
    2292722948    static PyObject *_SWIG_globals = 0;  
    2292822949    if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink();   
    … …  
    2296922990    size_t i; 
    2297022991    for (i = 0; methods[i].ml_name; ++i) { 
    22971       char *c = methods[i].ml_doc; 
     22992      const char *c = methods[i].ml_doc; 
    2297222993      if (c && (c = strstr(c, "swig_ptr: "))) { 
    2297322994        int j; 
    2297422995        swig_const_info *ci = 0; 
    22975         char *name = c + 10; 
     22996        const char *name = c + 10; 
    2297622997        for (j = 0; const_table[j].type; ++j) { 
    2297722998          if (strncmp(const_table[j].name, name,  

  • TI12-security/branches/Dependencies/m2crypto/setup.py

    r2250 r2574  
    1111 
    1212import os, sys 
    13 from setuptools import setup 
     13try: 
     14    from setuptools import setup 
     15except ImportError: 
     16    from distutils.core import setup 
     17 
    1418from distutils.core import Extension 
    1519from distutils.command import build_ext 
    … …  
    1822import optparse 
    1923 
    20 #  
     24 
    2125class _M2CryptoBuildExt(build_ext.build_ext): 
    2226    '''Specialization of build_ext to enable swig_opts to inherit any  
    … …  
    2731    def initialize_options(self): 
    2832        '''Overload to enable custom openssl settings to be picked up''' 
     33 
    2934        build_ext.build_ext.initialize_options(self) 
    3035         
    … …  
    3742            self.libraries = ['ssl', 'crypto'] 
    3843            self.openssl = '/usr' 
    39              
    40         if sys.platform == 'cygwin': 
    41             # Cygwin SHOULD work (there's code in distutils), but 
    42             # if one first starts a Windows command prompt, then bash, 
    43             # the distutils code does not seem to work. If you start 
    44             # Cygwin directly, then it would work even without this change. 
    45             # Someday distutils will be fixed and this won't be needed. 
    46             self.library_dirs = [os.path.join(self.openssl, 'bin')] 
    47                 
    48         self.include_dirs = [os.path.join(os.getcwd(), 'SWIG')] 
    4944        
    5045     
    … …  
    5247        '''Overloaded build_ext implementation to append custom openssl 
    5348        include file and library linking options''' 
     49 
    5450        build_ext.build_ext.finalize_options(self) 
    5551 
    … …  
    6056                          [opensslIncludeDir]] 
    6157         
    62         self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir)]         
     58        self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir), 
     59                              os.path.join(os.getcwd(), 'SWIG')]         
     60             
     61        if sys.platform == 'cygwin': 
     62            # Cygwin SHOULD work (there's code in distutils), but 
     63            # if one first starts a Windows command prompt, then bash, 
     64            # the distutils code does not seem to work. If you start 
     65            # Cygwin directly, then it would work even without this change. 
     66            # Someday distutils will be fixed and this won't be needed. 
     67            self.library_dirs += [os.path.join(self.openssl, 'bin')] 
     68                
    6369        self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)] 
    6470 
Note: See TracChangeset for help on using the changeset viewer.