diff options
| author | Mats Wichmann <mats@linux.com> | 2021-03-26 13:01:40 -0600 |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2021-03-26 13:01:40 -0600 |
| commit | 23b1f68d5ef1cd7cc2053b34603f4133dea6b878 (patch) | |
| tree | 2f671dbd824ff7383202fa8a0dc6e7abebe8f01a | |
| parent | 66931a5c56881bdef259506ba65373a604c151dd (diff) | |
| download | scons-git-23b1f68d5ef1cd7cc2053b34603f4133dea6b878.tar.gz | |
Fix errors removing old WIN32 construction vars
Signed-off-by: Mats Wichmann <mats@linux.com>
| -rw-r--r-- | SCons/Tool/mingw.py | 6 | ||||
| -rw-r--r-- | SCons/Tool/mslink.py | 9 | ||||
| -rw-r--r-- | SCons/Tool/mslink.xml | 4 | ||||
| -rw-r--r-- | SCons/Tool/packaging/NOTES | 19 |
4 files changed, 26 insertions, 12 deletions
diff --git a/SCons/Tool/mingw.py b/SCons/Tool/mingw.py index 90c41d010..2df3c3b74 100644 --- a/SCons/Tool/mingw.py +++ b/SCons/Tool/mingw.py @@ -173,10 +173,8 @@ def generate(env): env.Append(LDMODULEEMITTER=[shlib_emitter]) env['AS'] = 'as' - env['WIN32DEFPREFIX'] = '' - env['WIN32DEFSUFFIX'] = '.def' - env['WINDOWSDEFPREFIX'] = '${WIN32DEFPREFIX}' - env['WINDOWSDEFSUFFIX'] = '${WIN32DEFSUFFIX}' + env['WINDOWSDEFPREFIX'] = '' + env['WINDOWSDEFSUFFIX'] = '.def' env['SHOBJSUFFIX'] = '.o' env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1 diff --git a/SCons/Tool/mslink.py b/SCons/Tool/mslink.py index c29afa4d0..9e5b0d838 100644 --- a/SCons/Tool/mslink.py +++ b/SCons/Tool/mslink.py @@ -271,10 +271,11 @@ def generate(env): env['LIBLINKPREFIX']='' env['LIBLINKSUFFIX']='$LIBSUFFIX' - env['WINDOWSDEFPREFIX'] = '${WIN32DEFPREFIX}' - env['WINDOWSDEFSUFFIX'] = '${WIN32DEFSUFFIX}' - env['WINDOWSEXPPREFIX'] = '${WIN32EXPPREFIX}' - env['WINDOWSEXPSUFFIX'] = '${WIN32EXPSUFFIX}' + env['WINDOWSDEFPREFIX'] = '' + env['WINDOWSDEFSUFFIX'] = '.def' + env['WINDOWSEXPPREFIX'] = '' + env['WINDOWSEXPSUFFIX'] = '.exp' + env['WINDOWS_INSERT_DEF'] = 0 env['WINDOWSSHLIBMANIFESTPREFIX'] = '' env['WINDOWSSHLIBMANIFESTSUFFIX'] = '${SHLIBSUFFIX}.manifest' diff --git a/SCons/Tool/mslink.xml b/SCons/Tool/mslink.xml index 187bc410c..8683e0519 100644 --- a/SCons/Tool/mslink.xml +++ b/SCons/Tool/mslink.xml @@ -40,13 +40,9 @@ Sets construction variables for the Microsoft linker. <item>LIBDIRSUFFIX</item> <item>LIBLINKPREFIX</item> <item>LIBLINKSUFFIX</item> -<item>WIN32DEFPREFIX</item> -<item>WIN32DEFSUFFIX</item> <item>WINDOWSDEFPREFIX</item> <item>WINDOWSDEFSUFFIX</item> <item>WINDOWS_INSERT_DEF</item> -<item>WIN32EXPPREFIX</item> -<item>WIN32EXPSUFFIX</item> <item>WINDOWSEXPPREFIX</item> <item>WINDOWSEXPSUFFIX</item> <item>WINDOWSSHLIBMANIFESTPREFIX</item> diff --git a/SCons/Tool/packaging/NOTES b/SCons/Tool/packaging/NOTES new file mode 100644 index 000000000..4bde760b6 --- /dev/null +++ b/SCons/Tool/packaging/NOTES @@ -0,0 +1,19 @@ +Add a function which validates required args: + +def validate(required, **kwargs): + """check that all the tags in required are present in kwargs.""" + diff = required - set(kwargs.keys()) + if diff: + # set should be empty if all required in kwargs + # do some sort of error handling: bail? + return False + return True + + +Intended to simplify function sigs which currently look like this: + +def package(env, target, source, PACKAGEROOT, NAME, VERSION, + PACKAGEVERSION, DESCRIPTION, SUMMARY, X_RPM_GROUP, LICENSE, + **kw): + + |