Browse Source

do not support a debug build for OpenSSL

This is not very useful as crashes are unlikely to happen in
dependent libraries.
Ashish Kulkarni 11 years ago
parent
commit
2c42de9d79
1 changed files with 1 additions and 11 deletions
  1. 1 11
      scripts/build.py

+ 1 - 11
scripts/build.py

@@ -25,14 +25,12 @@ OPENSSL = {
     'build' : {
     'build' : {
         'msvc*-win32*': {
         'msvc*-win32*': {
             'configure' : 'VC-WIN32 no-asm',
             'configure' : 'VC-WIN32 no-asm',
-            'debug'     : 'debug-VC-WIN32 no-asm',
             'build'     : ['ms\\do_ms.bat', 'nmake /f ms\\nt.mak install'],
             'build'     : ['ms\\do_ms.bat', 'nmake /f ms\\nt.mak install'],
             'libs'      : ['ssleay32.lib', 'libeay32.lib'],
             'libs'      : ['ssleay32.lib', 'libeay32.lib'],
             'os_libs'   : '-lUser32 -lAdvapi32 -lGdi32 -lCrypt32'
             'os_libs'   : '-lUser32 -lAdvapi32 -lGdi32 -lCrypt32'
         },
         },
         'msvc*-win64*': {
         'msvc*-win64*': {
             'configure' : 'VC-WIN64A',
             'configure' : 'VC-WIN64A',
-            'debug'     : 'debug-VC-WIN64A',
             'build'     : ['ms\\do_win64a.bat', 'nmake /f ms\\nt.mak install'],
             'build'     : ['ms\\do_win64a.bat', 'nmake /f ms\\nt.mak install'],
             'libs'      : ['ssleay32.lib', 'libeay32.lib'],
             'libs'      : ['ssleay32.lib', 'libeay32.lib'],
             'os_libs'   : '-lUser32 -lAdvapi32 -lGdi32 -lCrypt32'
             'os_libs'   : '-lUser32 -lAdvapi32 -lGdi32 -lCrypt32'
@@ -864,16 +862,8 @@ def main():
 
 
     final_config = config
     final_config = config
     if '-debug' in sys.argv[2:]:
     if '-debug' in sys.argv[2:]:
-        # use the debug OpenSSL configuration if possible
-        ssl = OPENSSL['build']
-        for key in ssl:
-            if fnmatch.fnmatch(config, key) and 'debug' in ssl[key]:
-                ssl[key]['configure'] = ssl[key]['debug']
-        # use a debug build of QT and WebKit
-        cfg = QT_CONFIG['common']
-        cfg[cfg.index('-release')] = '-debug'
-        cfg[cfg.index('-webkit')]  = '-webkit-debug'
         final_config += '-dbg'
         final_config += '-dbg'
+        QT_CONFIG['common'].extend(['remove:-release', 'remove:-webkit', '-debug', '-webkit-debug'])
 
 
     if '-clean' in sys.argv[2:]:
     if '-clean' in sys.argv[2:]:
         rmdir(os.path.join(basedir, config))
         rmdir(os.path.join(basedir, config))