Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:Ximi1970:Toolchains:MinGW:latest:win32
mingw32-cross-nsis
nsis-3.03.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File nsis-3.03.patch of Package mingw32-cross-nsis
diff -urN nsis-3.03-src.orig/Contrib/ExDLL/SConscript nsis-3.03-src/Contrib/ExDLL/SConscript --- nsis-3.03-src.orig/Contrib/ExDLL/SConscript 2015-06-21 18:13:45.000000000 +0200 +++ nsis-3.03-src/Contrib/ExDLL/SConscript 2020-01-26 23:26:08.160112620 +0100 @@ -47,7 +47,7 @@ env.DistributeExamples(api_files, path='Plugin/nsis') env.DistributeExamples(example, path='Plugin') if env['PLATFORM'] != 'win32': - if env.has_key('PREFIX_PLUGINAPI_INC'): + if 'PREFIX_PLUGINAPI_INC' in env: env.Distribute(api_files, None, 'pluginapi_inc', '', 'nsis', 'pluginapi', 'pluginapi') @@ -56,7 +56,7 @@ else: example += lib_files - if env.has_key('PREFIX_PLUGINAPI_LIB'): + if 'PREFIX_PLUGINAPI_LIB' in env: env.Distribute(lib, None, 'pluginapi_lib', '', 'nsis', 'pluginapi', 'pluginapi') diff -urN nsis-3.03-src.orig/SCons/Tools/mstoolkit.py nsis-3.03-src/SCons/Tools/mstoolkit.py --- nsis-3.03-src.orig/SCons/Tools/mstoolkit.py 2017-10-06 20:23:05.000000000 +0200 +++ nsis-3.03-src/SCons/Tools/mstoolkit.py 2020-01-26 23:29:11.993019681 +0100 @@ -67,13 +67,13 @@ raise SCons.Errors.InternalError, "No Windows registry module was found" # look for toolkit - if os.environ.has_key('VCToolkitInstallDir'): + if 'VCToolkitInstallDir' in os.environ: MSToolkitDir = os.path.normpath(os.environ['VCToolkitInstallDir']) else: raise SCons.Errors.InternalError, "Microsoft Visual C++ Toolkit 2003 directory was not found in the `VCToolkitInstallDir` environment variable." # look for platform sdk - if os.environ.has_key('MSSdk'): + if 'MSSdk' in os.environ: PlatformSDKDir = os.path.normpath(os.environ['MSSdk']) else: try: @@ -93,8 +93,8 @@ def validate_vars(env): """Validate the PDB, PCH, and PCHSTOP construction variables.""" - if env.has_key('PCH') and env['PCH']: - if not env.has_key('PCHSTOP'): + if ('PCH' in env) and env['PCH']: + if not 'PCHSTOP' in env: raise SCons.Errors.UserError, "The PCHSTOP construction must be defined if PCH is defined." if not SCons.Util.is_String(env['PCHSTOP']): raise SCons.Errors.UserError, "The PCHSTOP construction variable must be a string: %r"%env['PCHSTOP'] @@ -119,7 +119,7 @@ target = [pch, obj] # pch must be first, and obj second for the PCHCOM to work - if env.has_key('PDB') and env['PDB']: + if ('PDB' in env) and env['PDB']: env.SideEffect(env['PDB'], target) env.Precious(env['PDB']) @@ -132,11 +132,11 @@ parent_emitter(target, source, env) - if env.has_key('PDB') and env['PDB']: + if ('PDB' in env) and env['PDB']: env.SideEffect(env['PDB'], target) env.Precious(env['PDB']) - if env.has_key('PCH') and env['PCH']: + if ('PCH' in env) and env['PCH']: env.Depends(target, env['PCH']) return (target, source) @@ -153,7 +153,7 @@ res_builder = SCons.Builder.Builder(action='$RCCOM', suffix='.res') def pdbGenerator(env, target, source, for_signature): - if target and env.has_key('PDB') and env['PDB']: + if target and ('PDB' in env) and env['PDB']: return ['/PDB:%s'%target[0].File(env['PDB']).get_string(for_signature), '/DEBUG'] @@ -197,7 +197,7 @@ "SHLIBPREFIX", "SHLIBSUFFIX", "WIN32DEFPREFIX", "WIN32DEFSUFFIX")) - if env.has_key('PDB') and env['PDB']: + if ('PDB' in env) and env['PDB']: env.SideEffect(env['PDB'], target) env.Precious(env['PDB']) @@ -217,14 +217,14 @@ def prog_emitter(target, source, env): #SCons.Tool.msvc.validate_vars(env) - if env.has_key('PDB') and env['PDB']: + if ('PDB' in env) and env['PDB']: env.SideEffect(env['PDB'], target) env.Precious(env['PDB']) return (target,source) def RegServerFunc(target, source, env): - if env.has_key('register') and env['register']: + if ('register' in env) and env['register']: ret = regServerAction([target[0]], [source[0]], env) if ret: raise SCons.Errors.UserError, "Unable to register %s" % target[0] diff -urN nsis-3.03-src.orig/SCons/utils.py nsis-3.03-src/SCons/utils.py --- nsis-3.03-src.orig/SCons/utils.py 2017-10-29 23:36:47.000000000 +0100 +++ nsis-3.03-src/SCons/utils.py 2020-01-26 23:18:33.565810592 +0100 @@ -125,9 +125,9 @@ import os #if optenv and optenv.has_key(name): # return optenv[name] - if ARGUMENTS.has_key(name): + if name in ARGUMENTS: return ARGUMENTS[name] - if os.environ.has_key(name): + if name in os.environ: return os.environ[name] return defval diff -urN nsis-3.03-src.orig/SConstruct nsis-3.03-src/SConstruct --- nsis-3.03-src.orig/SConstruct 2017-10-26 18:37:42.000000000 +0200 +++ nsis-3.03-src/SConstruct 2020-01-26 23:16:51.560415010 +0100 @@ -255,26 +255,26 @@ f.write('// This file is automatically generated by SCons\n// DO NOT EDIT THIS FILE\n') f.write('#include "%s"\n' % File('#/Source/tchar.h').abspath) -if (not defenv.has_key('VER_PACKED')) and defenv.has_key('VER_MAJOR') and defenv.has_key('VER_MINOR'): +if (not ('VER_PACKED' in defenv)) and ('VER_MAJOR' in defenv) and ('VER_MINOR' in defenv): packed_r = packed_b = 0 - if defenv.has_key('VER_REVISION'): + if 'VER_REVISION' in defenv: packed_r = int(defenv['VER_REVISION']) - if defenv.has_key('VER_BUILD'): + if 'VER_BUILD' in defenv: packed_b = int(defenv['VER_BUILD']) defenv['VER_PACKED'] = '0x%0.2i%0.3i%0.2i%0.1i' % (int(defenv['VER_MAJOR']),int(defenv['VER_MINOR']),packed_r,packed_b) -if defenv.has_key('VER_PACKED'): +if 'VER_PACKED' in defenv: f.write('#define NSIS_PACKEDVERSION _T("%s")\n' % defenv['VER_PACKED']) -if defenv.has_key('VER_MAJOR') and defenv.get('VERSION','') == '': +if ('VER_MAJOR' in defenv) and defenv.get('VERSION','') == '': defenv['VERSION'] = defenv['VER_MAJOR'] - if defenv.has_key('VER_MINOR'): + if 'VER_MINOR' in defenv: defenv['VERSION'] += '.' + defenv['VER_MINOR'] - if defenv.has_key('VER_REVISION'): + if 'VER_REVISION' in defenv: defenv['VERSION'] += '.' + defenv['VER_REVISION'] -if (not defenv.has_key('TARGET_ARCH')) or defenv['TARGET_ARCH'] == 'x86': +if (not ('TARGET_ARCH' in defenv)) or defenv['TARGET_ARCH'] == 'x86': vermaj = 0 - if defenv.has_key('VER_MAJOR'): + if 'VER_MAJOR' in defenv: vermaj = int(defenv['VER_MAJOR']) f.write('#define NSIS_VERSION _T("v%s")\n' % defenv['VERSION']) @@ -336,7 +336,7 @@ if defenv['TARGET_ARCH'] == 'amd64': defenv['DISTSUFFIX'] += '-amd64' -if defenv.has_key('CODESIGNER'): +if 'CODESIGNER' in defenv: defenv['DISTSUFFIX'] += '-signed' defenv.Execute(Delete('$ZIPDISTDIR')) @@ -356,7 +356,7 @@ paths = map(lambda file: os.path.join(d, path, subpath, file), names) defenv.InstallAs(paths, files) - if (defenv.has_key('PREFIX') and defenv['PREFIX']) or (defenv.has_key('PREFIX_DEST') and defenv['PREFIX_DEST']) : + if (('PREFIX' in defenv) and defenv['PREFIX']) or (('PREFIX_DEST' in defenv) and defenv['PREFIX_DEST']) : prefix = '${PREFIX_DEST}${PREFIX_%s}' % component.upper() paths = map(lambda file: os.path.join(prefix, path, subpath, file), names) ins = defenv.InstallAs(paths, files) @@ -415,7 +415,7 @@ return exename def Sign(targets): - if defenv.has_key('CODESIGNER'): + if 'CODESIGNER' in defenv: for t in targets: a = defenv.Action('$CODESIGNER "%s"' % t.path) defenv.AddPostAction(t, a) @@ -526,7 +526,7 @@ Export('plugin_env plugin_uenv') def GetArcCPU(env): - if (not env.has_key('TARGET_ARCH')) or env['TARGET_ARCH'] == 'x86': + if (not ('TARGET_ARCH' in env)) or env['TARGET_ARCH'] == 'x86': return 'x86' return env['TARGET_ARCH'] @@ -554,8 +554,8 @@ optchar = '-' defenv['INSTVER'] = '%sDVERSION=$VERSION' % optchar -if defenv.has_key('VER_MAJOR') and defenv.has_key('VER_MINOR') \ - and defenv.has_key('VER_REVISION') and defenv.has_key('VER_BUILD'): +if ('VER_MAJOR' in defenv) and ('VER_MINOR' in defenv) \ + and ('VER_REVISION' in defenv) and ('VER_BUILD' in defenv): defenv['INSTVER'] += ' %sDVER_MAJOR=$VER_MAJOR' % optchar defenv['INSTVER'] += ' %sDVER_MINOR=$VER_MINOR' % optchar defenv['INSTVER'] += ' %sDVER_REVISION=$VER_REVISION' % optchar
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor