Author: svn-role Date: Sat Jun 27 04:00:17 2020 New Revision: 1879246 URL: http://svn.apache.org/viewvc?rev=1879246&view=rev Log: Merge r1876906 from trunk:
* r1876906 Make gen-make.py --debug work with Python 3 Justification: We should also be able to build in Debug configuration with Python 3 on Windows. Votes: +1: jcorvel, stsp, rhuijben Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/gen-make.py Propchange: subversion/branches/1.14.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1876906 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1879246&r1=1879245&r2=1879246&view=diff ============================================================================== --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Sat Jun 27 04:00:17 2020 @@ -62,11 +62,3 @@ Approved changes: We've not entirely dropped Python 2 bindings support on 1.14.x yet Votes: +1: futatuki, stsp, rhuijben - - * r1876906 - Make gen-make.py --debug work with Python 3 - Justification: - We should also be able to build in Debug configuration with Python 3 - on Windows. - Votes: - +1: jcorvel, stsp, rhuijben Modified: subversion/branches/1.14.x/gen-make.py URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/gen-make.py?rev=1879246&r1=1879245&r2=1879246&view=diff ============================================================================== --- subversion/branches/1.14.x/gen-make.py (original) +++ subversion/branches/1.14.x/gen-make.py Sat Jun 27 04:00:17 2020 @@ -70,7 +70,7 @@ def main(fname, gentype, verfname=None, if ('--debug', '') in other_options: for dep_type, target_dict in generator.graph.deps.items(): - sorted_targets = list(target_dict.keys()); sorted_targets.sort() + sorted_targets = sorted(target_dict.keys(), key=str) for target in sorted_targets: print(dep_type + ": " + _objinfo(target)) for source in target_dict[target]: