Opened 4 weeks ago

Closed 3 weeks ago

#13504 closed Patch - Feature (fixed)

Feature patch - clean up (dead) QMAKE_COPY_DIR code

Reported by: Gary Buhrmaster Owned by: David Hampton
Priority: minor Milestone: 31.0
Component: MythTV - General Version: Master Head
Severity: medium Keywords:
Cc: Ticket locked: no

Description

Proposed cleanup of code base for QMAKE_COPY_DIR (dead code ).

As of qt5.9(ish), which includes all the current stable distro releases, the directive QMAKE_COPY_DIR has been (essentially) a noop if one does not have explicit [group] commands to utilize them (although they are still carried forward in various created Makefiles just in case).  So the attempt to call cpsvndir and cpsimple have not done what they might have done (or were intended to do) in the past. This is dead code.

As background, the cpsvndir and cpsimple scripts essentially performed a recursive copy, and then removed any .svn directories, but .svn directories have not existed for, well, quite some time, in the code base. In addition, cpsvndir modified python file shebangs according to any specified python in configure.  But, as it is no longer called, it does not perform that work, and in any case, there is a pending python3 pull request that will modify the python requirements in different mechanisms. And for the themes and html directories there are no python files that currently need adjustment in any case. All dead code now.

Patches attached (individual patches so that they may be more easily reviewed by a developer)

Attachments (6)

0001-cleanup-remove-QMAKE_COPY_DIR-directive-from-mythplu.patch (5.5 KB) - added by Gary Buhrmaster 4 weeks ago.
0002-cleanup-remove-QMAKE_COPY_DIR-directive-from-mythtv.patch (2.2 KB) - added by Gary Buhrmaster 4 weeks ago.
0003-cleanup-remove-cpsvndir-cpsimple-scripts-from-mythpl.patch (2.7 KB) - added by Gary Buhrmaster 4 weeks ago.
0004-cleanup-remove-cpsvndir-cpsimple-scripts-from-themes.patch (2.7 KB) - added by Gary Buhrmaster 4 weeks ago.
0005-cleanup-remove-cpsvndir-cpsimple-scripts-from-html.patch (2.1 KB) - added by Gary Buhrmaster 4 weeks ago.
0006-cleanup-remove-cpsvndir-cpsimple-scripts-from-mythtv.patch (2.8 KB) - added by Gary Buhrmaster 4 weeks ago.

Download all attachments as: .zip

Change History (8)

Changed 4 weeks ago by Gary Buhrmaster

Changed 4 weeks ago by Gary Buhrmaster

Changed 4 weeks ago by Gary Buhrmaster

Changed 4 weeks ago by Gary Buhrmaster

Changed 4 weeks ago by Gary Buhrmaster

Changed 4 weeks ago by Gary Buhrmaster

comment:1 Changed 4 weeks ago by Stuart Auchterlonie

Milestone: needs_triage31.0
Owner: set to David Hampton
Status: newassigned

comment:2 Changed 3 weeks ago by Gary Buhrmaster <gary.buhrmaster@…>

Resolution: fixed
Status: assignedclosed

In 39a95491f0/mythtv:

Clean up dead QMAKE_COPY_DIR directives.

This code used to 1) copy a source directory and then removed all the
.svn directories, and 2) tweak the python shebangs into the python
specified in configure. These scripts haven't been called since
Qt5.9. The first feature hasn't been needed since the switch from svn
to git, and the latter feature set has a pending pull request to fix
it in a different way.

Fixes #13504.

Signed-off-by: David Hampton <mythtv@…>

Note: See TracTickets for help on using tickets.